Ole Lensmar
|
ac49d0dcdc
|
post-merge fixes
|
2015-08-23 09:37:28 -04:00 |
|
Ole Lensmar
|
b956d47a9d
|
Merge branches 'develop_2.0' and 'maven-plugin-configuration-improvements' of https://github.com/swagger-api/swagger-codegen into maven-plugin-configuration-improvements
Conflicts:
modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
|
2015-08-23 09:37:08 -04:00 |
|
wing328
|
f662699fd0
|
Merge pull request #1107 from wing328/php_fix_datetime
[PHP] Fixed deserialization for datetime object
|
2015-08-23 17:11:55 +08:00 |
|
wing328
|
1c1571cc3a
|
Merge pull request #1106 from geekerzp/python-query
[Python] Fix issue that missing query parameters in python client.
|
2015-08-23 17:11:19 +08:00 |
|
wing328
|
e13374e1df
|
Merge pull request #1105 from who/serializable_java_models
[Java] Adding an option so java models can implement Serializable
|
2015-08-23 17:10:57 +08:00 |
|
wing328
|
f2df26f6e6
|
fix deserializing datetime, add test case
|
2015-08-22 23:09:12 +08:00 |
|
xhh
|
569082743f
|
Remove the unused LibraryHelp command
|
2015-08-22 22:05:43 +08:00 |
|
xhh
|
595c01c537
|
Merge branch 'develop_2.0' into library-template-jersey2
Conflicts:
modules/swagger-codegen/src/main/resources/Java/JsonUtil.mustache
|
2015-08-22 21:53:04 +08:00 |
|
geekerzp
|
dc423cc11d
|
Fix issue that Mssing query parameters in python client.
|
2015-08-22 17:46:13 +08:00 |
|
Andrew B
|
4f25a0e6c5
|
adding an option so java models can implement Serializable
|
2015-08-21 18:36:03 -07:00 |
|
Tony Tam
|
0af29cc5cf
|
Merge pull request #1104 from swagger-api/issue-1103
added check, fix for #1103
|
2015-08-21 15:22:22 -07:00 |
|
Tony Tam
|
44b4af0374
|
added check, fix for #1103
|
2015-08-21 15:02:56 -07:00 |
|
Tony Tam
|
b68beefa69
|
Merge pull request #1101 from swagger-api/issue-1099
optional files are never written
|
2015-08-21 09:35:11 -07:00 |
|
Tony Tam
|
07162811a7
|
fix for #1099, added file check
|
2015-08-21 08:56:22 -07:00 |
|
wing328
|
4023460f2e
|
Merge pull request #1096 from geekerzp/objc-param-to-str
[Objc] Sanitize request parameters in objc client
|
2015-08-21 22:22:17 +08:00 |
|
wing328
|
83bea6a0c5
|
Merge pull request #1095 from who/fix_issue_1089
[Java] Sanitize configurable package names (fixes #1089)
|
2015-08-21 22:15:53 +08:00 |
|
wing328
|
d03f680c64
|
Merge pull request #1090 from geekerzp/python-keyword
[Python] Change reserved word handling in python client.
|
2015-08-21 21:51:32 +08:00 |
|
geekerzp
|
4189d0765b
|
Update api body template of objc client
|
2015-08-21 11:40:59 +08:00 |
|
geekerzp
|
6218ad139f
|
Fix issue that it will throw error if not pass optional form param in objc client.
|
2015-08-21 11:20:29 +08:00 |
|
geekerzp
|
b7cd38d38b
|
Update objc client.
Sanitize request parameters (path, query, header, form, body).
|
2015-08-21 09:42:31 +08:00 |
|
Andrew B
|
2b61305582
|
Fixing issue #1089
|
2015-08-20 14:16:10 -07:00 |
|
wing328
|
2057d0e144
|
Merge pull request #1068 from Helmsdown/add-generated-annotation
Add @Generated annotation to all generated Java templates
|
2015-08-20 17:45:17 +08:00 |
|
xhh
|
af2ec4cf85
|
Merge branch 'develop_2.0' into library-template-jersey2
Conflicts:
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
modules/swagger-codegen/src/main/resources/Java/api.mustache
|
2015-08-20 17:36:42 +08:00 |
|
wing328
|
9a239ad2a4
|
Merge pull request #1076 from DavidBiesack/static-html
improve static html; add template guards for collections.
|
2015-08-20 17:31:03 +08:00 |
|
wing328
|
a610fb5ac3
|
Merge pull request #1051 from who/develop_2.0
[Java] Fixing subClassed types so that they can use enums
|
2015-08-20 17:14:17 +08:00 |
|
Andrew B
|
fb4c62cc28
|
Fixing merge conflict in pom.xml
|
2015-08-19 23:08:49 -07:00 |
|
geekerzp
|
6d58d44542
|
Merge branch 'ruby-api-client' into ruby-apiclient
|
2015-08-20 11:34:07 +08:00 |
|
xhh
|
0e2e7838ae
|
Merge branch 'bug-fix-ruby-file-upload' into ruby-api-client
Conflicts:
modules/swagger-codegen/src/main/resources/ruby/swagger/request.mustache
samples/client/petstore/ruby/lib/petstore/swagger/request.rb
|
2015-08-20 11:24:33 +08:00 |
|
xhh
|
2e3f94c2a5
|
Add file used in test: hello.txt
|
2015-08-20 11:18:05 +08:00 |
|
xhh
|
e02a9f1797
|
Merge branch 'develop_2.0' into ruby-api-client
|
2015-08-20 11:10:25 +08:00 |
|
xhh
|
0d399d3f6a
|
Add spec for file uploading
|
2015-08-20 11:07:20 +08:00 |
|
xhh
|
030e45982c
|
Add back support of file uploading to Ruby client
|
2015-08-20 10:45:40 +08:00 |
|
geekerzp
|
894d571ea5
|
Change reserved word handling in python client.
* First, remove the beginning underscores.
* Then, append underscore if the var is reserved word or number.
|
2015-08-19 18:05:47 +08:00 |
|
wing328
|
dc1992ad45
|
Merge pull request #1081 from wing328/php_var_name_number
[PHP, Perl, Silex] fixed variable names starting with number, made LOGGER protected
|
2015-08-19 14:56:13 +08:00 |
|
geekerzp
|
7be6e971fa
|
Update api client of ruby client.
Update ApiClient#build_request, change `@verify_ssl`, `@ssl_ca_cert`, `@debugging`
to `Configuration.verify_ssl`, `Configuration.ssl_ca_cert`, `Configuration.debugging`.
|
2015-08-18 20:21:56 +08:00 |
|
wing328
|
c62fca8c54
|
Merge pull request #1079 from wing328/add_flash_generator
[Flash] Add back Flash generator
|
2015-08-18 20:04:53 +08:00 |
|
geekerzp
|
828f8694c8
|
Fix typo in ruby client
|
2015-08-18 16:13:32 +08:00 |
|
geekerzp
|
31d948fc16
|
Update readme of ruby client
|
2015-08-18 14:35:54 +08:00 |
|
geekerzp
|
a481db7486
|
Add configuration object in ruby client
|
2015-08-18 14:27:09 +08:00 |
|
wing328
|
5d52952ebd
|
Merge pull request #1077 from geekerzp/objc-apiclient
[Objc] Change the ApiClient initialization of objc client
|
2015-08-18 09:39:48 +08:00 |
|
wing328
|
c1fbf6bb1c
|
Merge branch 'php_var_name_number' of https://github.com/wing328/swagger-codegen into php_var_name_number
|
2015-08-17 14:40:12 +08:00 |
|
wing328
|
10cd672529
|
fix variable name starting with number, make LOGGER protected
|
2015-08-17 14:39:29 +08:00 |
|
wing328
|
52918d325e
|
Merge pull request #1082 from wing328/fix_pom_swagger_parser
update swagger-parser-version to 1.0.10 (removed snapshot)
|
2015-08-17 14:38:11 +08:00 |
|
wing328
|
8cff8fc55a
|
update swagger-parser-version to 1.0.10 (removed snapshot)
|
2015-08-17 14:27:33 +08:00 |
|
wing328
|
90d5ce228a
|
Merge pull request #1067 from Helmsdown/path-level-params
Codegen should honor path level parameters
|
2015-08-17 14:13:22 +08:00 |
|
wing328
|
d4ff25f0b3
|
fix variable name starting with number, make LOGGER protected
|
2015-08-17 10:43:03 +08:00 |
|
wing328
|
4163f07911
|
Merge pull request #1069 from geekerzp/python-httplib
[Python] Fix issues in python client
|
2015-08-16 15:03:16 +08:00 |
|
wing328
|
560fd5718d
|
Merge pull request #1074 from wing328/php_improve1
[PHP] minor improvements
|
2015-08-16 14:59:43 +08:00 |
|
wing328
|
97580a8c45
|
Merge pull request #1070 from wing328/objc_readme_update
[Objc] minor wording change for readme based on feedback from developers
|
2015-08-16 14:59:27 +08:00 |
|
wing328
|
aee72d97c3
|
Merge pull request #1080 from wing328/update_pomxml
Update swagger-core-version to 1.5.4-SNAPSHOT
|
2015-08-16 00:22:54 +08:00 |
|