Commit Graph

1306 Commits

Author SHA1 Message Date
Tony Tam
5e5e33ace1 updated versions for release 2016-01-06 14:16:18 -08:00
Tony Tam
bbf4e9a55b Merge pull request #1849 from bodnia/master
Moved tests into v2 folder, added helper to run spec with the same na…
2016-01-06 05:57:27 -08:00
Anna Bodnia
66544a87ca Moved tests into v2 folder, added helper to run spec with the same name as test filename 2016-01-05 15:55:40 +02:00
Tony Tam
d032bd2d8f updated swagger-client #1846 2016-01-03 22:06:49 -08:00
Tony Tam
b246d406fe Merge pull request #1842 from konstantin-uniyatov/translation_improvements
Translation additions
2016-01-03 16:58:41 -08:00
Tony Tam
d919a5e779 Merge branch 'bodnia-master' 2015-12-31 11:18:07 -08:00
Tony Tam
5dc1eae4a9 added pl file 2015-12-31 11:17:55 -08:00
Tony Tam
8cbf3905fd rebuilt 2015-12-31 11:17:39 -08:00
Tony Tam
00fc407bfa rebuilt 2015-12-31 11:17:32 -08:00
Tony Tam
4cc887a0ba merged 2015-12-31 11:16:46 -08:00
Anna Bodnia
2b377bfa9e Response headers not being displayed for either 200 or other responses #1117 2015-12-31 18:39:45 +02:00
Anna Bodnia
65877f339b #198 ran gulp 2015-12-31 11:24:12 +02:00
Tony Tam
7071fca9e2 Merge pull request #1843 from konstantin-uniyatov/russian_localization_fixes
Fixes Russian translation
2015-12-30 22:36:18 -08:00
Ron
4b66ffcb00 Swagger Spec -> OpenAPI Spec 2015-12-30 14:54:19 -08:00
Tony Tam
d528e23638 Merge pull request #1844 from peterblazejewicz/feature/lang-pl
Add Polish translation file for Swagger UI
2015-12-30 13:32:54 -08:00
Peter Blazejewicz
10bd622c6c Add Polish translation file for Swagger UI
The Polish translation is based on en.js file
The results were tested with local development
mode and change in index.html to enable localization.
The translation uses common language terms, not geeky
or too technical jargon ones.
Thanks!
2015-12-30 21:01:31 +01:00
Konstantin Uniyatov
4127652776 Fixes Russian translation 2015-12-30 22:09:56 +03:00
Konstantin Uniyatov
c23ed39ab0 Translation support for parameter_content_type.handlebars and signature.handlebars 2015-12-30 21:54:48 +03:00
Tony Tam
16d586a22a rebuilt 2015-12-30 10:48:37 -08:00
Tony Tam
2a9551dabe Merge pull request #1841 from bodnia/master
Inconsistent enter key behaviour #198
2015-12-30 10:47:48 -08:00
Anna Bodnia
c6b224268e Inconsistent enter key behaviour #198 2015-12-30 18:04:16 +02:00
Tony Tam
1817ac84e5 Merge branch 'TomDemeranville-clientCredentialFlowAndMultipleSchemes' 2015-12-18 12:13:24 -08:00
Tony Tam
3135d23c1e Merge branch 'clientCredentialFlowAndMultipleSchemes' of https://github.com/TomDemeranville/swagger-ui into TomDemeranville-clientCredentialFlowAndMultipleSchemes 2015-12-18 12:11:18 -08:00
Tony Tam
afe1b3dcdf disabled tests #1826 2015-12-18 12:10:34 -08:00
Tony Tam
3125a3df24 rebuilt 2015-12-18 12:06:35 -08:00
Tony Tam
849d3cffb4 Merge branch 'master' of github.com:swagger-api/swagger-ui 2015-12-18 12:05:52 -08:00
Tony Tam
de0103bdbd rebuilt with https://github.com/swagger-api/swagger-js/issues/668 applied 2015-12-18 12:05:06 -08:00
Tom Demeranville
7fca3bdb4d added changes to dist 2015-12-18 16:39:57 +00:00
Tom Demeranville
04c23c4ee5 added selector back in 2015-12-18 16:24:07 +00:00
Tom Demeranville
3f9b178ce1 fixed display of OAuth scheme in dialog if more than one scheme 2015-12-18 16:21:01 +00:00
Tom Demeranville
bfc33ec6cd Added support for client credentials (application) flow
Added support for multiple authentication schemes

