Commit Graph

14 Commits

Author SHA1 Message Date
Owen Conti
15e105c931 Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3102-unguarded-expressions
# Conflicts:
#	src/core/components/model.jsx
#	src/core/components/models.jsx
2017-07-03 16:12:31 -06:00
shockey
b72aa3a7c8 Merge branch 'master' into webpack-migration-2.x 2017-06-29 18:23:36 -07:00
Owen Conti
d27cae0085 Work on #3102. Moved all the components out of model.jsx into their own files so they can be grabbed via getComponent() 2017-06-28 22:07:07 -06:00
RVKen
d36f0a6dbd fix eslint issues 2017-06-29 04:37:19 +02:00
Owen Conti
cf63f9b9dd Fix for #2947 - Display property names for non-object models 2017-06-25 22:31:14 -06:00
shockey
99600df0f1 Merge branch 'master' into fix-model-markdown 2017-06-16 13:52:32 -07:00
sokol
acff34e1d4 #2946 Fix CR fix 2017-06-16 21:14:00 +03:00
sokol
129129be97 #2946 Fix 2017-06-16 18:16:46 +03:00
Mark H. Wilkinson
c24a07c523 Render primitive property descriptions as Markdown. 2017-06-13 17:15:59 +01:00
Mark H. Wilkinson
db57ee0dfe Render object descriptions as Markdown. 2017-06-13 17:13:33 +01:00
Anna Bodnia
5be1ae582c fix #2807 2017-04-04 15:07:34 +03:00
Anna Bodnia
d2e20a72f0 fixes #2795 2017-03-31 18:35:52 +03:00
Kyle Shockey
e1fcbfbf09 Linter error fixes 2017-03-23 16:36:45 -07:00
Ron
f22a628934 in with the new 2017-03-17 21:17:53 -07:00