Tony Tam
46545c14da
Merge pull request #3388 from swagger-api/release-prepare
...
updated versions for release
v2.2.0
2016-07-17 15:25:14 -07:00
cbornet
8740b4d0ea
set interface with discriminator as parent
...
If a composed model (allOf) doesn't have any parent and one of its interface has a discriminator field, then set this interface as parent.
See #2096
See https://github.com/swagger-api/swagger-parser/pull/246
2016-07-17 14:38:03 -07:00
Tony Tam
bd0340327b
Merge branch 'wing328-java_fix_apiclient' into release-prepare
2016-07-15 22:37:35 -07:00
Tony Tam
3346388056
null check
2016-07-15 21:39:58 -07:00
Tony Tam
fbada6ef11
Merge branch 'java_fix_apiclient' of https://github.com/wing328/swagger-codegen into wing328-java_fix_apiclient
2016-07-15 14:41:46 -07:00
Tony Tam
d9aa1dd985
updated readme
2016-07-15 13:46:47 -07:00
Tony Tam
c49db091ef
updated versions for release
2016-07-15 13:45:22 -07:00
Wolfgang Berger
d120902e4b
integrate latest objc changes into objc-sessionmanager
2016-07-15 15:36:24 +02:00
wing328
9056a5a56c
fix mvn warning, update mvn plug-in version
2016-07-15 21:21:58 +08:00
keithballdotnet
cb547c113a
ParameterToString can panic
...
Let the fmt package help convert the obj to a string. Previously this could panic if the obj was an int.
2016-07-15 14:55:11 +02:00
wing328
9e0c865c08
update java petstore sample
2016-07-15 17:45:06 +08:00
wing328
67a674bf3d
derive invoker package name from api/modoel package name
2016-07-15 17:42:05 +08:00
Wolfgang Berger
fab499e612
Merge branch 'upstream-master' into feature/objc-sessionmanager-integration
...
* upstream-master:
add more companies
added env variable override
add link to appveyor build
fix defeault rspec test for ruby, update security petstore
[Swift] Use ISO-8601 date format
2016-07-15 10:09:15 +02:00
wing328
bd7904d42a
add more companies
2016-07-15 12:20:19 +08:00
Jason Gavris
4d9b5feb77
[Travis] Cache maven directory
2016-07-14 21:57:24 -04:00
wing328
0405db7a97
Merge pull request #3264 from ButterflyNetwork/swift-iso-date
...
[Swift] Use ISO-8601 date format
2016-07-15 08:33:49 +08:00
Tony Tam
ac06825f08
Merge pull request #3373 from swagger-api/issue-3372
...
added env variable override
2016-07-14 13:02:24 -07:00
Tony Tam
20216a9418
added env variable override
2016-07-14 12:05:36 -07:00
wing328
ac3b60e390
add link to appveyor build
2016-07-14 22:47:38 +08:00
wing328
2d35743b0d
Merge pull request #3368 from wing328/ruby_fix_rspec
...
[Ruby] fix default rspec test cases for Ruby API client
2016-07-14 22:13:34 +08:00
Wolfgang Berger
fb68c6c93d
update naming
2016-07-14 15:38:05 +02:00
Wolfgang Berger
f14f4c1e93
Merge branch 'upstream-master' into feature/objc-sessionmanager-master-merge
...
* upstream-master: (1081 commits)
improve ts node enum naming
update ruby samples
update ruby sample
Update README to clean on mvn package
fix csharp enum naming
fix double hyphen in c# generator
Remove more Java String comparison using "=="
Not compare Java String with "=="
fix csharp code sample
feat dart: add pubName to all remaining library parts
fix[ruby]: Problem with List of Enum
feat dart: add pubName to library name.
feat dart: mv basePath to ApiClient
Add more security samples (#3344 )
Leverage Shipable.io to validate mustache templates (#3333 )
fix model name "client" issue
fix https://github.com/swagger-api/swagger-codegen/pull/3313/files#r70178399
#3285 replaced setModelNamePrefix by setModelNameSuffix
doc: explain how to run tests
feat: improve / fix deserialization by parsing type String
...
Conflicts:
modules/swagger-codegen/src/main/resources/objc/Object-body.mustache
2016-07-14 15:18:08 +02:00
Wolfgang Berger
83e7cdb6a3
Merge branch 'feature/objc-sessionmanager' into feature/objc-sessionmanager-merge
...
* feature/objc-sessionmanager:
updates templates with JSONModel workaround
updates for ISO8601 0.5.1
updates templates according to https://github.com/NYTimes/objective-c-style-guide
first version of session manager
2016-07-14 12:28:20 +02:00
wing328
069a6b2917
fix defeault rspec test for ruby, update security petstore
2016-07-14 18:22:01 +08:00
wing328
d3a1326405
Merge pull request #3367 from wing328/typescript_enum_naming
...
[Typescript][Node] Better enum naming
2016-07-14 17:34:42 +08:00
wing328
4f52cebf7a
improve ts node enum naming
2016-07-14 17:14:06 +08:00
wing328
748f4b21f4
Merge branch 'master' of https://github.com/swagger-api/swagger-codegen
2016-07-14 16:44:34 +08:00
wing328
59a73a7732
Merge branch 'ircecho-patch-1'
2016-07-14 16:19:21 +08:00
wing328
7c8333e2f8
update ruby samples
2016-07-14 16:19:05 +08:00
wing328
4be11452ce
Merge branch 'patch-1' of https://github.com/ircecho/swagger-codegen into ircecho-patch-1
2016-07-14 16:11:29 +08:00
wing328
6a2ff14edb
Merge branch 'ircecho-patch-1'
2016-07-14 15:54:13 +08:00
wing328
c0491ccb1d
update ruby sample
2016-07-14 15:53:42 +08:00
wing328
3ae0ffa819
Merge branch 'patch-1' of https://github.com/ircecho/swagger-codegen into ircecho-patch-1
2016-07-14 15:32:41 +08:00
wing328
a07d602d78
Merge pull request #3361 from jdebbink/readme
...
Update README to clean on mvn package
2016-07-14 15:26:30 +08:00
Michael Kourlas
a4c589c346
Correct reference to ApiClient default instance
2016-07-13 13:56:43 -04:00
Justin Debbink
9fc7215d6d
Update README to clean on mvn package
2016-07-13 11:44:57 -05:00
wing328
0986acd2a6
Merge pull request #3359 from sinofool/master
...
Not compare Java String with "=="
2016-07-13 20:50:36 +08:00
wing328
cee45bc9aa
Merge pull request #3360 from wing328/csharp_escape_double_hyphen
...
[C#] fix double hyphen in c# generator
2016-07-13 20:44:55 +08:00
wing328
8da6e0a533
fix csharp enum naming
2016-07-13 19:11:22 +08:00
wing328
cf02d1700a
Merge pull request #3289 from d0x/Make_Pre_and_Suffix_Available
...
[MAVEN] #3284 : Made modelNamePrefix and -Suffix available through maven
2016-07-13 18:31:18 +08:00
wing328
e2d74de6ca
fix double hyphen in c# generator
2016-07-13 18:16:52 +08:00
Bochun Bai
f75a42f810
Remove more Java String comparison using "=="
2016-07-13 18:06:45 +08:00
Bochun Bai
6d4d81b652
Not compare Java String with "=="
...
Replaced with equals()
2016-07-13 17:27:11 +08:00
wing328
6e561e116b
Merge pull request #3358 from wing328/csharp_fix_doc
...
[C#] Fix C# sample code
2016-07-13 17:06:49 +08:00
wing328
9bfb52dbc1
fix csharp code sample
2016-07-13 16:22:58 +08:00
wing328
c873a52f84
Merge pull request #3325 from inc-cloitsch/rmCrypto_fixRequiredParams_useAsyncAwait_addMultiQueryParams
...
dart: fix required params. add 'multi' query params. better deserialization.
2016-07-13 16:13:41 +08:00
Christian Loitsch
8003156fd8
feat dart: add pubName to all remaining library parts
2016-07-12 19:42:11 +02:00
ircecho
66619b1a09
fix[ruby]: Problem with List of Enum
...
Fixes #3323
2016-07-12 18:21:34 +02:00
Christian Loitsch
a5351f7ec0
feat dart: add pubName to library name.
...
Otherwise projects may not use different apis generated by swagger,
because library names must be unique.
2016-07-12 18:05:40 +02:00
Christian Loitsch
0d0d353b9d
feat dart: mv basePath to ApiClient
...
Changing the basePath is pretty annoying otherwise, because
you would need to set the basePath for every Api.
2016-07-12 17:18:45 +02:00