Commit Graph

2233 Commits

Author SHA1 Message Date
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
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
f5e89dc02e build 2017-04-28 11:19:39 +02:00
Josh Ponelat
2cff912261 remove object-assign dep ( which was missing from package.json ) 2017-04-28 11:17:59 +02:00
shockey
5a5a4d016b Merge pull request #2997 from shockey/Minasokoni-container-name-change
Changed main container className
2017-04-27 20:12:47 -07: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
862301e6df Merge pull request #2993 from bodnia/fix-2870
fix #2870
2017-04-27 19:14:16 +02: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
a7c90e2d77 Merge pull request #2992 from bodnia/fix-2844
#2844 fix accessCode flow
2017-04-27 18:06:12 +02: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
shockey
210b20eea8 Merge pull request #2985 from swagger-api/shockey-patch-2
Update webpack-dist.config.js
2017-04-26 23:03:20 -07:00
shockey
f755f80072 Update webpack-dist.config.js 2017-04-26 22:43:54 -07:00
shockey
8137f25cc7 Merge pull request #2983 from shockey/bug/2937-core-missing-modules
Bug/2937 core missing modules
2017-04-26 19:42:00 -07:00
shockey
a8ff714eee Merge branch 'master' into bug/2937-core-missing-modules 2017-04-26 18:34:58 -07:00
Kyle Shockey
494048e809 Fix #2937 2017-04-26 18:23:57 -07:00
Kyle Shockey
bcd36ff667 Fix #2937 2017-04-26 18:11:27 -07:00
Ron
38ed6192c3 Merge pull request #2982 from swagger-api/issue_template
new issue_template
2017-04-26 15:58:29 -07:00
Ron
b9df212ccc new issue_template 2017-04-26 15:50:35 -07:00
Anna
22dc506b13 Merge pull request #2977 from bodnia/issue-2898
#2898  operationsSorter config description
2017-04-26 17:39:39 +02:00
Anna
da7210d328 Merge branch 'master' into issue-2898 2017-04-26 17:33:51 +02:00
Anna
ca05b3e255 Merge pull request #2979 from bodnia/fix-oauth2-issue
fixes password, application oauth2 flows
2017-04-26 17:11:23 +02: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
Anna Bodnia
bb73dd49d8 fixes password, application oauth2 flows 2017-04-26 17:50:09 +03:00
Anna Bodnia
eab557f470 #2898 operationsSorter config description 2017-04-26 11:53:27 +03:00
shockey
ac25a5dac6 Merge pull request #2974 from swagger-api/shockey-patch-1
Update README.md
2017-04-25 13:33:02 -07:00
shockey
073313df6f Merge branch 'master' into shockey-patch-1 2017-04-25 11:23:36 -07:00
shockey
26912b094f Merge pull request #2611 from elopio/snapcraft
Add the packaging metadata to build the swagger-ui snap
2017-04-25 11:23:21 -07:00
shockey
6f6f76caf4 Update README.md 2017-04-25 11:15:54 -07:00
shockey
bbb3035bac Merge branch 'master' into snapcraft 2017-04-25 10:23:55 -07:00
shockey
6841732367 Merge pull request #2967 from Minasokoni/textformating
Headers now break onto their own lines
2017-04-25 10:23:06 -07:00
Robert Barnwell
1a417b3c6c Merge branch 'master' into textformating 2017-04-25 00:22:46 -07:00
Minasokoni
aa327ed256 headers now break onto their own lines 2017-04-25 00:20:46 -07:00
Leo Arias
808f8d2827 Merge branch 'master' into snapcraft 2017-04-24 21:42:31 -06:00
Ron
4c40fa192b Merge pull request #2957 from deepu105/patch-1
Correct url in README file
2017-04-24 08:24:50 -07:00
Deepu K Sasidharan
2c6bd5d988 Correct url in README file
The npmjs.com/package/swagger-ui-dist url in the readme is wrong as it tries to load within github domain
2017-04-23 11:29:03 +02:00
Kyle Shockey
b289d5992a MOAR deploy fixes 2017-04-21 21:43:24 -07:00
Kyle Shockey
5573f4d32d Skip cleanup on script deploy 2017-04-21 20:06:01 -07:00
Kyle Shockey
d6c498b5f3 Fix shell script error 2017-04-21 20:04:57 -07:00