Commit Graph

1276 Commits

Author SHA1 Message Date
Ferdinand Prantl
7489c0b566 Merge branch 'master' into fix-fields-basic-auth 2015-11-22 14:44:18 +01:00
Tony Tam
1d634bc79c Merge pull request #1769 from swagger-api/brentonmcs-master
Rebased @brentonmcs fix on latest master
2015-11-21 08:26:24 -10:00
Josh Ponelat
da279e1f39 use node.js v4.2.x in travis tests 2015-11-21 19:30:55 +02:00
Ferdinand Prantl
fcc50a298b Update dstributed files 2015-11-21 15:32:14 +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
Sean Kennedy
67168564fd distribution of new defaultModelRendering option 2015-11-20 15:16:44 -05:00
Sean Kennedy
8fbea34873 increase package version 2015-11-20 15:15:21 -05:00
Sean Kennedy
08413482a1 implement option to control whether models are displayed as valid JSON schema or the docs rendering (with descriptions) by default 2015-11-20 15:11:15 -05:00
Sean Kennedy
02d834996c consistent handling of dev tasks so that clean and copy actions don't bother each other 2015-11-20 15:09:44 -05: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
Brenton McSweyn
0665ee8557 Fixes an undefined error when type is defined in the schema 2015-11-20 08:47:27 +02:00
Sean Kennedy
076aefce23 gitignore local specs copied to dist & anything in test/specs/local 2015-11-19 09:13:56 -05:00
Sean Kennedy
ccf5118f5e add targets to the gulpfile to simplify testing how various local specs display
(and modifying and looking again at those specs iteratively)

new gulp targets:
dev-dist: [lint, copy] (this runs the same code in dist, but without doing a clean first)
dev: [default, serve] (the task to run if you're iteratively making changes and don't want/need the dist directory to be regenerated every time)
2015-11-19 09:11:18 -05:00
Tony Tam
0bd93c84a4 Merge pull request #1764 from curtisgibby/patch-1
Add apostrophe to contraction in readme
2015-11-18 23:51:05 -06:00
Curtis Gibby
29854dc2ff Add apostrophe to contraction in readme
"what's" == "what is"
2015-11-18 15:40:13 -07: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
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
e051023288 dist 2015-11-16 12:07:43 +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
Tony Tam
257db60a0b Merge pull request #1740 from jkoepcke/master
Show deprecated operations strikethrough
2015-11-12 00:04:36 -08: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
Ron
a5f72814cf Merge pull request #1732 from marcelometal/patch-1
Fixed typo in README.md
2015-11-05 11:27:40 -08:00
Marcelo Jorge Vieira
1cf7a8b9e8 Fixed typo in README.md
Replaced 'shoul' with 'should'
2015-11-05 17:20:23 -02: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
Tony Tam
b00623e10c Merge pull request #1717 from machour/master
Add french translation
2015-11-04 08:15:53 -08:00
Tony Tam
04a246dfc3 Merge pull request #1725 from lturista/master
Italian translation
2015-11-04 07:18:14 -08:00
lturista
540f43c24e Update it.js 2015-11-04 12:12:26 +01:00
lturista
bff6cc4a40 Create it.js
Italian translation.
2015-11-04 12:10:11 +01: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
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
2fced78075 rebuilt 2015-10-26 17:11:10 -07: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
2c252f3c48 Update README.md 2015-10-16 13:13:44 -04:00
Tony Tam
f515752602 rebuilt 2015-10-16 12:58:24 -04:00
Tony Tam
51ee684caa Merge branch 'rwinscot-master' 2015-10-15 18:16:01 -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