Commit Graph

1063 Commits

Author SHA1 Message Date
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
f0e7de25ff Merge pull request #1407 from Collaborne/improvements/npm-license-spdx-warning
Use a SPDX-compatible identifier for the 'license' value
2015-07-22 18:06:23 -07:00
Tony Tam
fd57e34393 Merge branch '3scale-data-vendor-extension' into develop_2.0 2015-07-22 18:06:01 -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
d91959f473 Merge branch 'darklynx-apikey_template_fix' into develop_2.0 2015-07-22 18:03:04 -07:00
Tony Tam
c477a69d06 merged 2015-07-22 18:02:57 -07:00
Tony Tam
34e4a68da8 Merge pull request #1389 from bigtlb/develop_2.0
OAuth flow only selected scopes should be sent to Authorize endpoint #1388.
2015-07-22 18:00:08 -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
Tony Tam
ac811a7aa0 Merge pull request #1371 from ipeluffo/lang-es
Spanish language translation
2015-07-22 17:58:39 -07:00
Tony Tam
ee721c400d merged to develop_2.0 2015-07-22 17:57:51 -07:00
Tony Tam
dc6a81275e Merge branch 'oauth_tooltip_fix' of ssh://github.com/darklynx/swagger-ui into darklynx-oauth_tooltip_fix 2015-07-22 17:56:15 -07:00
Tony Tam
102cf0a896 Merge pull request #1360 from kkirsche/patch-2
Remove moot `version` property from bower.json dev branch
2015-07-22 17:55:51 -07:00
Lucian Hontau
1fd15c6b34 Add support for oauth client secret when calling the token URL. Fixes #1384. Fixes #1324. 2015-06-25 17:57:29 -04:00
Ron
59459a6086 Merge pull request #1408 from Collaborne/bugs/contributing-typo
Improve the language in CONTRIBUTING.md
2015-06-24 12:10:33 +03:00
Andreas Kohn
d04833d994 Improve the language in CONTRIBUTING.md 2015-06-24 11:08:27 +02:00
Andreas Kohn
9d725f1440 Use a SPDX-compatible identifier for the 'license' value
This fixes the warning issued at `npm install` time.
2015-06-24 11:04:14 +02:00
aurelian
25a9035014 regenerated 2015-06-22 16:26:42 +02:00
aurelian
554302f49d ignore case. 2015-06-22 16:26:32 +02:00
aurelian
a7aa7b2215 regenerated 2015-06-22 14:51:36 +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
Vladimir L
791e2951ef removed superfluous quote 2015-06-19 23:55:10 +02:00
Tom Baker
340da086ba OAuth flow only selected scopes should be sent to Authorize endpoint #1388.
Need to clear out previous popupDialog nodes, so previous checkboxes won't be considered.
2015-06-19 13:30:20 -05:00
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
Ron
eefec8db0b Update README.md 2015-06-18 09:25:39 +03:00
Ron
d75505fb73 Merge pull request #1379 from robrich/master
Spelling is hard
2015-06-18 09:24:54 +03:00
Rob Richardson
77fc1c0adf Spelling is hard 2015-06-17 17:16:14 -07:00
Josh Ponelat
cb1896b252 fix lint issue 2015-06-16 12:44:48 +02:00
Josh Ponelat
44bc2eab56 build with translator support 2015-06-16 12:08:19 +02:00
Josh Ponelat
c0c5847bd3 add lang to gulpfile 2015-06-16 12:07:23 +02:00
Josh Ponelat
372723b82d add data-sw-translate to templates 2015-06-16 12:06:49 +02:00
Ignacio Peluffo
e7d179432f Translation to Spanish finished 2015-06-13 15:33:01 -03:00
ipeluffo
f0f71dc343 Some words translation added 2015-06-13 15:22:29 -03:00
ipeluffo
9702e3c280 Spanish translation added 2015-06-13 15:19:11 -03: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
Kevin Kirsche
32fd6a3cd4 Remove moot version property from bower.json dev branch
Per bower/bower.json-spec@a325da3
2015-06-10 21:06:50 -04:00
Tony Tam
1f73415d08 Merge pull request #1345 from swagger-api/develop_2.0
merge from develop 2.0 for release
2015-06-06 15:35:02 -07:00
Tony Tam
673881007c updated versions, rebuilt 2015-06-06 15:32:28 -07:00
Tony Tam
5ee553ecce removed extra tag 2015-06-06 15:23:42 -07:00
Tony Tam
c7e07705f2 removed logging 2015-06-06 08:22:40 -07:00
Tony Tam
7cc1a36d95 updated version 2015-06-05 16:48:06 -07:00
Jeremy Whitlock
a4124fba7c Update swagger-ui to reuse client authorizations properly
Fixes #472
2015-06-05 17:45:14 -06:00
Ron
26ac3af551 Merge pull request #1342 from ponelat/fix/remove-dead-code
remove dead code: show-wordnik-dev
2015-06-05 10:06:35 -04:00
Josh Ponelat
dfab1df1e9 remove dead code: show-wordnik-dev 2015-06-05 10:56:39 +02:00
Ron
f3e7beecf3 Updated project location 2015-06-04 15:36:42 -04:00
Ron
57327f5d1f Updated ToS 2015-06-04 15:15:44 -04:00
Ron
26618ba482 Updated License 2015-06-04 15:15:37 -04:00