Commit Graph

1534 Commits

Author SHA1 Message Date
Kyle Shockey
e15b4c85c0 ESLint.... 2017-09-29 17:51:12 -07:00
Kyle Shockey
7e6f74080f Disable Swagger2 auth features in OAS3 2017-09-29 17:49:15 -07: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
c5534a506e Merge branch 'master' into bug/3474 2017-09-28 18:12:26 -07:00
Kyle Shockey
012313e236 Handle cases where maximum and minimum are 0 2017-09-28 17:59:07 -07:00
kyle
27da2a7d3b Merge branch 'master' into ft/validation 2017-09-28 17:53:14 -07:00
HelderSepu
a408fb1f23 Correction from @shockey 2017-09-28 20:40:22 -04:00
kyle
3a7a8c9c67 Merge branch 'master' into master 2017-09-28 15:58:41 -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
kyle
d1258c6b8c Merge branch 'master' into ft/validation 2017-09-24 18:09:19 -07:00
HelderSepu
7d40d72281 Add validateMaximum & validateMinimum
This address some of the validation requested on Issue #993
2017-09-24 11:43:47 -04: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
HelderSepu
a5c7083726 Add validation for min and max length 2017-09-23 14:14:58 -04:00
kyle
b6eb23217f Merge branch 'master' into master 2017-09-22 20:45:07 -07:00
kyle
827bcd2f36 Merge branch 'master' into master 2017-09-22 19:50:19 -07:00
HelderSepu
e08f31d674 Add UnitTests for validateDateTime & validateGuid 2017-09-22 21:37:33 -04:00
HelderSepu
7d9b56255c Correction to the validateDateTime 2017-09-22 17:44:01 -04:00
Helder Sepulveda
b2abf769de Merge branch 'master' into master 2017-09-22 13:04:09 -04:00
HelderSepu
11768b16bf Correct IF for validateDateTime & validateGuid 2017-09-22 11:30:07 -04:00
Joshua Whatley
14f47654ee Merge branch 'master' into bug/3474 2017-09-21 16:54:54 -07:00
kyle
54a2d402c6 Merge branch 'master' into master 2017-09-21 00:15:41 -07: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
Alexander Vangelov
696bdcf961 Merge branch 'master' into master 2017-09-20 13:11:53 -04:00
HelderSepu
85b7b7241d Add validateDateTime & validateGuid
Initial work to tacke some of the missing validation (Issue #993)
2017-09-19 14:31:27 -04: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
Joshua Whatley
6488cbb649 Merge branch 'master' into bug/3474 2017-09-18 11:27:10 -07: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
b855c25406 Slightly increase size available for property names. Change units to em and add a margin to separate the property name from the property type. 2017-09-17 09:48:03 -06:00
Owen Conti
08282205aa Fix property key: value alignment in array-model 2017-09-17 09:45:33 -06:00
Alexander Vangelov
90fa7065f8 Merge branch 'master' into master 2017-09-16 11:24:36 -04: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
Owen Conti
46b5ae6070 Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/performance 2017-09-15 21:53:00 -06:00
Kyle Shockey
ae5ad484d9 More merge oversights... 2017-09-15 20:33:16 -07: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
AlexVangelov
5bf6d2ff0b Merge branches 'master' and 'master' of github.com:AlexanderVangelov/swagger-ui 2017-09-15 20:53:52 -04:00
AlexVangelov
4172e33e04 satisfy project lint rules 2017-09-15 20:52:55 -04:00
Alexander Vangelov
34e8fffb65 Merge branch 'master' into master 2017-09-15 20:40:46 -04:00
AlexVangelov
9b1a6141df OAuth2 authorizationUrl with extra query parameters (should include double '?') 2017-09-15 15:57:41 -04:00