Commit Graph

305 Commits

Author SHA1 Message Date
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
Owen Conti
9f5a307fce Merge branch 'ft/performance' into ft/3584-operation-container-component
# Conflicts:
#	src/core/components/operation.jsx
#	src/core/components/operations.jsx
#	src/core/components/responses.jsx
2017-09-15 22:03:14 -06:00
Kyle Shockey
ef8b37a580 LINTING! 2017-09-15 20:17:35 -07:00
Kyle
fa312cb70d Merge branch 'master' into bug/oas3-accept-controls 2017-09-15 20:11:20 -07:00
Owen Conti
a6e070ac76 Replace spaces with underscores when setting the hash value and inserting the ID into the DOM. Escape the deep link path when querying for the DOM element on hash change. 2017-09-13 21:32:46 -06:00
Owen Conti
16364fb81e Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3596-permalink-encoding 2017-09-13 17:25:38 -06:00
Owen Conti
430e2a970f Fixes #3596
Wrap `isShownKey` values in a function that replaces spaces with underscores. When parsing the hash on route change, replace the spaces in the values with underscores again.
2017-09-13 17:20:37 -06:00
Owen Conti
cade5100e0 Merge branch 'master' of github.com:swagger-api/swagger-ui into bug/3032-wrong-properties-order 2017-09-12 23:07:36 -06:00
Owen Conti
a47cc284f7 Update response.jsx to use already existing, fromJSOrdered function 2017-09-12 23:06:24 -06:00
Kyle Shockey
277cc81a8c OAS3 Accept header control: State-side 2017-09-12 19:39:52 -07:00
Kyle Shockey
26edaa5f0b OAS3 Accept header control: Component-side 2017-09-12 17:22:51 -07:00
Owen Conti
7cd42992f2 Merge branch 'master' of github.com:swagger-api/swagger-ui 2017-09-12 17:14:39 -06:00
Owen Conti
408e038b2d fromJS does not maintain order of object properties. Use a reviver function with fromJS inside the response.jsx component for the passed down schema prop. 2017-09-11 20:28:58 -06:00
Ron
b9be09709a Merge branch 'master' into feature/request-url 2017-09-11 05:05:08 -07:00
Owen Conti
3f04d2dfc6 Merge branch 'master' into bug/3490-anyOf-oneOf-not 2017-09-09 13:56:22 -06:00
Owen Conti
12c96e3190 Add comment to array-model for to clarify change. Rework logic in Model.render() to fix bug with overriding name and schema from $ref definition. 2017-09-09 13:51:09 -06:00
Owen Conti
e9f46e6f5e Working on refactoring of model.jsx 2017-09-08 17:59:41 -06:00
Owen Conti
3b9940567b Fix property names being displayed in array models 2017-09-07 18:28:38 -06:00
Kyle Shockey
7a2c7d2cdc Squash commit: OAS3 Try-It-Out changes 2017-09-05 13:59:31 -07:00
Mike Gilbode
d7ae284a0c Add defaultModelRendering parameter. 2017-08-30 23:30:57 -04:00
Kyle Shockey
5da3843281 Refactor: use ternary operators at attribute level instead of element level 2017-08-25 12:06:11 -07:00
Surya
f7efd58305 Removed href attribute from anchor tag if deeplinking is disabled 2017-08-25 23:43:56 +05:30
Kyle Shockey
a6944a279c Remove getComponent call for RequestUrl 2017-08-21 17:21:48 -07:00
Kyle Shockey
39450f7364 Merge branch 'feature/request-url' of https://github.com/dalbani/swagger-ui into dalbani-feature/request-url 2017-08-21 17:19:17 -07:00
Owen Conti
cfb4625eb0 Add shouldComponentUpdate to response.jsx and live-response.jsx. Remove isShownKey from shouldComponentUpdate of OperationContainer. Moved response and request out to separate props for operation.jsx. Removed unused request prop from responses.jsx. 2017-08-20 18:50:49 -06:00
Owen Conti
017a26af1e Merge branch 'ft/3584-operation-container-component' into ft/3598-responses-shouldComponentUpdate 2017-08-20 17:03:16 -06:00
Owen Conti
050f4d1918 Clean up OperationContainer props. 2017-08-20 17:02:51 -06:00
Owen Conti
bcefb6eb3e Convert pathMethod prop to two separate props. 2017-08-20 15:25:13 -06:00
Owen Conti
8426dcdf7b Fix failed test due to removed getConfigs 2017-08-20 08:16:02 -06:00
Owen Conti
2946baf2bd Merge branch 'master' into ft/3584-operation-container-component 2017-08-20 08:07:15 -06:00
Owen Conti
0d90305550 Remove unnecessary div in app.jsx 2017-08-20 08:06:59 -06:00
Owen Conti
7cc9f9a4db Update Operations component to call OperationContainer instead of Operation.jsx 2017-08-20 07:57:07 -06:00
Owen Conti
dd414534f9 Update Operation component to be dumb, update responses to accept Immutable prop types 2017-08-20 07:56:40 -06:00
Owen Conti
0b41c917d1 Revert Perf tool back to core/index.js 2017-08-19 13:59:24 -06:00
Owen Conti
e61c12fe18 Move performance debugging tools to app.jsx 2017-08-19 08:33:03 -06:00
Owen Conti
c0cfaabd7e Remove unused getComponent as prop to <Execute 2017-08-19 08:32:21 -06:00
Mike Gilbode
087ed20384 Add support for requestInterceptor / responseInterceptor.
- Display mutated requests from request interceptor in curl output in UI.
  Put this behind showMutatedRequest flag so that the mutation can be
  silent.
- Document requestInterceptor, responseInterceptor and showMutatedRequest
  in README.md
- Add tests
2017-08-13 01:14:41 -04:00
Kyle
04fb27b46d Merge branch 'master' into array-model-markdown-description 2017-08-11 17:42:30 -07:00
Kyle
08bb9fb7f3 Merge branch 'master' into xlink-deprecated 2017-08-11 16:45:53 -07:00
Kyle Shockey
1eab4b3b20 Display OAS3 parameter types 2017-08-10 22:55:41 -07:00
Kyle
c5f5eff900 Merge branch 'master' into bug/3447-write-only 2017-08-10 17:16:51 -07:00
Kyle
fd44416238 Merge branch 'master' into array-model-markdown-description 2017-08-10 13:58:38 -07:00