Commit Graph

2893 Commits

Author SHA1 Message Date
Kyle Shockey
e7bba1c522 Merge branch 'issue-1334' of https://github.com/RVKen/swagger-ui into RVKen-issue-1334 2017-08-08 17:59:16 -07:00
Kyle
15f9cd9612 Ignore any further changes to db.json 2017-08-08 17:57:03 -07:00
Kyle
747d095522 Update README.md 2017-08-08 17:56:21 -07:00
Kyle Shockey
67da84d879 Ignore further changes to db.json 2017-08-08 15:17:25 -07:00
Kenny
543d34d009 write the test in multiple files 2017-08-08 14:08:21 -07:00
Kyle
8c8b98deb9 Merge branch 'master' into issue-1334 2017-08-07 19:32:48 -07:00
Kyle
1fbce1d47a Merge pull request #3529 from shockey/v/3.1.4
v3.1.4: Rebuild dist
2017-08-05 11:27:48 -07:00
Kyle
b840826170 Merge branch 'master' into v/3.1.4 2017-08-05 11:24:50 -07:00
Kyle Shockey
1778913cfd Rebuild dist 2017-08-05 11:23:47 -07:00
Kyle
93f1f652ea Merge pull request #3528 from shockey/v/3.1.4
v3.1.4
2017-08-05 11:22:17 -07:00
Kyle Shockey
27616217ab v3.1.4 2017-08-05 10:50:20 -07:00
Kyle Shockey
d39464407f Fix incorrect props rest/spreading 2017-08-05 10:48:28 -07:00
Tony Tam
9ed7c700b0 Merge branch 'master' into issue-1334 2017-08-05 10:38:28 +00:00
Kyle
2099ca09e6 Merge pull request #3526 from shockey/v/3.1.3
v3.1.3
2017-08-04 21:46:20 -07:00
Kyle Shockey
95b7adc246 Rebuild dist 2017-08-04 21:38:57 -07:00
Kyle Shockey
4b0b51ab6e v3.1.3 2017-08-04 21:36:13 -07:00
Kyle
08b1f88557 Merge pull request #3354 from owenconti/bug/2903-wrong-font-for-error
Fixes #2903 - Wrong font for errors
2017-08-04 16:41:00 -07:00
Kyle
b7575ed8a5 Merge branch 'master' into bug/2903-wrong-font-for-error 2017-08-04 16:37:17 -07:00
Kyle
73662c0aec Merge pull request #3514 from owenconti/bug/3505-schema-title-in-array-schemes
Fixes #3505 - Choose modelName before name in Model component
2017-08-04 16:37:11 -07:00
Kyle
dc4e60170d Merge branch 'master' into bug/3505-schema-title-in-array-schemes 2017-08-04 16:33:14 -07:00
Kyle
6af2aae26f Merge pull request #3509 from owenconti/bug/3500-missing-name-for-primitives
Fixes #3500 - Fix missing names for primitive models
2017-08-04 16:32:48 -07:00
Kyle
719db39ac4 Merge branch 'master' into bug/3500-missing-name-for-primitives 2017-08-04 16:27:35 -07:00
Kyle
0113703e16 Merge pull request #3488 from owenconti/bug/3480-model-description-over-the-edge
Fixes #3480 - Overflowing model description.
2017-08-04 16:27:26 -07:00
Kyle
19e09c2296 Merge branch 'master' into bug/3500-missing-name-for-primitives 2017-08-04 16:27:25 -07:00
Kyle
859ae1fd19 Merge branch 'master' into bug/3480-model-description-over-the-edge 2017-08-04 16:23:50 -07:00
Kyle
bc62c1c751 Merge pull request #3524 from shockey/bug/3458-oas3-parameter-deprecation
Indicate parameter deprecation
2017-08-04 16:15:02 -07:00
Kyle Shockey
35733b5eb4 Indicate parameter deprecation 2017-08-04 15:39:48 -07:00
Kyle
2733205481 Merge pull request #3522 from swagger-api/ft/oas3
Removed animation as temporary fix
2017-08-04 14:53:52 -07:00
Kyle
0a20d724db Merge branch 'master' into ft/oas3 2017-08-04 14:45:29 -07:00
Kenny
c7af68b06d Rehydrate test code 2017-08-04 11:19:02 -07:00
Minasokoni
758a229ac4 removed animation as temporary fix 2017-08-04 01:43:07 -07:00
Kyle
8633372270 Merge pull request #3519 from shockey/bug/editor-1418-oas3-jump-to-model
Create valid paths for model jumping in OAS3
2017-08-03 16:26:31 -07:00
Kyle
c664e39908 Update object-model.jsx 2017-08-03 16:22:42 -07:00
Kyle
c72c476f4b Merge branch 'master' into bug/editor-1418-oas3-jump-to-model 2017-08-03 16:17:39 -07:00
Kyle Shockey
b16907ce6d Create valid paths for model jumping in OAS3 2017-08-03 16:15:47 -07:00
Anna
6233886983 Merge pull request #3481 from domanchi/master
Removing CORS header in request
2017-08-03 17:47:35 +03:00
Aaron Loo
700d547529 merge master 2017-08-03 07:32:32 -07:00
Kyle
103aaa54d5 Merge branch 'master' into bug/3505-schema-title-in-array-schemes 2017-08-02 20:55:24 -07:00
Kyle
f375afc742 Merge pull request #3501 from oysteinsigholt/master
Fixes #3492 - Add domNode parameter
2017-08-02 17:10:25 -07:00
Kyle
faafe372bd Merge branch 'master' into master 2017-08-02 17:06:49 -07:00
Kyle
cd422fe8a7 Merge pull request #3513 from shockey/ft/3490-anyof-oneof-not-models
Support oneOf, anyOf, not
2017-08-02 16:49:39 -07:00
Kyle
2d00766c10 Merge branch 'master' into ft/3490-anyof-oneof-not-models 2017-08-02 16:41:16 -07:00
Owen Conti
fb5443601e Fixes #3505 - Choose modelName before name in Model component 2017-08-02 17:39:56 -06:00
Kyle Shockey
4cd88d3360 Support oneOf + anyOf + not 2017-08-02 16:37:57 -07:00
Kyle
b8cf502cfc Merge branch 'master' into master 2017-08-02 15:58:34 -07:00
Kyle
ab53122271 Merge pull request #3512 from Raincal/patch-1
Remove a duplicate package
2017-08-02 15:56:31 -07:00
Kyle Shockey
1047226ff4 Reshuffle e2e commands (e2e is the top-level command now) 2017-08-02 13:57:25 -07:00
Kenny
c38ba45aa0 Fix base url. 2017-08-02 12:39:09 -07:00
Kenny
b7bbead9c7 Merge branch 'master' into issue-1334
# Conflicts:
#	.gitignore
#	make-webpack-config.js
2017-08-02 20:14:03 +02:00
Kenny
7cb6bdd7f4 revert dependency 2017-08-02 19:23:07 +02:00