Commit Graph
1826 Commits
Author SHA1 Message Date
Tony Tam 6a753a4bc8 Merge pull request #2558 from sreeshas/topic/sreeshas/fix_escape_resource_name
Fix escaping resource name.
2017-01-02 13:50:54 -07:00
Tony Tam 2905068997 Merge pull request #2553 from IlyaPomaskin/patch-1
Resizable container for "Model Schema"
2017-01-02 13:49:17 -07:00
Tony Tam f386054a53 Merge pull request #2568 from tobigun/showOperationIds
Add option "showOperationIds"
2017-01-02 13:46:39 -07:00
Tony Tam 1e19281a7b Merge branch 'turkeylurkey-2460-requiredFile' 2017-01-02 13:45:46 -07:00
Tony Tam f8db172158 merged 2017-01-02 13:45:37 -07:00
Tony Tam 78b3678f74 Merge pull request #2587 from moses-palmer/feature-token-as-vendor-property
OAuth2 access token name as vendor property
2017-01-02 13:43:32 -07:00
Tony Tam fa5de88f5d Merge pull request #2581 from ritesh-garg/issue-2577
Issue 2577
2017-01-02 13:42:35 -07:00
Tony Tam 353c8a39c5 updated swagger-js, rebuilt 2017-01-02 11:08:45 -07:00
Moses Palmér 4f467b4073 Prefer tokenName as vendor extension in auth view 2016-12-29 10:06:39 +01:00
Moses Palmér 43760ec29f Prefer tokenName as vendor extension 2016-12-29 10:06:39 +01:00
Moses Palmér 7ca8cdeffb Read token name using function in auth view 2016-12-29 10:06:39 +01:00
Moses Palmér fd3eb4f65a Read token name using function 2016-12-29 10:06:39 +01:00
Ritesh Garg 1142f01da1 Adding the check for model.definition 2016-12-23 20:02:29 -05:00
Ritesh Garg d9e14e1e7d Commenting getName function as names are now determined beforehand and the prefix part is exposed as a separate function 2016-12-23 12:16:12 -05:00
Ritesh Garg af068f787a Merge branch 'issue-2577' of https://github.com/ritesh-garg/swagger-ui into issue-2577 2016-12-23 11:52:20 -05:00
Ritesh Garg 8b01247192 Change to fix the naming for elements for an array from the element name(XmlElement) defined with array rather than determining it from the element model definition(XmlRootElement) 2016-12-23 11:48:11 -05:00
Ritesh Garg 8155330ae3 Change to set name for array elements from items.xml.name if it is set. Another issue after fixing this was for complex objects, that the name for element (from xmlelement annotation) was getting overridden by ref name (from xmlelementwrapper annotation) 2016-12-22 14:00:38 -05:00
Paul Gooderham 37d158bdc1 Issue #2460 Use only one class= in param_required isFile 2016-12-21 17:32:30 -05:00
Tobias Gunkel 26d8aced96 Add option "showOperationIds" 2016-12-18 23:20:13 +01:00
Sreenidhi Sreesha 878dad251d Fix escaping resource name. 2016-12-08 11:55:40 -08:00
Ron 2ba1c100ae Merge pull request #2397 from MugeSo/implement-oauth2-password-flow
Implement OAuth2 password flow
2016-12-06 08:52:16 -08:00
Tony Tam 0b7c6f048c Merge pull request #2557 from xor-xor/missing-images
[CSS] Remove refs to images that don't exist anymore.
2016-12-05 08:44:19 -08:00
Tomasz Mieszkowski 3787de8038 [CSS] Remove refs to images that don't exist anymore. 2016-12-05 15:49:59 +01:00
Ilya Pomaskin 0f12d5d45c Resizable container for "Model Schema" 2016-12-02 19:15:50 +03:00
Tony Tam 4e234cc3c7 Merge pull request #2549 from wangchunyang/master
Upgrade to alpine:3.4 and fix issues
2016-12-01 17:46:03 -08:00
Chunyang Wang 7f0de6312e Use absolute path for root directory 2016-12-01 16:57:34 +08:00
Chunyang Wang f8e5e57540 create required directory to store nginx pid 2016-12-01 16:55:59 +08:00
Tony Tam bfc6dbd50f Merge pull request #2540 from whoan/patch-1
Enable CORS by default in the nginx file
2016-11-28 22:12:22 -08:00
Juan Eugenio Abadie 842f477620 Enable CORS by default in the nginx file
Enable CORS in the nginx file used by Docker.
2016-11-29 01:39:43 -03:00
Tony Tam a0cce8e746 Merge pull request #2532 from stephaneLeroy/master
Fix jsonEditor parameters when an operation is on multiple tags
2016-11-28 12:51:06 -08:00
Tony Tam 7e1a02be83 Merge pull request #2534 from joelittlejohn/test-fragment
On complete, ignore fragments that don't contain useful information
2016-11-28 09:40:22 -08:00
Joe Littlejohn 90f641059f On complete, ignore fragments that don't contain useful information
Auth providers like Facebook and Google tend to add garbage fragments
onto OAuth 2.0 redirect URIs to stop malicious fragments being
maintained through the flow. This change ensures that those fragments
aren't mistakenly used to attempt to complete login.