To use the client credentials, index.html needs to have
1. input boxes to receive client id and client secret
2. handlers that intitialise OAuth correctly on change.

For example, you could replace the explore and apikey inputs in the header with:

      <div class='input'><input placeholder="client id" id="input_clientId" name="clientId" type="text" autocomplete="off"/></div>
      <div class='input'><input placeholder="client secret" id="input_clientSecret" name="clientSecret" type="text" autocomplete="off"/></div>

and add the following javascript to handle updates within the initialisation block (replacing the apikey javascript):

      function updateOauth(){
          initOAuth({
              clientId: $('#input_clientId')[0].value,
              clientSecret: $('#input_clientSecret')[0].value,
              realm: "blank",
              appName: "blank"
          });
      }

      $('#input_clientId').change(updateOauth);
      $('#input_clientSecret').change(updateOauth);

These examples could be incorporated into the swagger index.html file if required (or a new example created)

Issues - displaying multiple schemes could be improved.  Currently the UI is unaware that a particular scheme is required for a call so displays all scopes as options.  Will require work on core swagger ui and templates to make scheme available to swagger-oauth.js
2015-12-18 16:11:25 +00:00
Tom Demeranville
b745779e15 Added support for OAuth client credentials (application) flow
Added support for multiple authentication schemes

To use the client credentials, index.html needs to have
1. input boxes to recieve client id and client secret
2. handlers that intitialse OAuth correctly on change.

For example, you could replace the explore and apikey inputs in the header with:

      <div class='input'><input placeholder="client id" id="input_clientId" name="clientId" type="text" autocomplete="off"/></div>
      <div class='input'><input placeholder="client secret" id="input_clientSecret" name="clientSecret" type="text" autocomplete="off"/></div>

and add the following javascrip to handle updates within the initialisation block (replacing the apikey javascript):

      function updateOauth(){
          initOAuth({
              clientId: $('#input_clientId')[0].value,
              clientSecret: $('#input_clientSecret')[0].value,
              realm: "blank",
              appName: "blank"
          });
      }

      $('#input_clientId').change(updateOauth);
      $('#input_clientSecret').change(updateOauth);
2015-12-18 15:58:19 +00:00
Tony Tam
8e420faa23 Merge pull request #1823 from brlo/patch-1
check 'defaultValue' before calling 'replace'
2015-12-17 14:04:51 -05:00
Rodion
63951d0bf8 check 'defaultValue' before calling 'replace'
fix error "defaultValue.replace is not a function" when defaultValue is Integer
2015-12-17 20:14:09 +03:00
Tony Tam
85b0f4bab0 added jsonEditor option 2015-12-16 03:01:35 -08:00
Tony Tam
dbf00bba5b Merge branch 'thomsonreuters-JSONEditorMaster' 2015-12-16 02:47:06 -08:00
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
63f6edeef0 Merge branch 'issue-1807' 2015-12-11 11:17:24 -08: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
d3bb5283b4 added fonts to binary 2015-12-09 20:38:24 -08:00
Tony Tam
b9236ba3f9 updated font files 2015-12-09 20:37:19 -08:00
Tony Tam
c578a530af formatting 2015-12-09 20:35:44 -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
0db417eaa3 Merge pull request #1563 from triccardi-systran/patch-http-server-version-dependency
Go back to released http-server versions dependency now that they released CORS support in 0.8.0
2015-12-09 15:16:10 -08:00
Tony Tam
1945404efe Merge pull request #1530 from yyamano/fix-xss
Fix a XSS issue.
2015-12-09 15:15:16 -08:00
Tony Tam
1ae098e390 Merge pull request #1521 from yyamano/fix-missing-data-sw-translate
Add missing data-sw-translate attributes.
2015-12-09 15:13:25 -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