Commit Graph

5538 Commits

Author SHA1 Message Date
xhh
f10d4c8e23 Merge branch 'master' into java-docs
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	samples/client/petstore/java/default/pom.xml
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Animal.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Cat.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Dog.java
	samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Name.java
	samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/Name.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Cat.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Dog.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/model/Name.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Model200Response.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/ModelReturn.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/model/Name.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Model200Response.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/ModelReturn.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/model/Name.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/StringUtil.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Model200Response.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/ModelReturn.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/model/Name.java
2016-04-19 20:19:10 +08:00
wing328
3332692d30 Merge pull request #2634 from yonaskolb/swift_enum_type
Append reserved swift enum type with "Enum"
2016-04-19 16:38:06 +08:00
wing328
75001f4ead Merge pull request #2635 from wing328/template_folder_exception
Add exception handling for template directory that does not exist
2016-04-19 16:28:24 +08:00
wing328
894111e3de Merge pull request #2633 from yonaskolb/swift_case_sensitive_reserved_types
Make swift reserved words case sensitive again
2016-04-19 16:27:49 +08:00
wing328
8b3feda0ba Merge pull request #2642 from yonaskolb/unescaped_operation_description
add unescapedNotes to CodegenOperation
2016-04-19 16:25:10 +08:00
wing328
206657d0d9 Merge pull request #2639 from arnested/feature/php-test-fix
[PHP] Fix class name in test cases
2016-04-19 10:55:27 +08:00
Yonas Kolb
2ccb7a38f9 add unescapedNotes to CodegenOperation 2016-04-19 11:42:33 +10:00
Yonas Kolb
491ceb8987 improve line indentation 2016-04-19 10:04:11 +10:00
Tony Tam
35ef2324e0 Merge pull request #2638 from pqrkchqps/patch-1
Update README.md
2016-04-18 13:44:37 -07:00
Arne Jørgensen
dcccfa4b99 Fix class name in test cases 2016-04-18 22:10:35 +02:00
John
2efb439f2e Update README.md
Adding a company to the list of companies using swagger.
2016-04-18 13:53:14 -05:00
wing328
a069ea1435 add http://developer.mypurecloud.com/ 2016-04-18 22:15:50 +08:00
wing328
89e150cfb2 remove unused import 2016-04-18 16:55:34 +08:00
wing328
e7388891e1 add exception handling for template dir that does not exist 2016-04-18 16:51:47 +08:00
Yonas Kolb
3de7a4ba85 Append reserved swift enum type with "Enum" 2016-04-18 15:24:37 +10:00
Yonas Kolb
074ecf23e1 make reserved word checking case sensitive 2016-04-18 14:27:26 +10:00
Yonas Kolb
c87e6d6f41 Merge branch 'master' into swift_case_sensitive_reserved_types
# Conflicts:
#	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
2016-04-18 14:22:27 +10:00
Yonas Kolb
f1503e2150 make swift reserved words case sensitive again 2016-04-18 13:55:12 +10:00
wing328
c375f2fed5 Merge pull request #2629 from yonaskolb/param_unescape
Add unescaped Parameter description
2016-04-18 11:18:22 +08:00
wing328
40fd362467 Merge pull request #2632 from wing328/csharp_doc_enhance
[C#] update csharp doc with minor enhancements and bug fixes
2016-04-18 10:27:01 +08:00
wing328
cbccee9c39 update csharp doc with minor enhancements and bug fixes 2016-04-18 00:19:16 +08:00
wing328
8c0cff57ba Merge pull request #2595 from KevinGlinski/csharpdoc
[CSharp] Add auto-generated CSharp documentation in Markdown
2016-04-17 22:47:02 +08:00
wing328
5a06fc2119 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-04-17 17:52:45 +08:00
wing328
256d96684f Merge branch 'kolyjjj-issue2374' 2016-04-17 17:52:15 +08:00
wing328
00aaf57f55 update springmvc sample 2016-04-17 17:51:22 +08:00
wing328
a0b429d690 Merge branch 'issue2374' of https://github.com/kolyjjj/swagger-codegen into kolyjjj-issue2374
Conflicts:
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/PetApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/StoreApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/UserApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerConfig.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/SwaggerUiConfiguration.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebApplication.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/configuration/WebMvcConfiguration.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/ApiResponse.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Category.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Order.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Pet.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/Tag.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/model/User.java
2016-04-17 17:47:58 +08:00
wing328
3c14fca9ea Merge pull request #2628 from wing328/go_enhancement
[Go] update test cases
2016-04-17 17:22:51 +08:00
Yonas Kolb
9e19114c15 unescape parameter description 2016-04-17 19:11:04 +10:00
wing328
e612870e89 add new files 2016-04-17 17:10:28 +08:00
wing328
70e42cb0db add new go files 2016-04-17 17:10:10 +08:00
wing328
23a9f069d7 remove go from pom.xml 2016-04-17 16:59:23 +08:00
wing328
993d121e35 update go test, update pom 2016-04-17 16:41:35 +08:00
wing328
8d450a29da Merge pull request #2608 from guohuang/issue2359
issue#2359: added README document generation for Go
2016-04-17 16:14:59 +08:00
wing328
3191eb3234 Merge branch 'guohuang-bug' 2016-04-17 16:09:45 +08:00
wing328
9257c94985 Merge branch 'bug' of https://github.com/guohuang/swagger-codegen into guohuang-bug 2016-04-17 16:09:27 +08:00
wing328
e9f6b706d9 Merge branch 'guohuang-issue2611' 2016-04-17 16:02:19 +08:00
wing328
8af6903757 Merge branch 'issue2611' of https://github.com/guohuang/swagger-codegen into guohuang-issue2611
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
	samples/client/petstore/go/pet_api_test.go
2016-04-17 16:02:12 +08:00
wing328
48a42358f0 Merge pull request #2627 from guohuang/remove_package_name
Removed "packageName" folder for easy installation
2016-04-17 15:58:49 +08:00
Guo Huang
85d30191df fixed go build issue after removing swagger folder 2016-04-16 22:22:23 -07:00
Guo Huang
81a39990f4 Removed "packageName" folder for easy installation 2016-04-16 17:00:46 -07:00
Guo Huang
d72b501e40 added required parameters validation for Go 2016-04-16 16:43:04 -07:00
Guo Huang
a8273b9f08 changed code to use pacageVersion, removed unneeded comments 2016-04-16 15:47:34 -07:00
Guo Huang
c458834652 updated pom file, temporary disable unit test errors 2016-04-16 15:37:49 -07:00
wing328
49337a2326 Merge pull request #2623 from wing328/update_petstore_json
Restore petstore.json from petstore.yaml
2016-04-17 04:03:38 +08:00
wing328
5f6cc62802 fix test case 2016-04-17 03:51:38 +08:00
wing328
a3c6d3af5e restore petstore.json from petstore.yaml 2016-04-17 03:25:12 +08:00
wing328
bb8db88b95 Merge pull request #2620 from wing328/petstore_json_restore
Update shell script to use petstore.yaml instead of petstore.json
2016-04-16 19:17:07 +08:00
wing328
8e85476cbb add new fles 2016-04-16 18:19:23 +08:00
wing328
e62ba9b35d update qt5cpp and tizen sample 2016-04-16 18:16:42 +08:00
wing328
1d5a0e5b33 update sample for JS closure angular 2016-04-16 18:11:40 +08:00