Kyle Shockey
c81f51f696
try/catch git describe call, fixes building without git present
2017-05-10 22:03:04 -07:00
Masahide Sakamaki
bd44c2161a
Merge branch 'master' into docker-run.sh-eol-lf
2017-05-11 12:17:44 +09: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
Masahide Sakamaki
ef1ff15c89
Set EOL of docker-run.sh to LF
2017-05-08 21:10:51 +09: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
Kyle Shockey
1d146394f3
Rebuild dist
2017-05-04 10:57:42 -07:00
shockey
e91573af39
Merge pull request #3017 from Minasokoni/searchbar-fix
...
preventDefault the searchbar
2017-05-04 10:42:38 -07:00
shockey
2cc3e3c2d6
Merge branch 'master' into searchbar-fix
2017-05-04 10:29:14 -07:00
Anna
af7a99e901
Merge pull request #3026 from bodnia/fix-2841
...
fixes #2841
2017-05-04 17:37:38 +03:00
Anna Bodnia
7e1eb4e9a7
fix #2841
2017-05-04 17:18:47 +03:00
Anna
4f0cf53401
Merge pull request #2949 from stefangr/fix_oauth2_scope_checkbox_uniqueness
...
Make the oauth2 scope checkbox id more unique.
2017-05-04 11:01:13 +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
shockey
b76dcc2d4a
Merge pull request #3018 from shockey/bug/3016-window-guard
...
Version stamping updates
2017-05-02 12:43:13 -07:00
Kyle Shockey
b2af309cd5
Rebuild dist
2017-05-02 12:24:09 -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
shockey
f14d8067c4
Merge pull request #3005 from shockey/v/3.0.8
...
v/3.0.8
2017-04-28 19:55:24 -07:00
Kyle Shockey
c08f3c230b
v3.0.8 ( fixes #2923 #2889 )
2017-04-28 19:51:37 -07:00
Kyle Shockey
96f4b65dfa
Rebuild dist
2017-04-28 19:40:39 -07:00
Kyle Shockey
69fd57f17f
Increment swagger-client version
2017-04-28 18:43:24 -07:00
shockey
f85fdb7835
Merge pull request #3004 from shockey/ft/3003-version-info
...
Add global variable that exposes UI version
2017-04-28 10:46:27 -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
11e9bbfdbb
Merge pull request #2958 from swagger-api/feature/older-react
...
Remove object-assign
2017-04-28 09:38:51 -07:00
shockey
d2c3078a79
Merge branch 'master' into feature/older-react
2017-04-28 09:21:15 -07:00
shockey
dd11740359
Merge pull request #3002 from Minasokoni/searchbar-update
...
Updated searchbar sizing and added onSubmit func
2017-04-28 09:06:48 -07:00
