Commit Graph

2253 Commits

Author SHA1 Message Date
shockey
eb8a64a66f Merge branch 'master' into wordwrapfix 2017-05-19 18:43:27 -07:00
shockey
c66436e7d5 Merge pull request #3108 from swagger-api/shockey-patch-3
Add custom namespace to config whitelist
2017-05-18 23:41:34 -07: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
shockey
e326a99001 Merge pull request #3106 from shockey/ft/error-jump-to-line
Jump to Line
2017-05-18 15:32:44 -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
c942f382fb Rebuild dist 2017-05-18 15:15:01 -07:00
Kyle Shockey
b6bb1deab8 Rewire jump to line for Errors component 2017-05-18 15:13:04 -07:00
Anna
6224617984 Merge pull request #3099 from bodnia/fix-3089
fixes #3089
2017-05-17 18:16:31 +03: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
Anna
f235430f30 Merge pull request #3049 from furkanayhan/send_redirect_url_for_oauth2
Send redirect url for oauth2
2017-05-16 17:01:28 +03: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
Anna
d64e920665 Merge pull request #3084 from tcaesvk/feature/oauth2-authorize-query
fix OAuth2 authorize issue + remove redundant parameters
2017-05-16 15:18:20 +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
shockey
e74989f22e Merge pull request #3077 from shockey/v/3.0.10
v3.0.10
2017-05-14 01:26:49 -07:00
Kyle Shockey
73ed923e28 v3.0.10 2017-05-14 01:10:00 -07: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
e80b2f5b3f Merge pull request #3074 from bodnia/issue-2897
Issue 2897
2017-05-12 00:23:21 +03:00
Anna Bodnia
32cd6fe09c readme for configuration of auth 2017-05-11 20:14:49 +03: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
5f6320e754 Merge pull request #3071 from bodnia/fix-3031
fixes #3031
2017-05-11 14:42:32 +03:00
Anna Bodnia
5574a6cb1f fixes #3031 2017-05-11 14:38:34 +03:00
shockey
bb2e75da8f Merge pull request #3068 from shockey/bug/3027-gitless-building
try/catch git describe call
2017-05-10 22:11:09 -07:00
shockey
ee3669312a Merge branch 'master' into bug/3027-gitless-building 2017-05-10 22:05:36 -07:00
Kyle Shockey
c81f51f696 try/catch git describe call, fixes building without git present 2017-05-10 22:03:04 -07:00
shockey
e2003ae922 Merge pull request #3058 from jmendiara/fix/gitignore
gitignore all npm-debug logs
2017-05-10 13:37:15 -07:00
shockey
0ac0b5ba32 Merge branch 'master' into fix/gitignore 2017-05-10 13:32:45 -07:00
shockey
f8381bf907 Merge pull request #3057 from jmendiara/fix/configLocation
Move filterConfigs to core
2017-05-10 11:12:43 -07:00
Javier Mendiara
d378d38c12 Merge branch 'master' into fix/gitignore 2017-05-10 18:20:32 +02:00
Javier Mendiara Cañardo
53986d60bc Move filterConfigs to core
Fixes #3056
2017-05-10 18:17:37 +02:00
Anna
5b6f27c7db Merge pull request #3065 from bodnia/fix-2922
#Fixes 2922
2017-05-10 17:11:15 +03:00
Anna Bodnia
47b495b24d build 2017-05-10 17:04:36 +03:00
Anna Bodnia
496062f980 fixes #2922 2017-05-10 17:03:18 +03:00
Anna
a920e3ab69 Merge pull request #3064 from bodnia/fix-3045
Fix 3045
2017-05-10 15:30:16 +03:00
Anna Bodnia
14e9fd7b0f built 2017-05-10 15:21:46 +03:00
Anna Bodnia
ac4ef3fdd4 fixes #3045 order of configs inheratance 2017-05-10 15:20:32 +03:00
Javier Mendiara Cañardo
2de7b957df gitignore all npm-debug logs
Lot of npm-debugs files can be generated in devs computers, each one with a number suffix
ex:
```sh
npm-debug.log.213131231
npm-debug.log.213131231
npm-debug.log.213131231
```

Adding a wildcard prevents for accidental commits

_Official and default .gitignore for node in github.com: https://github.com/github/gitignore/blob/master/Node.gitignore#L4_
2017-05-09 15:14:14 +02:00
shockey
a068f78252 Merge pull request #3043 from shockey/v/3.0.9
v3.0.9
2017-05-05 20:04:54 -07:00
Kyle Shockey
933da1e93a Dist rebuild 2017-05-05 19:56:41 -07:00
Kyle Shockey
3c1a1780a6 v3.0.9 as declared version 2017-05-05 19:51:46 -07:00
Ron
bf1bc120fe Merge pull request #3039 from bodnia/config-readme
Readme for Topbar plugin, Configs plugin
2017-05-05 14:54:39 -07:00
Ron
fce31afa6c Merge branch 'master' into config-readme 2017-05-05 14:41:46 -07:00
Anna
b73063578c Merge pull request #3040 from bodnia/config-plugin-enable
enable configs plugin by default
2017-05-05 17:57:22 +03:00
Anna Bodnia
cbd74b0c67 enable configs plugin by default 2017-05-05 17:50:22 +03:00
Anna Bodnia
8e80ca9583 Readme for Topbar plugin, Configs plugin 2017-05-05 17:45:40 +03:00
shockey
3ef50589e9 Merge pull request #3029 from shockey/rebuild
Rebuild dist
2017-05-04 11:09:39 -07:00