Tony Tam
20c2454438
rebuilt after merge with master
2015-11-27 18:21:04 -08:00
Laurent Lepinay
ffbf6b2f97
fix corrupted images
2015-11-16 12:05:26 +01:00
Laurent Lepinay
41bf523e68
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
...
Conflicts:
dist/swagger-ui.js
dist/swagger-ui.min.js
2015-11-16 11:55:24 +01:00
Josh Ponelat
4e2db14e47
change fonts to use Googles Droid-Sans(-Bold).ttf
2015-11-15 07:37:08 +02:00
Laurent Lepinay
51b7b1db39
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
...
Conflicts:
dist/swagger-ui.js
dist/swagger-ui.min.js
2015-11-13 13:42:46 +01:00
jkoepcke
656bb33baa
Show deprecated operations strikethrough
2015-11-11 07:39:38 +01:00
jkoepcke
ceb72afda1
Show deprecated operations strikethrough
2015-11-11 07:39:08 +01:00
Laurent Lepinay
57055ffc18
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
...
Conflicts:
dist/swagger-ui.js
dist/swagger-ui.min.js
2015-10-29 10:48:42 +01:00
Tony Tam
5f22a46672
Merge pull request #1682 from lucian303/oauth-client-secret
...
Make client secret optional, depending on grant type.
2015-10-26 16:24:31 -07:00
Lucian Hontau
19639aba2b
Make client secret optional, depending on grant type.
2015-10-16 13:34:05 -04:00
Eran Stiller
5fa84ff570
Add easy option to specify additional query parameters during the OAuth2 authorization process
2015-10-04 11:37:12 +03:00
Laurent Lepinay
1367e8f6fa
Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
...
Conflicts:
dist/swagger-ui.js
dist/swagger-ui.min.js
test/e2e/v2.js
2015-09-21 14:48:29 +02:00
Tony Tam
8930cbb6dc
updated client version, rebuilt
2015-09-19 09:08:58 -07:00
unknown
ea2cefa46e
Merge branch 'JSONEditor' into JSONEditorMaster
...
Conflicts:
dist/swagger-ui.js
dist/swagger-ui.min.js
src/main/less/screen.less
2015-09-10 10:53:15 +02:00
Tony Tam
b1d0918955
merged
2015-07-22 18:21:14 -07:00
Tony Tam
83afb5b277
rebuilt
2015-07-22 18:19:27 -07:00
Tony Tam
5195447df6
Merge pull request #1419 from lucian303/oauth-client-secret
...
Add support for oauth client secret when calling the token URL. Fixes #1384 . Fixes #1324 .
2015-07-22 18:12:39 -07:00
Tony Tam
e05afd8a4b
Merge pull request #1375 from ponelat/fix/translator
...
Fix/translator
2015-07-22 17:59:24 -07:00
Francisco Guimarães
ade1185961
Changes at src
2015-07-22 02:12:44 -03:00
sonicd300
379609bb70
Added flexible scope separator
2015-07-16 15:18:08 -05:00
Laurent Lepinay
2763800bee
labels css
2015-07-10 15:59:41 +02:00
Laurent Lepinay
d968fda207
Merge remote-tracking branch 'swagger/develop_2.0' into JSONEditorMerge
...
Conflicts:
dist/index.html
dist/swagger-ui.js
dist/swagger-ui.min.js
src/main/html/index.html
src/main/template/param.handlebars
src/main/template/param_required.handlebars
2015-07-07 15:31:21 +02:00
Laurent Lepinay
c51f1ebb9b
preparing for non required properties in jsoneditor
2015-07-02 17:59:13 +02:00
Lucian Hontau
1fd15c6b34
Add support for oauth client secret when calling the token URL. Fixes #1384 . Fixes #1324 .
2015-06-25 17:57:29 -04:00
Josh Ponelat
372723b82d
add data-sw-translate to templates
2015-06-16 12:06:49 +02:00
Vladimir L
695dcc16b1
fixed issue with OAuth hint
2015-06-11 21:21:37 +02:00
Tony Tam
58dadc64f8
rebuilt
2015-06-03 22:45:26 -07:00
Tony Tam
fc6ad9977c
merged
2015-06-03 22:16:43 -07:00
Shawn Gong
1ef90c4240
rewrote into source files, generate using gulp
2015-06-02 10:11:00 -04:00
Laurent Lepinay
dd5fab0b20
expand collapse buttons
2015-05-18 15:34:35 +02:00
Nara Kasbergen
6ce834cfa9
fixes #693
2015-05-14 18:13:31 -04:00
Nara Kasbergen
37d29df074
Add support for GFM syntax in model (schema) descriptions -- relies on one small change to swagger-client
2015-05-14 15:36:23 -04:00
Nara Kasbergen
831a7ae604
Just realized this adds some extra horizontal padding which may not be desirable, so this fixes that
2015-05-13 17:31:47 -04:00
Nara Kasbergen
9923b3cf8a
Use the correct new sorting parameter name
2015-05-13 11:47:25 -04:00
Tony Tam
97ed093e6e
Merge pull request #1239 from ponelat/develop_2.0
...
fixes #1205 , remove dead line
2015-05-08 13:29:02 -07:00
Tony Tam
8661a0f2f6
Merge pull request #1225 from ponelat/fix/1194
...
fix oauth switch
2015-05-08 12:52:05 -07:00
Tony Tam
ccfc4aa4ba
manually added #1086 , #1089
2015-05-08 12:01:06 -07:00
Josh Ponelat
37f4850ce2
fixes #1205 , remove dead line
2015-05-05 19:36:23 +02:00
Josh Ponelat
ec86ee2df9
uncomment swagger-oauth and add script
2015-04-29 12:41:08 +02:00
Laurent Lepinay
f3ee0a436c
Merge remote-tracking branch 'upstream/develop_2.0' into JSONEditor
...
Conflicts:
dist/swagger-ui.js
dist/swagger-ui.min.js
2015-04-20 10:16:54 +02:00
Tony Tam
843e86b5cc
merged with master
2015-04-16 12:29:26 -07:00
Mohsen Azimi
b579783ba0
Add API Key auth in onComplete callback of SwaggerUI#load call
2015-04-15 14:46:32 -07:00
Mohsen Azimi
a7d708593c
Fix issue #1160 "piKey is not set when Explore button is clicked "
2015-04-14 13:30:55 -07:00
Tony Tam
ac66a5009b
replaced corrupt images
2015-03-30 07:28:39 -07:00
laurent lepinay
326f542d04
Merge branch 'develop_2.0' into JSONEditor
...
Conflicts:
dist/index.html
dist/swagger-ui.js
dist/swagger-ui.min.js
2015-03-27 02:15:29 -07:00
Mohsen Azimi
99eaf4eb23
Use SwaggerJS from npm
...
* Uses npm to download latest swagger-js (for now. When swagger-js is
released we will replace git address with actual swagger-ui)
* Uses `postinstall` to generate `browser` folder of swagger-ui. This
can go when swagger-ui is published.
2015-03-25 12:49:39 -07:00
laurent lepinay
e7b7465335
Merge branch 'develop_2.0' into JSONEditor
...
Conflicts:
dist/index.html
dist/swagger-ui.js
dist/swagger-ui.min.js
src/main/coffeescript/view/MainView.coffee
src/main/coffeescript/view/OperationView.coffee
src/main/coffeescript/view/ParameterView.coffee
src/main/coffeescript/view/ResourceView.coffee
src/main/coffeescript/view/SignatureView.coffee
src/main/html/index.html
2015-03-24 07:06:07 -07:00
Mohsen Azimi
afe232747b
Normalize all the line endings
2015-03-17 14:34:22 -07:00
Mohsen Azimi
f49c1689d2
Move backward compatibility to swaggerUi.js and warn users about API changes
2015-03-17 12:10:28 -07:00
Mohsen Azimi
d61cf24ae0
Append swagger-auth global functions to window and don't break backward
2015-03-16 15:07:14 -07:00
