Commit Graph
58 Commits
Author SHA1 Message Date
Anna Bodnia 2199a8120c [auth] moved logout buttons into authentication view 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 8280cc6b34 [auth] Added logout button 2016-03-07 21:14:55 +02:00
Anna Bodnia 85df0f78bc [auth] Fixed applying api key 2016-03-07 21:14:55 +02:00
Anna Bodnia 56e048aa17 Ran gulp 2016-03-07 21:14:54 +02:00
Anna Bodnia 337b9bc922 [auth]: Api key, basic authorization in main view 2016-03-07 21:14:28 +02:00
bodnia 4f48f40638 fixed running unit tests 2016-02-24 23:18:43 +02:00
Tony Tam 6ee0494c7c rebuilt 2016-02-22 09:45:51 -08: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
Tony Tam c60560eb55 merged & rebuilt 2016-01-29 16:11:45 -08:00
Anna Bodnia a0a074bc30 #1925 Fixed "title" field creates empty json objects 2016-01-29 16:47:29 +02:00
Tony Tam 7a5f6b2c59 updated font file 2016-01-28 09:58:09 -08:00
Nick Maynard bcbf55eb03 Reapply changes in PR 1740, but fix properly in .less files 2016-01-27 22:05:02 +00:00
Anna Bodnia 0691cc47ef #1901 Body parameter content type xml does not handle nested definition correctly 2016-01-25 16:29:46 +02:00
Tony Tam 39877cbd0e merged 2016-01-19 22:14:42 -05:00
Anna Bodnia 454917a2ba #1248 createXMLSample prettified xml display 2016-01-15 17:23:34 +02:00
Anna Bodnia 65877f339b #198 ran gulp 2015-12-31 11:24:12 +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 8ee29c743a fix for #1453, escaped apostrophe 2015-12-09 12:45:43 -08:00
Sean Kennedy d2d057c0c0 distribution of new defaultModelRendering option 2015-11-30 08:27:58 -05:00
Tony Tam 20c2454438 rebuilt after merge with master 2015-11-27 18:21:04 -08: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
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 b909e2adda merged 2015-07-22 18:05:52 -07: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
Laurent Lepinay dd5fab0b20 expand collapse buttons 2015-05-18 15:34:35 +02: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
Tony Tam ccfc4aa4ba manually added #1086, #1089 2015-05-08 12:01:06 -07: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
laurent lepinay 447b905132 JSONEditor enable/disable flag 2015-03-12 07:12:07 -07:00
laurent lepinay 5eaea861a0 JSON Editor feature 2015-03-09 05:37:31 -07:00
Tony Tam 038443fc22 merged from develop_2.0 2015-02-01 02:27:43 -08:00
Tony Tam 329772af4c merged from auth_2.0 branch 2014-11-11 00:16:13 -08:00
Tony Tam 8e20a32344 updated js libs 2014-11-10 23:19:14 -08:00
Tony Tam c6fb33a9c7 added support for body params with name other than 2014-10-17 08:51:15 -07:00
Tony Tam b0301d6ee3 rebuilt with deprecate support, https://github.com/wordnik/swagger-ui/pull/645 2014-10-17 06:23:33 -07:00
Bez Hermoso f8991bc7f5 Moved reference to throbber.gif to CSS file. 2014-08-21 13:20:45 -07:00
Kyle J. Ginavan 34ab47e9e7 moved css scoping to less templates per owners request, converted highlight.default.css to less, and made reset css its only include as it is difficult to scope due to html and body tag css overrides 2014-04-11 09:59:19 -05:00
Kyle J. Ginavan 84f4e670fc added scope to swagger, therefore, it can be included/embedded within other applications and not have css bleed. 2014-04-11 08:53:26 -05:00
Tony Tam da63a33845 merged from oauth2 branch 2014-03-19 21:50:31 -07:00
Tony Tam aeffecd8d4 rebuilt per #417 2014-03-18 19:47:04 -07:00
Tony Tam a5556d7f01 added options styling, swagger-js update, per #420 2014-03-18 19:41:49 -07:00
Tony Tam fcb82bdac4 merged https://github.com/wordnik/swagger-ui/pull/323 2013-10-06 15:47:13 -07:00