Commit Graph

131 Commits

Author SHA1 Message Date
Tony Tam
d3bf3b9a63 updated in source 2016-08-10 13:33:25 +02:00
Anna Bodnia
20daf3c79e added version into handlebars file name 2016-08-09 14:55:01 +03:00
Anna Bodnia
6a00aa8e98 Merge branch 'feature/issue-2306_' of /Users/bodnia/Documents/work/prj/swagger-ui with conflicts. 2016-08-08 19:12:11 +03:00
Tony Tam
515f142026 merged 2016-07-20 19:05:38 -07:00
Josh Ponelat
5a5967e4b3 add object-assign pollyfill, for travis 2016-05-10 18:00:24 +02:00
Tony Tam
6c8b7ec75c disabled alpha sorter 2016-03-21 17:49:46 -07:00
Tony Tam
3bad381042 removed unused code 2016-03-21 17:46:58 -07:00
bodnia
1e38c8999b [auth] UI changes 2016-03-11 19:02:56 +02:00
Anna Bodnia
23332b1310 [auth] moved authorizations into the header 2016-03-07 21:15:16 +02:00
Anna Bodnia
0934129424 [auth] fixed base spec url 2016-03-07 21:15:14 +02:00
Anna Bodnia
42be315276 [auth] Added api key and basic authorization 2016-03-07 21:15:14 +02:00
bodnia
491802a6a1 [auth] fix Set petstore spec as default 2016-03-07 21:15:13 +02:00
bodnia
e957ff85bf [auth] Added logout for auth with apiKey and basic auth 2016-03-07 21:15:12 +02:00
Anna Bodnia
3b246024d7 Ran gulp 2016-03-07 21:15:09 +02:00
Anna Bodnia
9207be7d4b Put authorizations into popup 2016-03-07 21:15:08 +02:00
Anna Bodnia
18b8a7ce13 [auth] fixed base spec url 2016-03-07 21:14:57 +02:00
Anna Bodnia
a268d007a2 [auth] Added api key and basic authorization 2016-03-07 21:14:57 +02:00
bodnia
e405c42465 [auth] fix Set petstore spec as default 2016-03-07 21:14:56 +02:00
bodnia
67881fb07e [auth] Added logout for auth with apiKey and basic auth 2016-03-07 21:14:55 +02:00
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