Commit Graph

189 Commits

Author SHA1 Message Date
bodnia
dfd9b10798 [auth] fixed display of scopes in auth button, added highlight of empty field 2016-03-15 17:13:59 +02:00
bodnia
56c5294c22 [auth] Authorize with oauth2 2016-03-13 23:37:10 +02:00
Anna Bodnia
57498de570 ran gulp 2016-02-22 17:46:18 +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
Anna Bodnia
3426cc8c13 #1248 moved model rendering into separate partial 2016-01-05 13:50:30 +02:00
Anna Bodnia
3dd4315bb8 #1248 Added schema render from swagger-js to swagger-ui 2016-01-04 20:23:37 +02:00
Tom Demeranville
7fca3bdb4d added changes to dist 2015-12-18 16:39:57 +00: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
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
2fced78075 rebuilt 2015-10-26 17:11:10 -07: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
f08e9df8da fix jsoneditor render when nested object type is not defined 2015-09-21 15:11:50 +02: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
ec446fd7f3 updated client from #1552 2015-08-19 22:44:54 -07:00
Tony Tam
83afb5b277 rebuilt 2015-07-22 18:19:27 -07:00
Tony Tam
996433d8bc merged 2015-07-22 18:14:18 -07:00
Tony Tam
b909e2adda merged 2015-07-22 18:05:52 -07:00
sonicd300
66a049c664 Added built files 2015-07-17 10:36:32 -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
92efe421d0 fixes 2015-07-07 14:55:04 +02:00
Josh Ponelat
81ff9ee8c8 finish removing bootstrap.min entirely 2015-06-04 20:49:21 +02:00
Shawn Gong
1ef90c4240 rewrote into source files, generate using gulp 2015-06-02 10:11:00 -04:00
Josh Ponelat
ec86ee2df9 uncomment swagger-oauth and add script 2015-04-29 12:41:08 +02:00
Laurent Lepinay
78c7dda0a9 fixed jshint issues 2015-04-20 10:32:33 +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
3c6d4ff3e6 rebuilt 2015-04-15 12:02:54 -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
Mohsen Azimi
ede1faa0c8 Add ability to override redirectUrl in swagger-oauth
Fixes #457
2015-03-24 13:33:18 -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
93c18d59b8 Make SwaggerUi UMD compatible 2015-03-23 14:28:14 -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
Jeremy Whitlock
bdb181cb08 Update swagger-js with latest
* For the e2e tests to run, we had to enable CORS in http-server.  The
  release of http-server that supports CORS hasn't come out yet so we
  have to use http-server@master until then.  Here is the commit I speak
  of: 30f4d1e008
2015-03-11 14:17:11 -06:00
laurent lepinay
eb390ffca2 JSON Editor feature 2015-03-09 07:06:24 -07:00
Mohsen Azimi
33d5331e60 Merge branch 'master' of https://github.com/CatLabInteractive/swagger-ui into CatLabInteractive-master
Conflicts:
	dist/lib/swagger-oauth.js
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	lib/swagger-oauth.js
2015-03-02 10:15:48 -08:00
Tony Tam
a7e7d09e75 made space-delimited 2015-02-27 09:42:05 -08:00
Tony Tam
779db5da6a reverted files 2015-02-27 09:42:04 -08:00
Tony Tam
8f0d89c54a updated js lib 2015-02-27 09:42:04 -08:00
Mohsen Azimi
7622b38426 Add underscore source map file
Fixes #949
2015-02-27 09:41:37 -08:00
Tony Tam
4c989141b5 rebuilt 2015-02-27 09:41:02 -08:00
Tony Tam
7caac4f4ae updated version, client 2015-02-27 09:40:45 -08:00
Tony Tam
9d0c6c50e7 updated from master 2015-02-27 09:37:25 -08:00
Константин Калинин
6b78d3eb6c readme 2015-02-26 15:44:03 +03:00
Thijs Van der Schaeghe
9c6582455e Adding (ignored) oauth2 state parameter. 2015-02-14 14:34:39 +01:00
Константин Калинин
f6d1fd0b04 merge 2015-02-13 16:06:27 +03:00
Константин Калинин
49e6389f3f translated of title-attribute and extended a list ow known lexemes 2015-02-13 15:57:34 +03:00