Kyle Shockey
4e80e292b2
Merge branch 'master' into ft/oas3
2017-07-04 23:50:00 -07:00
Kyle Shockey
8ed43a1329
Ensure OAS3 Markdown fields are sanitized
2017-07-04 19:12:43 -07:00
Owen Conti
6fd5839103
Fix PropTypes in model-collapse component
2017-07-03 16:27:47 -06:00
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
Kyle Shockey
109027935f
Hide main Responses ContentType picker for OAS3
2017-07-02 23:16:26 -07:00
Kyle Shockey
1e40a20e07
Add switching logic for each Response Code to have its own content types
2017-07-02 23:02:44 -07:00
shockey
b72aa3a7c8
Merge branch 'master' into webpack-migration-2.x
2017-06-29 18:23:36 -07:00
shockey
afaa5619bb
Merge branch 'master' into bug/3072-error-response-fixes
2017-06-29 17:20:09 -07:00
shockey
a69ed71f47
Merge branch 'master' into ft/3135-request-duration
2017-06-29 17:10:46 -07:00
shockey
07568aba3e
Merge branch 'master' into bug/2947-model-display-for-non-objects
2017-06-29 15:49:40 -07:00
shockey
0a67efd964
Merge branch 'master' into bug/3136-operation-scheme-update
2017-06-29 15:39:11 -07:00
Kyle Shockey
3484b83d1f
trigger setScheme when a new set of schemes come in
2017-06-29 13:22:58 -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
86482f8458
Merge branch 'master' into webpack-migration-2.x
...
* master:
#3110 - Fix models down arrow icon in firefox
2017-06-29 04:40:28 +02:00
RVKen
d36f0a6dbd
fix eslint issues
2017-06-29 04:37:19 +02:00
Owen Conti
beb7999cb8
Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/2947-model-display-for-non-objects
2017-06-28 18:06:32 -06:00
Owen Conti
8727754dd4
#3110 - Fix models down arrow icon in firefox
2017-06-27 20:56:48 -06:00
Owen Conti
0c6f5e8d32
Add displayRequestDuration configuration option.
2017-06-26 21:13:17 -06:00
Owen Conti
fe60544ff7
Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/3135-request-duration
2017-06-26 19:58:07 -06:00
shockey
a2e6619544
Merge branch 'master' into bug/3256-example-value-fix
2017-06-26 17:23:36 -07:00
Owen Conti
c67ae29e7a
Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3072-error-response-fixes
2017-06-26 16:24:20 -06:00
Owen Conti
cf63f9b9dd
Fix for #2947 - Display property names for non-object models
2017-06-25 22:31:14 -06:00
Owen Conti
de3046e29d
#3256 - Remove unnecessary JSON.stringify call on example values that are already strings
2017-06-25 16:39:54 -06:00
Owen Conti
b2d52e2629
Remove isRequired from ResponseBody's contentType property as responses without a Content-Type header will not have a value to pass
2017-06-25 16:10:14 -06:00
Owen Conti
789534c587
Bug fix for #3136 - Update state when scheme options change and previously selected option is no longer available
2017-06-25 15:51:07 -06:00
Owen Conti
ddb5704637
#3072 - Display response body and headers for requests that result in non-200 responses. Add test to ensure error and response are merged correctly
2017-06-25 13:28:14 -06:00
Owen Conti
7049a5960c
#3135 - Add request duration to response details
2017-06-25 09:16:35 -06:00
Sven Tschui
75ca33a06e
Merge branch 'master' of github.com:swagger-api/swagger-ui into improvement/remove-react-addons-shallow-compare
2017-06-24 16:14:11 +02:00
Kyle Shockey
21100a0a8b
Don't render Markdown if input or sanitized input is empty
2017-06-22 22:05:38 -07:00
Sven Tschui
e4f9837312
Remove react-addons-shallow-compare
2017-06-22 09:46:51 +02:00
Kyle Shockey
e3ae1eebfe
MOAR rendering (improve media type detection; render object model
...
nullables)
2017-06-16 14:23:09 -07: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
Kyle Shockey
541f3e99b2
Tweak deprecated display
2017-06-16 01:44:44 -07:00
Kyle Shockey
9dc9a857b7
Squash commit: Links reimplementation; OAS interface improvements
2017-06-16 00:29:23 -07:00
Kyle Shockey
e415ec7f8a
Add schema object deprecation display
2017-06-14 00:59:36 -07:00
Kyle Shockey
81408cf0d8
Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/oas3
2017-06-13 19:07:58 -07:00
shockey
1bd1190749
Merge branch 'master' into multipart-file-upload
2017-06-13 16:08:19 -07:00
Ron
0345f66ee2
Merge branch 'master' into fix-response-json-indentation
2017-06-13 15:45:16 -07:00
Mark H. Wilkinson
7d24a95d78
Indent JSON examples.
2017-06-13 23:07:44 +01:00
shockey
ce16666b57
Merge branch 'master' into fix-model-markdown
2017-06-13 12:09:58 -07: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
Furkan Ayhan
b3e476f476
Show actual error response when trying
2017-06-09 10:25:28 +03:00
Kyle Shockey
72fb75c83b
Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/oas3
2017-06-08 21:15:10 -07:00
Derek Wickern
c5a23e584c
Fix #2922 : file uploads fail to render curl command
...
The request body is an immutable.js OrderedMap rather than a string,
so this fixes the type error:
TypeError: request.get(...).split is not a function
Adds a special curl command argument for files, e.g.
curl -F "param=value" -F "file=@filename.txt ;type=text/plain"
2017-06-08 15:59:41 -07:00
Anna Bodnia
ee2e82390b
fixes #3191
2017-06-08 15:41:06 +03:00
Anna Bodnia
36b263e230
fixes #3172
2017-06-08 12:19:47 +03:00
Kyle Shockey
a9d4f5efde
Add filter to un-double-escape quotation marks
2017-06-07 12:52:59 -07:00
