Commit Graph

112 Commits

Author SHA1 Message Date
Anna Bodnia
56e048aa17 Ran gulp 2016-03-07 21:14:54 +02:00
Anna Bodnia
ff318ad23c Put authorizations into popup 2016-03-07 21:14:28 +02:00
Anna Bodnia
ed7c7261be performance #1956 added highlightSizeThreshold option disable highlight when length more than highlightSizeThreshold 2016-02-22 17:24:34 +02:00
erekle
779d9b74e2 fixed some words. 2016-02-21 20:46:13 +02:00
erekle
a3a0d03e7e added geo translation 2016-02-21 20:46:12 +02:00
Anna Bodnia
14124c729b Upgraded highlight version to 9.1, removed highlight when sample is too long 2016-02-09 15:16:07 +02:00
Anna Bodnia
bb9de54eb5 sample display render blocked screen 2016-02-02 17:06:15 +02:00
Tony Tam
dc905bb5ff Revert "Issue 1899" 2016-01-21 12:41:07 -05:00
Anna Bodnia
c92edbdca1 #1899 Fixed Links in interactive docs open in new window 2016-01-21 13:51:30 +02:00
Anna Bodnia
3dd4315bb8 #1248 Added schema render from swagger-js to swagger-ui 2016-01-04 20:23:37 +02:00
Tony Tam
60848bb4e2 rebuilt, set editor to false by default 2015-12-16 02:46:47 -08:00
Laurent Lepinay
2c431d7873 Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/javascript/view/OperationView.js
	src/main/less/screen.less
2015-12-16 10:25:38 +01:00
Tony Tam
5af798c84e Merge pull request #1648 from estiller/master
Support additional query parameters during OAuth2 authorization process
2015-12-09 14:36:38 -08:00
Sean Kennedy
1ccab589f8 implement option to control whether models are displayed as valid JSON schema or the docs rendering (with descriptions) by default 2015-11-30 08:26:30 -05: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
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
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
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
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
Nara Kasbergen
6ce834cfa9 fixes #693 2015-05-14 18:13:31 -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
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
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
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
Mohsen Azimi
79d9d1cf0d Update docs 2015-03-16 13:45:08 -07:00
Mohsen Azimi
66adb0d508 Remove global auth object references and fix header api key adding mechanism
Fixes #1033
2015-03-16 13:45:08 -07:00
laurent lepinay
447b905132 JSONEditor enable/disable flag 2015-03-12 07:12:07 -07:00
Mohsen Azimi
dee699833f Update favicon with official logo and HiDPI support 2015-03-09 18:07:35 -07:00
laurent lepinay
eb390ffca2 JSON Editor feature 2015-03-09 07:06:24 -07:00
LASSALLE Nicolas
19352cb3ff encodeURIComponent on api_key 2015-03-06 11:10:17 -08:00
Nuno Vieira
f10c0ff405 add print style sheet 2015-02-27 18:18:14 +00:00
Tony Tam
2dad51f6b1 updated from master 2015-02-18 21:18:53 -08:00
Mohsen Azimi
ae4686b0dd More test + fix decodeURIComponent call
Previously I was calling decodeURIComponent on regex match result which
was an array. This fixes that and alos adds more tests
2015-01-30 16:34:08 -08:00