Commit Graph

772 Commits

Author SHA1 Message Date
Ferdinand Prantl
7489c0b566 Merge branch 'master' into fix-fields-basic-auth 2015-11-22 14:44:18 +01:00
Ferdinand Prantl
d7e998ede7 Fix an unwanted page reload when entering username and password in the basic authentication form
Prevent the default hyperlink action.
2015-11-21 15:29:12 +01:00
Ferdinand Prantl
2274e0cef6 Fix reading values of username and password from the basic authwntication form
Wrong selectors were used.
2015-11-21 15:28:06 +01:00
Brenton McSweyn
0665ee8557 Fixes an undefined error when type is defined in the schema 2015-11-20 08:47:27 +02:00
verpixelt
e6336a3f5e Rewrite Less file 2015-11-17 12:43:18 +01:00
verpixelt
0a7fa0cd82 Remove element selector 2015-11-17 11:09:49 +01:00
verpixelt
315dbadb23 Reduce nesting, rewrite selectors 2015-11-17 11:07:34 +01:00
Laurent Lepinay
ffbf6b2f97 fix corrupted images 2015-11-16 12:05:26 +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
jkoepcke
656bb33baa Show deprecated operations strikethrough 2015-11-11 07:39:38 +01:00
jkoepcke
ceb72afda1 Show deprecated operations strikethrough 2015-11-11 07:39:08 +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
Tony Tam
5aeb23d63e added map to address https://github.com/swagger-api/swagger-js/issues/619 2015-11-04 12:52:13 -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
Michel Cupurdija
24649aa848 Only add 'curlCommand' if the 'curl' class is used on a div 2015-10-27 16:52:34 +01:00
Tony Tam
5f22a46672 Merge pull request #1682 from lucian303/oauth-client-secret
Make client secret optional, depending on grant type.
2015-10-26 16:24:31 -07:00
Lucian Hontau
19639aba2b Make client secret optional, depending on grant type. 2015-10-16 13:34:05 -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
Damiano Albani
1128187b5b Fix calculation of operation "number" property 2015-10-09 15:55:32 +02:00
Damiano Albani
a201d18dc2 Simplify online validator URL building (HTTP[S]?)
Explanation: http://stackoverflow.com/questions/9646407/two-forward-slashes-in-a-url-src-href-attribute/9646435#9646435
2015-10-08 09:46:54 +02: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
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
Tony Tam
9bf8129058 Merge pull request #1607 from safinalexey/master
fix for angular apps, when you dont have proper route and clicking on…
2015-09-19 11:51:19 -07:00
Tony Tam
8930cbb6dc updated client version, rebuilt 2015-09-19 09:08:58 -07: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
Thomas Kerpe
40c732c087 Prevent screwed up layout on long Content-Types
Some Content-Types (especially Vendor specific Content-Types)
can be rather long. This breaks the layout so prevent
rendering too wide select boxes by default.
2015-09-15 17:00:42 +02:00
Thomas Kerpe
4e6669d63f Merge branch 'master' of github.com:toke/swagger-ui 2015-09-15 16:22:11 +02:00
Thomas Kerpe
84337d5a0b Prevent screwed up layout on long Content-Types
Some Content-Types (especially Vendor specific Content-Types)
can be rather long. This breaks the layout so prevent
rendering too wide select boxes by default.
2015-09-15 16:19:18 +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
Yuji Yamano
21be4d132f Add missing data-sw-translate attributes. 2015-08-07 14:28:37 +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
Francisco Guimarães
04a3fd4c81 Missing some data-sw-translation 2015-07-23 01:03:41 -03:00
Francisco Guimarães
eb50137901 Missing some data-sw-translation at templates 2015-07-23 00:56:22 -03:00
Francisco Guimarães
ec7ecbd543 Missing some data-sw-translation at templates 2015-07-23 00:11:12 -03:00
Francisco Guimarães
bc4b43a7d3 merged from swagger-api 2015-07-23 00:02:14 -03:00
Francisco Guimarães
2a75f039e8 missing some data-sw-translation 2015-07-22 23:48:41 -03:00
Tony Tam
b1d0918955 merged 2015-07-22 18:21:14 -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
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
5195447df6 Merge pull request #1419 from lucian303/oauth-client-secret
Add support for oauth client secret when calling the token URL. Fixes #1384. Fixes #1324.
2015-07-22 18:12:39 -07:00
Tony Tam
b909e2adda merged 2015-07-22 18:05:52 -07:00