5957 Commits

Author SHA1 Message Date
wing328
363c40ec55 update php petstore sample 2016-05-10 00:39:55 +08:00
wing328
d0529cffdb Merge branch 'php-fix-array-handling-2' of https://github.com/arnested/swagger-codegen into arnested-php-fix-array-handling-2
Conflicts:
	modules/swagger-codegen/src/main/resources/php/model.mustache
	samples/client/petstore/php/SwaggerClient-php/README.md
	samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.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/EnumClass.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.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-10 00:29:13 +08:00
wing328
65ee4cb835 Merge pull request #2806 from wing328/fix_java_default_import
[Java] fix java import issue due to enum and inner model
2016-05-09 23:35:33 +08:00
wing328
477f6f8d4d use modelPackage instead to import all models 2016-05-09 23:17:37 +08:00
wing328
b27d8c22c7 fix java import issue due to enum and inner model (array of array of
model)
2016-05-09 23:12:12 +08:00
wing328
d3c434e40f add mateuszmackowiak to core team 2016-05-09 21:53:01 +08:00
wing328
b03b377a86 Merge pull request #2804 from wing328/bug/fix_2668
[Java] To fix missing import for @JsonValue
2016-05-09 21:47:28 +08:00
wing328
28c7ea5426 Merge pull request #2799 from mateuszmackowiak/obj/ApiClient-Sanitizer
Sanitizer for separating sanitize and service logic
2016-05-09 18:01:36 +08:00
wing328
c6eae8a6a6 Merge branch 'mateuszmackowiak-obj/Generic_List_and_Maps' 2016-05-09 17:47:39 +08:00
wing328
899af7a5fa Merge branch 'obj/Generic_List_and_Maps' of https://github.com/mateuszmackowiak/swagger-codegen into mateuszmackowiak-obj/Generic_List_and_Maps 2016-05-09 17:33:05 +08:00
wing328
94978e019e Merge branch 'abcsun-php_parameter_validation' 2016-05-09 16:33:25 +08:00
wing328
f30b32afc4 minor fix to mustache layout 2016-05-09 16:32:49 +08:00
wing328
cf6e8cffbb Merge branch 'php_parameter_validation' of https://github.com/abcsun/swagger-codegen into abcsun-php_parameter_validation
Conflicts:
	samples/client/petstore/php/SwaggerClient-php/README.md
	samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
	samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
2016-05-09 16:21:40 +08:00
wing328
126510b1ad Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-05-09 16:08:39 +08:00
Mateusz Mackowiak
ea87f95f77 Rebase obj/Generic_List_and_Maps 2016-05-09 10:08:28 +02:00
wing328
d1cc2488b1 Merge pull request #2773 from zhenjun115/master
add pom.xml based on build.gradle for android api client( using the v…
2016-05-09 16:06:39 +08:00
Mateusz Mackowiak
93a39242a6 Merge branch 'master' into obj/ApiClient-Sanitizer 2016-05-09 09:49:27 +02:00
wing328
8a9ba0b3f3 Merge pull request #2803 from diyfr/SpringBootServer
Add Springboot documentation
2016-05-09 15:39:30 +08:00
diyfr
c039526993 Add Springboot documentation 2016-05-09 08:21:32 +02:00
wing328
e367a74504 Merge pull request #2791 from leonyu/typescript-fetch-package-json
Typescript fetch update
2016-05-09 12:45:26 +08:00
wing328
dbe8ef9df8 Merge pull request #2785 from wing328/bug/escape_unicode
Fix unicode issue in escapeText
2016-05-09 11:35:25 +08:00
wing328
1a2bf79d51 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen
Conflicts:
	samples/client/petstore/objc/README.md
2016-05-09 11:22:25 +08:00
wing328
edc87b1480 Merge branch 'mateuszmackowiak-obj/SupportForByteArray' 2016-05-09 11:21:39 +08:00
wing328
f28e2f2a1b Merge branch 'obj/SupportForByteArray' of https://github.com/mateuszmackowiak/swagger-codegen into mateuszmackowiak-obj/SupportForByteArray 2016-05-09 11:21:21 +08:00
wing328
13b413151b Merge pull request #2797 from mateuszmackowiak/obj/ApiClient_AFNetworking3
Use AFHttpSessionManager instead of AFHTTPRequestOperationManager #1981
2016-05-09 11:19:04 +08:00
wing328
caea3876b5 Merge branch 'scottrw93-validation' 2016-05-09 11:03:46 +08:00
wing328
36ada7f5fc Merge branch 'validation' of https://github.com/scottrw93/swagger-codegen into scottrw93-validation 2016-05-09 10:51:23 +08:00
Scott Williams
4718c34984 Replace tabs with spaces 2016-05-09 01:25:13 +01:00
Scott Williams
25ebd5466d Update pattern to support Perl /pattern/modifiers convention 2016-05-09 01:11:29 +01:00
wing328
beb88e0f3c Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-05-09 01:17:59 +08:00
wing328
9e8cbae0ec rearrange order for core member list 2016-05-09 00:46:17 +08:00
wing328
cfa2c54c15 removed kristof 2016-05-09 00:45:29 +08:00
wing328
20f3850eb2 add guideline for becoming a core team member 2016-05-09 00:30:55 +08:00
wing328
6b6a559aa5 add .net2.0 template creator 2016-05-08 23:24:14 +08:00
wing328
d4383ce4c1 update core team (js) 2016-05-08 22:33:52 +08:00
wing328
dcbc8975a0 update core team 2016-05-08 22:24:52 +08:00
Mateusz Mackowiak
fbd6a95799 [Objc] Generator supports binary and BiteArray and maps data to NSData 2016-05-08 12:54:12 +02:00
wing328
46957bb6aa add swagger codegen core team 2016-05-08 18:48:22 +08:00
zhenjun115
6709a92cbc remove pom.mustache from android api client using volley HTTP library; 2016-05-07 23:38:05 +08:00
wing328
c3690d8675 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-05-07 23:10:25 +08:00
Mateusz Mackowiak
74c233e194 Sanitizer for separating sanitize and service logic 2016-05-07 15:18:10 +02:00
Mateusz Mackowiak
07b466a291 Objective c generator converts map and array properties to proper format using generics 2016-05-07 14:13:25 +02:00
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
abcsun
9efef02d5f formate the module.mustache 2016-05-07 18:12:28 +08: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
4c0ed319d8 Merge branch 'jimschubert-csharp_default_paths' 2016-05-07 17:54:38 +08:00
wing328
77e56084ac regenerate c# petstore sample 2016-05-07 17:49:54 +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