Commit Graph

2989 Commits

Author SHA1 Message Date
Mateusz Mackowiak 81c6edcdd4 Merge commit '084f15fc2e6db460b037b08708a3713b8ef61be6' into obj/ApiClient_AFNetworking3 2016-05-07 13:57:15 +02:00
wing328 084f15fc2e Merge pull request #2786 from mateuszmackowiak/objc/responseDeserializer
[Objc] ResponseDeserializer for separating deserialization and service logic
2016-05-07 19:50:34 +08:00
Mateusz Mackowiak a71d8d935a Use AFHttpSessionManager instead of AFHTTPRequestOperationManager #1981 2016-05-07 12:16:05 +02:00
wing328 7d33e1655d Merge branch 'master' of https://github.com/swagger-api/swagger-codegen
Conflicts:
	samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/README.mustache
2016-05-07 17:55:39 +08:00
wing328 2ab315fa6f Merge branch 'csharp_default_paths' of https://github.com/jimschubert/swagger-codegen into jimschubert-csharp_default_paths
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractCSharpCodegen.java
	samples/client/petstore/csharp/SwaggerClient/README.md
	samples/client/petstore/csharp/SwaggerClient/docs/FormatTest.md
	samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/Model/FormatTest.cs
	samples/client/petstore/csharp/SwaggerClientTest/Lib/SwaggerClient/src/main/csharp/IO/Swagger/Model/InlineResponse200.cs
	samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.csproj
	samples/client/petstore/csharp/SwaggerClientTest/SwaggerClientTest.userprefs
	samples/client/petstore/csharp/SwaggerClientTest/obj/Debug/SwaggerClientTest.csproj.FilesWrittenAbsolute.txt
2016-05-07 17:30:40 +08:00
xhh 020a9fcdc0 Fix enum model docs for JS and Java clients 2016-05-06 18:41:15 +08:00
Mateusz Mackowiak fa68f84ec6 - Remove petsotre demo leftovers
- Moved description method to basic class
2016-05-06 12:35:02 +02:00
xhh 3dbab1b893 JavaScript client: fix exporting of outer enum model 2016-05-06 17:45:03 +08:00
Mateusz Mackowiak 385bf6d9ea Additional UnknownResponseObjectErrorCode if response object expected type is an unknown type 2016-05-06 11:41:30 +02:00
wing328 db65a1526f Merge pull request #2761 from kolyjjj/upgradeswaggertools
[koly] update swagger tools to 0.10.1
2016-05-06 17:18:32 +08:00
wing328 ce4a976916 Merge pull request #2775 from guohuang/tests
fixed array return type return as pointer issue
2016-05-06 17:07:02 +08:00
Mateusz Mackowiak 75cc10fdfa Fix typo 2016-05-06 10:51:59 +02:00
wing328 d3e77a4104 Merge pull request #2784 from catinred2/htmlDocs_response
Html docs response
2016-05-06 16:46:44 +08:00
Mateusz Mackowiak 65d85b7760 ResponseDeserializer for separating deserialization and service logic 2016-05-06 10:46:03 +02:00
xming 70d6e64a8d add link to param type 2016-05-06 15:31:09 +08:00
wing328 1dd8faf8b7 Merge pull request #2783 from GriffinSchneider/patch-1
Replace 'BEARER' with 'Bearer' everywhere for RFC6750 compliance.
2016-05-06 15:01:22 +08:00
xming ea14b3b559 Merge branch 'master' into htmlDocs_response 2016-05-06 13:57:27 +08:00
wing328 ac2cb647b5 Merge branch 'php-fix-array-handling' of https://github.com/arnested/swagger-codegen into arnested-php-fix-array-handling
Conflicts:
	modules/swagger-codegen/src/main/resources/php/model.mustache
	samples/client/petstore/php/SwaggerClient-php/README.md
	samples/client/petstore/php/SwaggerClient-php/docs/FormatTest.md
	samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
