Commit Graph
229 Commits
Author SHA1 Message Date
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
Tony Tam 5aeb23d63e added map to address https://github.com/swagger-api/swagger-js/issues/619 2015-11-04 12:52:13 -08:00
Michel Cupurdija 24649aa848 Only add 'curlCommand' if the 'curl' class is used on a div 2015-10-27 16:52:34 +01:00
Laurent Lepinay c269dbd9ed don't override title and type if they are already defined 2015-10-05 13:36:52 +02: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 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
safin 16cfce4c20 fix for angular apps, when you dont have proper route and clicking on header leads to 'othewise' branch of router 2015-09-16 18:48:53 +03:00
unknown 504095e10e regression bug fix 2015-09-16 10:44:57 +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
Gareth Kirwan 4288506957 Fix $ref strings treated as objects by JSONEditor 2015-09-08 15:47:42 +01:00
Yuji Yamano 8bed8b665d Fix a XSS issue. 2015-08-12 02:48:52 +00:00
Aaron Baker ed41c336a3 Issue #1423: responses containing references to definitions were not being fully resolved when the spec was pulled in over AJAX but was working locally. OperationView.render()'s parsing of the responses was just checking if the ref _started_ with '#/definitions/', not whether it contained it, and when pulled in over AJAX the refs have the URL prepended to them 2015-08-05 12:48:34 +01:00
Tony Tam 996433d8bc merged 2015-07-22 18:14:18 -07:00
Tony Tam 958e74875f Merge pull request #1427 from lucian303/fix-validator-https-detection
Fix validator's https detection
2015-07-22 18:13:20 -07:00
Tony Tam b909e2adda merged 2015-07-22 18:05:52 -07:00
Tony Tam f1a7b2cea8 Merge pull request #1395 from praseetht/master
Fix #1394: A bug in IE 10/11 causes the placeholder text to be copied to value
2015-07-22 18:03:32 -07:00
Tony Tam 29dc4b929d Merge pull request #1387 from brownstein/fix-oauth-toggle-on-operations
Fix incorrect display of oAuth toggle in non-oAuth operation views
2015-07-22 17:59:55 -07:00
Tony Tam e05afd8a4b Merge pull request #1375 from ponelat/fix/translator
Fix/translator
2015-07-22 17:59:24 -07: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
Taras Katkov a04b562f55 Spelling and closing tag fixes 2015-07-01 17:55:19 -04:00
Lucian Hontau 52aaf874d8 Fix value for window.location.protocol. 2015-06-26 16:26:38 -04:00
aurelian 554302f49d ignore case. 2015-06-22 16:26:32 +02:00
aurelian e475bb908e X-data-* vendor extension for parameter objects
Exposes X-data- as html data attributes for parameter objects

See comment in #991
2015-06-22 14:48:21 +02:00
Praseeth T 6d4bc72a64 Fix #1394: A bug in IE 10/11 causes the placeholder text to be copied to "value" 2015-06-21 11:37:29 +05:30
Robert Brownstein 128fc5c112 Found a bug in OperationView.js which caused the oAuth toggle to be displayed for non-oAuth endpoints if oAuth was enabled at all, fixed it 2015-06-19 13:37:54 -04:00
Josh Ponelat 372723b82d add data-sw-translate to templates 2015-06-16 12:06:49 +02:00
Vladimir L eaaf62a01e removed unnesessary logic, replaced by CSS style 2015-06-11 21:26:30 +02:00
Vladimir L 695dcc16b1 fixed issue with OAuth hint 2015-06-11 21:21:37 +02:00
Tony Tam c7e07705f2 removed logging 2015-06-06 08:22:40 -07:00
Jeremy Whitlock a4124fba7c Update swagger-ui to reuse client authorizations properly
Fixes #472
2015-06-05 17:45:14 -06:00
Josh Ponelat dfab1df1e9 remove dead code: show-wordnik-dev 2015-06-05 10:56:39 +02:00
Josh Ponelat a126c17841 fixed support for default values in param_list 2015-06-04 08:53:12 +02:00
Tony Tam 9ba75c02be fix for lint errors 2015-06-03 23:04:57 -07:00
Tony Tam 9e9ca13850 merged 2015-06-03 22:47:39 -07:00
Tony Tam 58dadc64f8 rebuilt 2015-06-03 22:45:26 -07:00
Tony Tam 62afd58210 merged 2015-06-03 22:36:46 -07:00
Tony Tam 8ab141aa7f Merge branch 'develop_2.0' of ssh://github.com/bdkosher/swagger-ui into bdkosher-develop_2.0 2015-06-03 22:23:48 -07:00
Tony Tam fc6ad9977c merged 2015-06-03 22:16:43 -07:00
Tony Tam eae5dd3df9 merged 2015-06-03 22:15:00 -07:00
Tony Tam 8c7997a033 merged 2015-06-03 22:12:51 -07:00
Shawn Gong 1ef90c4240 rewrote into source files, generate using gulp 2015-06-02 10:11:00 -04:00
Josh Ponelat 162cd536a1 use $.text instead of $.html for showMessage and onFailure 2015-06-01 13:06:31 +02:00
Tony Tam bcf52d351b updated validator badge logic per #1299 2015-05-19 11:28:21 -07:00
Laurent Lepinay dd5fab0b20 expand collapse buttons 2015-05-18 15:34:35 +02:00
Laurent Lepinay f16c265087 disabled edit json button 2015-05-18 14:26:55 +02:00
Laurent Lepinay 512e78c6aa disabled edit properties button 2015-05-18 14:24:41 +02:00
Vitaliy Kanev 88838213c8 remove fileupload function 2015-05-16 15:47:45 +03:00
Vitaliy Kanev 9688af989e fixed: REFACTOR handleFileUpload 2015-05-16 15:42:50 +03:00
Joe Wolf 488611a4ff 508 Fixes
Addresses #1021 mostly by adding label tags, generating unique element
ids as needed.

In the process, moved the label text that gets set in the
___ContentTypeView.js files to the respective handlebar templates; the
text was static as far as I could tell.

There are additional minor 508 improvements that can be made with the
tables (scope tags, header attributes)
2015-05-15 11:16:50 -04:00
Nara Kasbergen 6ce834cfa9 fixes #693 2015-05-14 18:13:31 -04:00