Commit Graph

3209 Commits

Author SHA1 Message Date
kyle
263f6feb2f Merge branch 'master' into ft/default_model_rendering 2017-09-29 13:29:04 -07:00
kyle
356dc81b18 Merge pull request #3712 from owenconti/bug/swagger-editor-1502
Fixes swagger-editor/#1502.
2017-09-29 12:45:00 -07:00
Kyle Shockey
a7acd9e004 Remove react-remarkable from package.json 2017-09-29 12:38:00 -07:00
kyle
ef9fe9d755 Merge branch 'master' into bug/swagger-editor-1502 2017-09-29 12:16:01 -07:00
kyle
ca98ed114a Merge pull request #3647 from JoshuaWhatley/bug/3474
Bug/3474
2017-09-28 18:16:40 -07:00
kyle
c5534a506e Merge branch 'master' into bug/3474 2017-09-28 18:12:26 -07:00
kyle
e0fb125a48 Merge pull request #3703 from heldersepu/ft/validation
Add validateMaximum & validateMinimum
2017-09-28 18:04:14 -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
kyle
67dbad445d Merge pull request #3701 from heldersepu/master
Add validation for min and max length
2017-09-28 17:48:23 -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
239d105974 Merge pull request #3708 from owenconti/bug/3706-enum-param
Fixes #3706
2017-09-27 20:21:12 -07:00
kyle
4f1a8abd0d Merge branch 'master' into bug/3706-enum-param 2017-09-27 19:48:37 -07:00
kyle
13fd88f1d2 Merge pull request #3709 from ELE3E/master
Fixes #3694: Apply conditions for generating download link correctly
2017-09-27 19:48:02 -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
515726b386 Add test for negative num
Testing valid negative number with min and max
2017-09-24 15:45:42 -04:00
HelderSepu
7d40d72281 Add validateMaximum & validateMinimum
This address some of the validation requested on Issue #993
2017-09-24 11:43:47 -04:00
kyle
774a06606d Merge pull request #3699 from shockey/v/3.2.2
v3.2.2
2017-09-23 14:43:44 -07:00
Kyle Shockey
2d10a740af Rebuild with changes from #3702 2017-09-23 13:09:08 -07:00
Kyle Shockey
45e7a54182 Merge branch 'master' of github.com:swagger-api/swagger-ui into v/3.2.2 2017-09-23 12:58:06 -07:00
kyle
9e418ad68b Merge pull request #3702 from owenconti/bug/3511-query-formData-parameters
Fixes #3511 - 2nd attempt - Query & formData parameters together
2017-09-23 12:57:35 -07:00
Kyle Shockey
de61dccff0 Revert "Revert "Merge pull request #3516 from owenconti/bug/3511-query-formData-parameters""
This reverts commit beeb6b608e.
2017-09-23 12:54:17 -07: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 Shockey
beeb6b608e Revert "Merge pull request #3516 from owenconti/bug/3511-query-formData-parameters"
This reverts commit 6a7e9d2e88, reversing
changes made to eb01beedfa.
2017-09-23 10:51:32 -07:00
Kyle Shockey
c8a9ddbf94 v3.2.2 2017-09-23 00:02:10 -07:00
kyle
1de6010629 Merge pull request #3666 from AlexanderVangelov/master
OAuth2 authorizationUrl allow extra query parameters ('&' vs '?')
2017-09-22 20:49:21 -07:00
kyle
b6eb23217f Merge branch 'master' into master 2017-09-22 20:45:07 -07:00
kyle
a3f923eec7 Merge pull request #3698 from shockey/heldersepu-master
Heldersepu master
2017-09-22 20:16:08 -07:00
Kyle Shockey
6b59707af1 Fix tests 2017-09-22 19:50:36 -07:00
kyle
827bcd2f36 Merge branch 'master' into master 2017-09-22 19:50:19 -07:00
kyle
6a7e9d2e88 Merge pull request #3516 from owenconti/bug/3511-query-formData-parameters
Fixes #3511 - Query & formData parameters together
2017-09-22 19:27:31 -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
eb01beedfa Merge pull request #3691 from shockey/bug/3638-61338ref-in-examples
Remove $$ref values from response examples
2017-09-20 17:42:03 -07: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
6a8f821901 Merge pull request #3690 from shockey/bug/3636-tag-description-markdown
Display Tag descriptions as Markdown
2017-09-20 17:01:45 -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
kyle
6d67c6dabe Merge pull request #3676 from owenconti/bug/3633-primitive-titles
Fixes #3633 - PrimitiveModel titles
2017-09-19 20:17:49 -07:00