2016-05-06 10:46:36 +08:00
xming 0f1842bb06 add datatype link under responses 2016-05-06 10:35:45 +08:00
Griffin Schneider e5ab34b658 Replace 'BEARER' with 'Bearer' everywhere.
RFC6750 indicates that the correct header format is 'Bearer <token>',
not 'BEARER <token>'.
2016-05-05 16:14:45 -04:00
Guo Huang ebdf12bcd4 fixed code gen using {{#isListContainer}}*{{/isListContainer}} field 2016-05-05 11:41:58 -07:00
wing328 e04c4ec640 add typescript-fetch client generator 2016-05-05 17:12:28 +08:00
wing328 e0ec38df72 Merge branch 'typescript-fetch' of https://github.com/leonyu/swagger-codegen into leonyu-typescript-fetch 2016-05-05 16:43:30 +08:00
wing328 3dccc7d2a1 Merge branch 'SpringBootServer' of https://github.com/diyfr/swagger-codegen into diyfr-SpringBootServer 2016-05-05 15:28:10 +08:00
Jim Schubert 9b1d43c6f5 [csharp] default optionalProjectFileFlag to true
Possible breaking change.

optionalProjectFileFlag handles the generation of csproj and sln
files. Not modifying the plurality of the option to reduce the
impact of the breaking change for existing settings:

optionalProjectFileFlag=true
    => generates additional .sln file
optionalProjectFileFlag=false
    => no change
unspecified
    => additional files (csproj, sln) may overwrite existing files
2016-05-04 21:44:52 -04:00
Leon Yu bbeb1a3f6f add dev-dependencies 2016-05-04 14:36:04 -04:00
Guo Huang 41b7649e62 fixed array return type return as pointer issue 2016-05-04 10:39:30 -07:00
diyfr 8209653fb0 Add SpringBoot server generator 2016-05-04 16:38:36 +02:00
wing328 4117608654 Merge pull request #2749 from guohuang/pointer
changed go client to return object pointer
2016-05-04 10:17:07 +08:00
wing328 dc262a3567 Merge pull request #2765 from Vrolijkx/master
Reverting remove of client.ts in typescript-node
2016-05-04 09:57:21 +08:00
wing328 8181720397 Merge branch 'bherila-typescript-es6-promises' of https://github.com/wing328/swagger-codegen into wing328-bherila-typescript-es6-promises
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
2016-05-04 09:54:42 +08:00
Kristof Vrolijkx a98c58a76f Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-05-03 20:55:28 +02:00
Kristof Vrolijkx 9fb85ae8fe removing comment 2016-05-03 20:36:24 +02:00
Guo Huang a5b08a8ce7 fixed merge conflict 2016-05-03 10:16:47 -07:00
kolyjjj 0ce6fd7b36 [koly] update swagger tools to 0.10.1 2016-05-03 22:18:43 +08:00
wing328 bed21e418b Merge pull request #2508 from wing328/php_enum
[PHP][C#] better enum support
2016-05-03 20:09:51 +08:00
diyfr 9604257649 #2742 Issue multiple methods if use multi tags 2016-05-03 13:45:31 +02:00
wing328 2c41451b67 add new java file for enum mustache template 2016-05-03 18:24:25 +08:00
wing328 bfdd49a2b2 add new JS enum mustache template 2016-05-03 18:24:00 +08:00
wing328 3346c84a1f better enum support for typescript 2016-05-03 18:23:08 +08:00
wing328 982a035cc1 add better enum support to swift 2016-05-03 18:12:35 +08:00
wing328 6b0b343b92 add option to support ES6 2016-05-03 16:42:02 +08:00
wing328 333a5edeae Merge branch 'typescript-es6-promises' of https://github.com/bherila/swagger-codegen into bherila-typescript-es6-promises 2016-05-03 14:29:52 +08:00
wing328 0bce28cff2 add back ts resource folder with new folder name 2016-05-03 14:09:08 +08:00
wing328 5c97717fc8 temporary remove ts resource folder 2016-05-03 14:08:02 +08:00
wing328 acb34e3db0 better JS enum class support 2016-05-03 11:21:17 +08:00
wing328 d35e30d578 better enum support for JS 2016-05-03 11:21:17 +08:00
wing328 6e8a19bc5b fix enum for jaxrs and resteasy 2016-05-03 11:20:45 +08:00
wing328 6370165912 fix retrofit 1, 2 java sample 2016-05-03 11:19:59 +08:00
wing328 3913388331 fix java okhttp enum mismatche tab 2016-05-03 11:19:59 +08:00