 kyle
|
774a06606d
|
Merge pull request #3699 from shockey/v/3.2.2
v3.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 |
|
|
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 |
|
|
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 |
|
|
kyle
|
69799b0975
|
Merge branch 'master' into bug/3633-primitive-titles
|
2017-09-19 20:14:00 -07: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 |
|
|
HelderSepu
|
bd6e482df2
|
Merge remote-tracking branch 'refs/remotes/swagger-api/master'
|
2017-09-19 13:37:04 -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 |
|
|
Kyle
|
aa9e008f0b
|
Merge pull request #3679 from swagger-api/shockey-readme-updates
README: npm module clarifications
|
2017-09-18 15:12:25 -07:00 |
|
|
Kyle
|
b43ac6da44
|
Update README.md
|
2017-09-18 13:38:11 -07:00 |
|
|
Kyle
|
cb3e1ed78c
|
Update README.md
|
2017-09-18 13:36:07 -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
|
f63f022e0c
|
Remove .only from utils test
|
2017-09-17 09:48:26 -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 |
|
|
Kyle
|
aee5e75913
|
Merge pull request #3673 from shockey/v/3.2.1
v3.2.1
v3.2.1
|
2017-09-15 21:22:37 -07:00 |
|
|
Kyle Shockey
|
a625177c38
|
v3.2.1
|
2017-09-15 21:15:21 -07:00 |
|
|
Kyle
|
a777e9ba91
|
Merge pull request #3669 from shockey/bug/oas3-accept-controls
OAS3: Accept header control
|
2017-09-15 20:38:05 -07:00 |
|
|
Kyle Shockey
|
ae5ad484d9
|
More merge oversights...
|
2017-09-15 20:33:16 -07:00 |
|
|
Kyle Shockey
|
6010245210
|
Roll back win import removal
Lost in merge conflict....
|
2017-09-15 20:29:49 -07:00 |
|
|
Kyle
|
bd5424308f
|
Merge branch 'master' into bug/oas3-accept-controls
|
2017-09-15 20:21:27 -07:00 |
|
|
Kyle
|
ef5904f3f0
|
Merge pull request #3668 from owenconti/test/3667-escaping-utils-tests
Deep link path util tests
|
2017-09-15 20:19:28 -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
|
c1abdfb1c4
|
follow lowercase naming convention in tests
|
2017-09-15 21:04:38 -04:00 |
|
|
AlexVangelov
|
5bf6d2ff0b
|
Merge branches 'master' and 'master' of github.com:AlexanderVangelov/swagger-ui
|
2017-09-15 20:53:52 -04:00 |
|