Commit Graph

446 Commits

Author SHA1 Message Date
Kyle Shockey
8b8c9b744d Make Model a PureComponent 2017-11-07 20:12:19 -08:00
Greg Thompson
16e756bed7 disallow null value 2017-11-07 11:15:37 -06:00
Kyle Shockey
ed34a8dae9 Linter: Remove unused import 2017-11-06 21:24:16 -08:00
Kyle Shockey
21bf5919a9 Rewire AuthorizeOperationBtn; create new selector for filtering definitions 2017-11-06 20:42:47 -08:00
Greg Thompson
a58cd25f08 Merge branch 'master' into ft/3052-extensions 2017-11-06 09:18:51 -06:00
Greg Thompson
9a66acf37f operation extensions display 2017-11-06 09:18:05 -06:00
Greg Thompson
44c422eba3 parameter extensions display 2017-11-06 09:17:30 -06:00
Kyle Shockey
d5d7e45d62 Indent XML with 2 spaces 2017-11-03 18:13:17 -07:00
Josh Ponelat
009ee1d9fb propagate specPath through parameter-row 2017-11-03 17:50:46 +02:00
Josh Ponelat
6719a0af33 add condition for OAS 3.0 model jumps 2017-11-03 17:50:46 +02:00
Josh Ponelat
29247869d9 add specPath to arrays 2017-11-03 17:50:46 +02:00
Josh Ponelat
91d4ab96d7 partial specPath changes 2017-11-03 17:50:46 +02:00
kyle
09b37428c2 Merge branch 'master' into ft/property-component 2017-11-02 17:51:59 -07:00
Kyle Shockey
17e6d81504 Format XML with xml-but-prettier 2017-11-02 15:13:10 -07:00
Greg Thompson
4b453e3535 use property component in array-model and primitive-model 2017-11-02 15:20:20 -05:00
Greg Thompson
0c41155100 adds new property display component 2017-11-02 15:19:38 -05:00
Kyle Shockey
afa615e01d Add URL sanitizer to avoid javascript: XSS attack vector 2017-10-30 17:43:23 -07:00
Kyle Shockey
2157988212 Don't reach into schema for value 2017-10-27 23:31:47 -07:00
Kyle Shockey
79ddae1526 Pass correct schema values to parameter state builder for OAS3 2017-10-27 22:23:11 -07:00
Josh Ponelat
22732e8cc5 change : {} to fromJS({}) in param-body.jsx 2017-10-25 09:39:40 +02:00
Owen Conti
b15942dfe1 Merge branch 'ft/performance' of github.com:swagger-api/swagger-ui into ft/performance
# Conflicts:
#	src/core/components/responses.jsx
2017-10-22 12:55:51 -06:00
Kyle Shockey
7c917325f0 Linter fixes 2017-10-20 19:31:52 -07:00
kyle
6d22e38a04 Merge branch 'master' into ft/oas3-authorization 2017-10-20 19:07:38 -07:00
Kyle Shockey
631e69f6f8 Pass parameter.schema as schema in OAS 3.0
Parameters were restructured in OAS 3.0; schemas are no longer at
the top level of parameters. Adjusting to account for the change.
2017-10-20 16:01:26 -07:00
Kyle Shockey
c9674a1fc5 Refactor Auths component flow; create component that supports HTTP auths 2017-10-18 21:23:28 -07:00
Mark H. Wilkinson
e1a7af4c92 Fix regression with rendering links in Markdown. 2017-10-16 14:40:07 +01:00
Kyle Shockey
d677e534c3 WIP 2017-10-13 21:23:45 -07:00
Kyle Shockey
8b81bcac48 OAS3 Auth MVP 2017-10-11 16:58:24 -07:00
kyle
f32492b4ee Merge branch 'master' into bug/3730-empty-body-responses 2017-10-10 17:44:58 -07:00
Owen Conti
60e8091eed Add unit test for images in markdown 2017-10-08 10:26:32 -06:00
Owen Conti
ec76e512e2 Fixes #3730
Add extra check for missing response content and contentType
2017-10-08 09:38:08 -06:00
Owen Conti
729fd71546 Fixes #3734
Add <h1> and <h2> elements to sanitizer options.
2017-10-08 09:09:29 -06:00
kyle
ac634c61ce Merge branch 'master' into feature/request-url 2017-09-29 14:38:42 -07:00
kyle
44882700c2 Merge branch 'master' into array-model-markdown-description 2017-09-29 14:06:01 -07:00
kyle
263f6feb2f Merge branch 'master' into ft/default_model_rendering 2017-09-29 13:29:04 -07:00
kyle
ef9fe9d755 Merge branch 'master' into bug/swagger-editor-1502 2017-09-29 12:16:01 -07:00
kyle
4f1a8abd0d Merge branch 'master' into bug/3706-enum-param 2017-09-27 19:48:37 -07:00
Owen Conti
590819ad9b Fixes swagger-editor/#1502.
Change logic for markdown rendering to:

1. Convert source markdown to HTML
2. Sanitize HTML
3. Send sanitized HTML to markdown renderer
2017-09-27 18:05:12 -06:00
Elvin Lemmens
ca1a0fa544 Apply conditions for generating download link correctly
Invalid application of AND/OR statements prevented file downloads of other types than application/octet-stream from generating a download link
2017-09-27 12:34:46 +02:00
Owen Conti
31e7ce0c5e Fixes #3706
Add missing "in" argument to `getParameter`
2017-09-25 21:26:44 -06:00
Owen Conti
fd00a0489a Remove shouldComponentUpdate from parameter-row component. It will be put back in eventually as part of the performance optimizations once the parameter components are converted to the smart/dumb approach. 2017-09-23 13:10:09 -06:00
Owen Conti
a1758da87c Merge branch 'master' into bug/3511-query-formData-parameters 2017-09-20 22:37:43 -06:00
kyle
deebe1f840 Merge branch 'master' into bug/3638-61338ref-in-examples 2017-09-20 17:36:57 -07:00
Kyle Shockey
69941a6d9a Remove $$ref values from response examples 2017-09-20 17:34:23 -07:00
Kyle Shockey
b0a580bdc1 Display Tag descriptions as Markdown 2017-09-20 16:55:45 -07:00
Owen Conti
7ef8a7ddc7 Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3511-query-formData-parameters
# Conflicts:
#	src/core/components/parameter-row.jsx
#	src/core/plugins/spec/actions.js
2017-09-18 16:59:08 -06:00
Owen Conti
44ece46cd3 Fixes #3633
Make sure PrimitiveModel uses the schema's title first and then falls back to the passed-in `name` property. Added enzyme test for functionality.
2017-09-17 09:49:13 -06:00
Owen Conti
08282205aa Fix property key: value alignment in array-model 2017-09-17 09:45:33 -06:00
Owen Conti
6f98fa9f3b Fixes after merge with ft/3584 branch 2017-09-15 22:31:02 -06:00
Owen Conti
f4efae0145 Merge branch 'ft/performance' into ft/3598-responses-shouldComponentUpdate
# Conflicts:
#	src/core/components/operation.jsx
#	src/core/components/operations.jsx
#	src/core/components/response.jsx
#	src/core/components/responses.jsx
2017-09-15 22:30:23 -06:00