Commit Graph

896 Commits

Author SHA1 Message Date
Anna Bodnia
df4ea9b3d6 Merge remote-tracking branch 'upstream/master' into fix-3067 2017-05-25 18:06:07 +03:00
Robert Barnwell
760d1eba80 Merge branch 'master' into clickfix 2017-05-22 09:57:19 -07:00
Minasokoni
a2a2f76199 updated click area 2017-05-22 09:12:13 -07:00
Anna Bodnia
d5b9552a5a removed debugger 2017-05-22 17:13:31 +03:00
shockey
eb8a64a66f Merge branch 'master' into wordwrapfix 2017-05-19 18:43:27 -07:00
Anna Bodnia
edfe88d299 modelPropertyMacro, parameterMacro 2017-05-19 18:50:51 +03:00
shockey
b530ac8593 Default value for custom key 2017-05-18 23:35:02 -07:00
shockey
d30b3a9ba1 Add custom namespace to config whitelist 2017-05-18 23:33:12 -07:00
Kyle Shockey
a28dc13191 Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/error-jump-to-line 2017-05-18 15:21:09 -07:00
Kyle Shockey
b6bb1deab8 Rewire jump to line for Errors component 2017-05-18 15:13:04 -07:00
Anna Bodnia
b85d9a8c24 fixes #3089 2017-05-17 18:13:04 +03:00
Robert Barnwell
b28a649457 Merge branch 'master' into wordwrapfix 2017-05-16 11:38:48 -07:00
Minasokoni
bb6bc00012 Long single line responses wrapped 2017-05-16 11:33:59 -07:00
Furkan Ayhan
0c7119e855 Send redirect url when authenticating with oauth2-authorization_code
also fix indentations of files
2017-05-16 16:50:13 +03:00
김 재석
c81fdaec57 fix lint errors 2017-05-16 15:31:02 +09:00
김 재석
960a99a5ea remove undefined parameters for OAuth2 authorize request 2017-05-16 15:20:58 +09:00
Kyle Shockey
599b448f91 Revert "fixes #2922"
This reverts commit 496062f980.
2017-05-13 10:15:38 -07:00
Kyle Shockey
6e40d04741 take advantage of Swagger-Client opId improvements 2017-05-13 09:50:34 -07:00
Anna Bodnia
8aebea34c4 add configuration of auth: scope separator, client id, client secret, app name, reaml, additionalQueryParams 2017-05-11 16:30:30 +03:00
Anna Bodnia
5574a6cb1f fixes #3031 2017-05-11 14:38:34 +03:00
Javier Mendiara Cañardo
53986d60bc Move filterConfigs to core
Fixes #3056
2017-05-10 18:17:37 +02:00
Anna Bodnia
496062f980 fixes #2922 2017-05-10 17:03:18 +03:00
Anna Bodnia
ac4ef3fdd4 fixes #3045 order of configs inheratance 2017-05-10 15:20:32 +03:00
Anna Bodnia
cbd74b0c67 enable configs plugin by default 2017-05-05 17:50:22 +03:00
shockey
2cc3e3c2d6 Merge branch 'master' into searchbar-fix 2017-05-04 10:29:14 -07:00
Anna Bodnia
7e1eb4e9a7 fix #2841 2017-05-04 17:18:47 +03:00
Stefan Grootscholten
073eff4e10 Make the checkbox id more unique.
If the swagger.json defines more than one oauth2 Security scheme with
matching scopes, the id of the scope checkboxes were not unique.
As a result the scope for a second security scheme could not be
selected.

By adding the security scheme name to the id, it becomes more unique.
2017-05-04 09:39:22 +02:00
Robert Barnwell
cd7007d557 Merge branch 'master' into searchbar-fix 2017-05-03 14:17:32 -07:00
Kyle Shockey
7296a054c4 Fix #3016 2017-05-02 12:15:17 -07:00
Minasokoni
6b5063ead1 Merge branch 'searchbar-fix' of github.com:Minasokoni/swagger-ui into searchbar-fix 2017-05-02 11:02:24 -07:00
Minasokoni
018491b4a7 removed semicolon 2017-05-02 11:02:14 -07:00
Robert Barnwell
74b4a3d598 Merge branch 'master' into searchbar-fix 2017-05-02 10:40:31 -07:00
Minasokoni
51b04b3a26 preventDefault the form 2017-05-02 10:38:35 -07:00
Kyle Shockey
15d43886a3 Attach information to version object 2017-04-28 10:41:47 -07:00
Kyle Shockey
0e62d920e8 Merge branch 'master' of github.com:swagger-api/swagger-ui into ft/3003-version-info 2017-04-28 10:29:06 -07:00
Kyle Shockey
b6c3f91127 Fix #3003 2017-04-28 10:06:43 -07:00
shockey
d2c3078a79 Merge branch 'master' into feature/older-react 2017-04-28 09:21:15 -07:00
Robert Barnwell
8a1e447f0f Merge branch 'master' into searchbar-update 2017-04-28 08:39:16 -07:00
Minasokoni
ca808e9d18 updated searchbar sizing 2017-04-28 08:36:32 -07:00
Josh Ponelat
2cff912261 remove object-assign dep ( which was missing from package.json ) 2017-04-28 11:17:59 +02:00
Kyle Shockey
f1f912a46f Merge branch 'master' of github.com:swagger-api/swagger-ui into Minasokoni-container-name-change 2017-04-27 20:04:52 -07:00
Kyle Shockey
518e2ec732 Merge branch 'master' into Minasokoni-container-name-change 2017-04-27 19:57:29 -07:00
Anna Bodnia
374ac9cbbb fix #2870 2017-04-27 20:09:05 +03:00
Kyle Shockey
7d87c9d680 Fix typo in container classname 2017-04-27 09:09:09 -07:00
Kyle Shockey
78336e99aa Merge branch 'container-name-change' of https://github.com/Minasokoni/swagger-ui into Minasokoni-container-name-change 2017-04-27 09:08:55 -07:00
Anna Bodnia
87a23c7c9e fix eslint errors 2017-04-27 19:01:27 +03:00
Anna Bodnia
d013e7a05c #2844 fix accessCode flow 2017-04-27 18:55:25 +03:00
Minasokoni
198f9b6874 changed container classname 2017-04-27 08:35:33 -07:00
Anna Bodnia
891c321c8a build 2017-04-26 18:06:26 +03:00
Anna Bodnia
cecf0670b7 Merge branch 'master' into fix-oauth2-issue
# Conflicts:
#	dist/swagger-ui.css
2017-04-26 17:53:53 +03:00