If the fragment contains a code, token or error, it is assumed to be the
correct place to find data provided by the auth provider.
2016-11-27 17:16:10 +00:00
Stéphane Leroy 5def48cf99 Fix jsonEditor parameters when an operation is on multiple tags 2016-11-25 18:20:15 +01:00
TANAKA Koichi 3494d44d3f Implement OAuth2 client authentication for password and application flow 2016-11-24 17:30:52 +09:00
TANAKA Koichi f2a1caa379 Add validation for oauth password flow 2016-11-24 17:04:41 +09:00
TANAKA Koichi 7cdf83a932 Implement OAuth2 password flow 2016-11-24 17:04:41 +09:00
Tony Tam 776325b993 updated version v2.2.8 2016-11-23 23:45:33 -08:00
Tony Tam c04b81c51e Merge pull request #2529 from swagger-api/issue-2528
removed blob special logic for strings
2016-11-23 23:44:13 -08:00
Tony Tam 3c0fac249f removed blob special logic for strings 2016-11-23 23:40:03 -08:00
Tony Tam 23515834e8 Merge pull request #2527 from swagger-api/issue-2497
only pass selected scopes
2016-11-23 20:59:56 -08:00
Tony Tam d963302c72 only pass selected scopes 2016-11-23 20:54:54 -08:00
Tony Tam 9e5c4b2efe rebuilt 2016-11-23 20:20:15 -08:00
Tony Tam 99b351835e Merge branch 'thinkWhere-minify-dist-tasks' 2016-11-23 20:20:02 -08:00
Tony Tam 770fcc19c0 Merge branch 'minify-dist-tasks' of https://github.com/thinkWhere/swagger-ui into thinkWhere-minify-dist-tasks 2016-11-23 20:17:00 -08:00
Tony Tam 0dfc59fc21 Merge pull request #2489 from joelittlejohn/patch-1
Avoid using Facebook garbage fragment to complete login
2016-11-23 20:16:01 -08:00
Tony Tam 1d9365d407 Merge branch 'Vayu-fix_model_rendering' 2016-11-23 20:12:47 -08:00
Tony Tam 4b63c7009f Merge branch 'master' of github.com:swagger-api/swagger-ui 2016-11-23 20:12:40 -08:00
Tony Tam 941b3feb3d rebuilt 2016-11-23 20:12:32 -08:00
Tony Tam ee3556490a Merge branch 'fix_model_rendering' of https://github.com/Vayu/swagger-ui into Vayu-fix_model_rendering 2016-11-23 20:10:21 -08:00
Tony Tam 95553a597b Merge pull request #2514 from tcaesvk/master
fix authorization code grant to work
2016-11-23 20:00:13 -08:00