Commit Graph

13 Commits

Author SHA1 Message Date
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
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
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
eb390ffca2 JSON Editor feature 2015-03-09 07:06:24 -07:00
Nuno Vieira
f10c0ff405 add print style sheet 2015-02-27 18:18:14 +00:00