Commit Graph

497 Commits

Author SHA1 Message Date
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
2e28c4c2de merged from master 2015-12-11 11:16:55 -08:00
Tony Tam
ea13a647ce updated swagger-client, rebuilt 2015-12-10 12:13:14 -08:00
Tony Tam
b9236ba3f9 updated font files 2015-12-09 20:37:19 -08:00
Tony Tam
daf150de34 fixes #1807 2015-12-09 20:14:41 -08:00
Tony Tam
d39992f7cf rebuilt 2015-12-09 15:16:51 -08: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
Tony Tam
bfa98a88ba removed unused var 2015-12-09 13:52:37 -08:00
Tony Tam
644da49077 added success response per #1476 2015-12-09 13:49:04 -08:00
Tony Tam
8ee29c743a fix for #1453, escaped apostrophe 2015-12-09 12:45:43 -08:00
Tony Tam
40bd458141 Merge pull request #1791 from DarkSorrow/master
Fix file displayed as undefined
2015-12-01 23:43:08 -08:00
Hassan Allybocus
98d8d3e667 Fix file displayed as undefined
File was not showing properly in the DataType for formData
2015-12-01 09:49:32 +01:00
Sean Kennedy
745c8d1c81 rebase, no version bump, updated dist builds 2015-11-30 08:36:29 -05: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
Tony Tam
3cb9f1f797 merged 2015-11-27 18:09:41 -08:00
Tony Tam
c482d1c800 merged with master 2015-11-27 18:04:28 -08:00
Tony Tam
7c87a4000a rebuilt 2015-11-27 18:02:27 -08:00
Tony Tam
8da0078791 updated swagger-js version 2015-11-27 17:59:13 -08:00
Tony Tam
8276fbf073 fixes #1767 2015-11-27 17:28:46 -08:00
Ferdinand Prantl
7489c0b566 Merge branch 'master' into fix-fields-basic-auth 2015-11-22 14:44:18 +01:00
Ferdinand Prantl
fcc50a298b Update dstributed files 2015-11-21 15:32:14 +01:00
Josh Ponelat
de52eb776c add 'use strict'; to index.js 2015-11-20 08:58:39 +02:00
Josh Ponelat
d66526d802 built files 2015-11-20 08:48:37 +02:00
Tony Tam
d59e4141a1 rebuilt 2015-11-18 11:14:25 -06:00
Tony Tam
6d5c593b21 updated swagger-client version 2015-11-18 08:33:02 -06:00
Laurent Lepinay
e051023288 dist 2015-11-16 12:07:43 +01:00
Laurent Lepinay
41bf523e68 Merge remote-tracking branch 'upstream/master' into JSONEditorMaster
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
2015-11-16 11:55:24 +01:00
Josh Ponelat
4e2db14e47 change fonts to use Googles Droid-Sans(-Bold).ttf 2015-11-15 07:37:08 +02: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
Tony Tam
13314c1645 Merge pull request #1709 from cupgit/fix_double_curl
Only add 'curlCommand' if the 'curl' class is used on a div
2015-11-06 08:47:21 -08:00
Mehdi Achour
dafe87b66d Add french translation 2015-11-01 17:16:00 +01: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
Michel Cupurdija
b460b5042a Added change to dist 2015-10-27 17:23:40 +01:00
Tony Tam
2fced78075 rebuilt 2015-10-26 17:11:10 -07:00
Tony Tam
f515752602 rebuilt 2015-10-16 12:58:24 -04:00
Tony Tam
a732bd3f79 rebuilt 2015-10-15 18:15:49 -04:00
Rick Winscot
2f2e727636 https://github.com/swagger-api/swagger-ui/issues/1664 2015-10-15 16:39:59 -04:00
Tony Tam
e72e8f7e61 rebuilt 2015-10-08 23:30:17 -07:00
Tony Tam
500b6201c5 updated swagger-client version 2015-10-08 23:25:43 -07:00
Laurent Lepinay
c269dbd9ed don't override title and type if they are already defined 2015-10-05 13:36:52 +02: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
Tony Tam
e45f4b7e50 added ja file to dist 2015-10-02 10:37:31 -07:00
Laurent Lepinay
50a9fc8d79 dont check the post body text area for as a required field when it's not visible (fro example when using the jsoneditor) 2015-09-24 11:43:26 +02:00
Laurent Lepinay
f08e9df8da fix jsoneditor render when nested object type is not defined 2015-09-21 15:11:50 +02: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
8bc259558b updated build 2015-09-19 11:58:10 -07:00
Tony Tam
bee68dd7c5 Merge branch 'master' of https://github.com/ezburg/swagger-ui into ezburg-master 2015-09-19 11:48:58 -07:00
Tony Tam
20b0dde184 updated timeouts 2015-09-19 11:36:40 -07:00