Commit Graph

2247 Commits

Author SHA1 Message Date
Guo Huang
7b57a26a97 added apache LICENSE 2016-05-25 10:11:52 -07:00
Mateusz Mackowiak
c68168fa27 - Remove optional license property
- License in all header files
2016-05-25 18:13:27 +02:00
zhenjun115
09a29063be add markdown docs for java api client using retrofit2; 2016-05-25 23:44:44 +08:00
Mateusz Mackowiak
537ee960b6 [Objc] Add Apache v2 license to auto-generated files #2963 2016-05-25 15:09:05 +02:00
wing328
38a422212d Merge pull request #2948 from mikolajprzybysz/use-php-eol
[PHP] Replaced \n with PHP_EOL
2016-05-25 16:49:37 +08:00
wing328
8096308657 add apache v2 license to csharp api client 2016-05-25 14:41:17 +08:00
wing328
105b4b9199 new test case to cover model with array properties 2016-05-25 01:18:50 +08:00
wing328
568fa4f514 add apache license to remaining ruby files (test, spec, etc) 2016-05-24 23:20:23 +08:00
Mikolaj Przybysz
6aa821d76d Rebuild php petstore sample client 2016-05-24 15:03:25 +02:00
wing328
d05d552b74 Merge pull request #2946 from wing328/ruby_license
[Ruby] update Ruby API client to use apache v2 license
2016-05-24 18:11:28 +08:00
wing328
c7110debee update ruby api client to use apache v2 license 2016-05-24 17:50:28 +08:00
wing328
d82bbfdaf4 Merge branch 'java_api_client' of https://github.com/zhenjun115/swagger-codegen into zhenjun115-java_api_client 2016-05-24 16:36:33 +08:00
Joseph Zuromski
673784491e couple new files 2016-05-23 20:09:06 -07:00
Joseph Zuromski
00c4877baf move swift samples into swift/default and swift/promisekit directories 2016-05-23 20:08:00 -07:00
Newell Zhu
24a0ced972 regenerate ruby spec file 2016-05-23 21:30:40 +08:00
Newell Zhu
a9b8150442 regenerate ruby client sample 2016-05-23 20:54:45 +08:00
wing328
7b1cfde891 add enum test in php api client 2016-05-23 15:38:20 +08:00
wing328
52a928bb2e Merge pull request #2931 from Edubits/swift-sample-without-promisekit
[Swift] Add sample/tests for Swift client without PromiseKit
2016-05-21 23:21:00 +08:00
wing328
69ec14d628 fix csharp constructor for model with read-only 1st property 2016-05-21 22:42:37 +08:00
Robin Eggenkamp
1a1bf74d01 [Swift] Add sample/tests for Swift client without PromiseKit 2016-05-21 15:57:52 +02:00
wing328
bc44f74786 Merge pull request #2912 from zlx/feature/ruby_enum_support
Add Ruby enum support
2016-05-21 17:39:56 +08:00
wing328
aaca9a4b6f Merge pull request #2922 from zhenjun115/android_api_client
add gradle wrapper mustache for android api client;
2016-05-21 17:34:29 +08:00
wing328
e903628993 Merge branch 'swift/podupdate' of https://github.com/jaz-ah/swagger-codegen into jaz-ah-swift/podupdate
Conflicts:
	samples/client/petstore/swift/SwaggerClientTests/Pods/Pods.xcodeproj/project.pbxproj
2016-05-21 16:24:20 +08:00
zhenjun115
f2a2014ef4 add gradle wrapper mustache for android api client; 2016-05-20 20:24:22 +08:00
wing328
0134723afa add back pom.xml for go petstore 2016-05-20 18:36:36 +08:00
wing328
a96d38e223 Merge branch 'travis' of https://github.com/guohuang/swagger-codegen into guohuang-travis 2016-05-20 18:31:55 +08:00
wing328
c6f03806df Replaced {{mediaType}} with {{{mediaType}} to keep the original media 2016-05-20 17:48:47 +08:00
Newell Zhu
f45d6a4d60 Generate ruby enum 2016-05-20 08:44:53 +08:00
Joseph Zuromski
4e0e91e58b move up to ios 9.3 2016-05-19 12:35:17 -07:00
wing328
69de0ecb9b update wording for ts test cases 2016-05-20 00:56:26 +08:00
wing328
fe3d89f628 add CI for typescript fetch 2016-05-20 00:34:32 +08:00
wing328
f7ed6f040d add ci test for typescript angular 2016-05-20 00:34:31 +08:00
wing328
1e80455d82 add swagger codege ignore to ts node npm 2016-05-20 00:34:31 +08:00
wing328
3b4331a7ee add ci to ts node npm 2016-05-20 00:34:31 +08:00
wing328
a31f78b454 Merge branch 'swift/enums' of https://github.com/jaz-ah/swagger-codegen into jaz-ah-swift/enums
Conflicts:
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwiftCodegen.java
2016-05-19 16:10:47 +08:00
Joseph Zuromski
9bdf7c4bbb move back to alamofire 3.1.5 because alamofire 3.2.x and up cause issues speaking to the petstore service - has to do w/ Accept/content type changes 2016-05-18 09:48:12 -07:00
wing328
22413855cd remove try-catch block from objc sample code 2016-05-18 23:51:52 +08:00
Joseph Zuromski
98385aa746 checkpoint updating pod dependencies/moving to cocoapods1.0 2016-05-18 08:51:29 -07:00
wing328
d299f18f16 Merge pull request #2883 from scottrw93/requirements
Add requirments.txt and tox.ini
2016-05-18 09:54:40 +08:00
Guo Huang
b519015f61 fixed travis build error 2016-05-17 13:53:12 -07:00
Scott Williams
af64746870 Fix tox for 2.7 tests 2016-05-17 19:50:03 +01:00
wing328
1b4a3e72dd Merge pull request #2878 from mateuszmackowiak/objc/common_api_protocol
[Objc] - Common protocol for Api
2016-05-17 23:45:53 +08:00
zhenjun115
a093e7b74d gradle wrapper for java api client; 2016-05-17 23:40:57 +08:00
wing328
89614af25d Merge pull request #2890 from cbornet/retrofit2_oauth_loop
[Retrofit2] Don't retry if the access token doesn't change
2016-05-17 22:31:30 +08:00
wing328
a6068a585f Merge branch 'feature/patch-2' of https://github.com/zlx/swagger-codegen into zlx-feature/patch-2
Conflicts:
	samples/client/petstore/ruby/README.md
2016-05-17 21:05:37 +08:00
Newell Zhu
a62fa1c80c replace old syntax for rspec 2016-05-17 20:25:27 +08:00
Newell Zhu
1c3f1b4bf8 regenerate ruby sample after remove tailing 2016-05-17 20:13:38 +08:00
wing328
d161389599 Merge pull request #2879 from wing328/csharp_move_test_cases
[C#] move existing test cases to auto-generated test files
2016-05-17 19:30:42 +08:00
cbornet
596a076077 fix wrong method call 2016-05-17 10:35:37 +02:00
cbornet
fc1d06d810 update retrofit2 samples 2016-05-17 10:25:52 +02:00
wing328
1b117e7cec Merge pull request #2888 from akajla09/javaTests
Java: Add basic junit test templates for api clients
2016-05-17 12:00:07 +08:00
wing328
e69122359d Merge pull request #2880 from zhenjun115/android_api_client
gradle wrapper for android api client;
2016-05-17 11:03:13 +08:00
Aditya Kajla
5633fdfb3d Java: Add basic junit test templates for api clients 2016-05-16 17:55:29 -07:00
Scott Williams
ad6b347170 Add requirments.txt and tox.ini 2016-05-16 22:16:56 +01:00
wing328
44d64a8793 Merge pull request #2796 from guohuang/multi
Updat api_client.go to use the new SetMultiValueQueryParams method
2016-05-16 21:48:01 +08:00
zhenjun115
f79b894411 gradle wrapper for android api client; 2016-05-16 21:14:19 +08:00
wing328
4be97eb35c remove old test cases (c# petstore) 2016-05-16 16:36:38 +08:00
wing328
373e5fbde2 fix indention in tostring and constructor, add existing test cases to
auto-generated test files
2016-05-16 16:35:25 +08:00
Mateusz Mackowiak
36135134cb [Objc] - Fixed undeclared selector 2016-05-16 09:19:36 +02:00
Mateusz Mackowiak
7e1b080e24 [Objc] - Default headers in shared configuration 2016-05-16 08:55:08 +02:00
Mateusz Mackowiak
db27498961 [Objc] Remove try catch form documentation. 2016-05-16 07:48:22 +02:00
Mateusz Mackowiak
5c8516ce24 [Objc] - Common protocol for Api and added NSParameterAssert if missing required param + calling completion block with error rather than throwing an exception 2016-05-16 07:30:25 +02:00
wing328
f60bffe484 Merge pull request #2771 from taxpon/issue-2770
Update typescript-angular2 client to adapt to rc (#2770)
2016-05-16 11:37:56 +08:00
wing328
de1949c644 Merge branch 'php-generated-codestyle' of https://github.com/arnested/swagger-codegen into arnested-php-generated-codestyle 2016-05-15 22:11:19 +08:00
wing328
cda6bc380e update android volley dependencies, add source and target in pom.xml 2016-05-15 17:06:46 +08:00
wing328
d01305671f minor fix to android after switching default lib 2016-05-15 14:40:20 +08:00
wing328
1d6eef715c update swift petstore sample 2016-05-15 01:35:01 +08:00
wing328
1520b90b0d Merge pull request #2812 from achew22/undefined_ts
Update TypeScript to do a better check for empty on basePath.
2016-05-14 22:22:26 +08:00
wing328
7253375b13 Merge pull request #2811 from achew22/injection_ts
Update the injector static variable to contain all injected values.
2016-05-14 22:17:20 +08:00
Arne Jørgensen
d3fe0ae28a [PHP] Improve codestyle of phpunit tests 2016-05-14 13:45:41 +02:00
Arne Jørgensen
1f02fd281f [PHP] Regenerate petstore sample 2016-05-14 13:45:41 +02:00
Arne Jørgensen
cc395fdf63 [PHP] Improve generated codestyle 2016-05-14 13:45:41 +02:00
wing328
b3a335f97b Merge pull request #2863 from cbornet/fix_feign_oauth
[Feign]Fix issue with expired token refreshing
2016-05-14 18:04:12 +08:00
wing328
31848a1920 Merge pull request #2867 from wing328/php_debug_message
[PHP] add debug switch to print out downloaded file info
2016-05-14 17:56:28 +08:00
wing328
2a11720b1d Merge pull request #2862 from mateuszmackowiak/master
[Objc] Moved the generated files to Api, Core and Model folders
2016-05-14 17:48:22 +08:00
wing328
0b7d0c34af add debug switch to print out downloaded file info 2016-05-14 17:11:48 +08:00
Leon Yu
885d3543df functional programming api for typescript-fetch 2016-05-13 17:59:01 -04:00
Guo Huang
164c728088 Merge branch 'travis' of https://github.com/guohuang/swagger-codegen into travis
# Conflicts:
#	samples/client/petstore/go/go-petstore/.travis.yml
2016-05-13 13:31:53 -07:00
Guo Huang
492dbcb572 added travis yml to code gen 2016-05-13 13:29:51 -07:00
Guo Huang
0facbd708a added travis yml to code gen 2016-05-13 13:20:31 -07:00
cbornet
b543a53dc7 update feign sample 2016-05-13 16:33:49 +00:00
Mateusz Mackowiak
70cbe1042c [Objc] Moved the generated files to Api, Core and Model folders
- Added known response codes in comment
2016-05-13 17:46:49 +02:00
wing328
3ec8a96a94 update csharp petstore sample 2016-05-13 22:17:16 +08:00
wing328
303aec7647 Merge branch 'cs/req_properties_2584' of https://github.com/jimschubert/swagger-codegen into jimschubert-cs/req_properties_2584
Conflicts:
	samples/client/petstore/csharp/SwaggerClient/IO.Swagger.sln
	samples/client/petstore/csharp/SwaggerClient/README.md
	samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger.Test/IO.Swagger.Test.csproj
	samples/client/petstore/csharp/SwaggerClient/src/IO.Swagger/IO.Swagger.csproj
2016-05-13 21:49:16 +08:00
wing328
68d0e975f9 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-05-13 21:03:50 +08:00
wing328
1e00bbfb8d Merge branch 'typescript-fetch-basic-unit-test' of https://github.com/leonyu/swagger-codegen into leonyu-typescript-fetch-basic-unit-test 2016-05-13 18:02:38 +08:00
wing328
e24405e706 Merge pull request #2861 from BeneficialName/php-fix-prop-name-as-var
[PHP] list_invalid_properties now don't call undefined variables
2016-05-13 17:35:18 +08:00
wing328
406357e3b8 Merge pull request #2854 from BeneficialName/php-cleanup
[PHP] Cleanup to make coding style more consistent
2016-05-13 17:31:36 +08:00
Kim Sondrup
7737a59705 Run ./bin/php-petstore.sh 2016-05-13 11:01:10 +02:00
wing328
26aa8e7c05 Merge pull request #2852 from BeneficialName/php-model-change
[PHP] method list_invalid_properties change to camelCase
2016-05-13 16:55:17 +08:00
Kim Sondrup
e31c71f685 [PHP] list_invalid_properties now don't call undefined variables 2016-05-13 10:54:29 +02:00
wing328
610af20712 update swift sample 2016-05-13 16:40:01 +08:00
wing328
e0ce491b44 Merge branch 'enum' of https://github.com/cjolif/swagger-codegen into cjolif-enum 2016-05-13 16:32:38 +08:00
Leon Yu
aed31fbff3 basic integration test for typescript-fetch
fix postpublish script
2016-05-13 01:45:54 -04:00
Kim Sondrup
840adb8aa3 [PHP] model list_invalid_properties change to camelCase 2016-05-12 20:05:55 +02:00
wing328
153af0c6cb Merge pull request #2843 from zhenjun115/android_volley_api_client
Android volley api client
2016-05-13 00:21:44 +08:00
zhenjun115
32a6099853 add gitignore.mustache and git_push.mustache for android api client using volley; 2016-05-12 23:04:43 +08:00
wing328
a05133bdc6 Merge branch 'objc/moved_logger_and_optimalizations' of https://github.com/mateuszmackowiak/swagger-codegen into mateuszmackowiak-objc/moved_logger_and_optimalizations
Conflicts:
	samples/client/petstore/objc/README.md
	samples/client/petstore/objc/SwaggerClient.podspec
2016-05-12 22:38:06 +08:00
wing328
b61fa55e45 Merge branch 'objc/bump_podspec_versions' of https://github.com/mateuszmackowiak/swagger-codegen into mateuszmackowiak-objc/bump_podspec_versions 2016-05-12 22:21:22 +08:00
Christophe Jolif
524ced1d9b Fix regression on swift enum name as well as make sure enum var name with colons ouput compiable swift. Add a test. fixes #2824, fixes #2835 2016-05-12 11:57:43 +02:00
Mateusz Mackowiak
ac37c43649 [Objc] Moved [request setHTTPShouldHandleCookies:NO]; to postProcessRequest method for easier override to modify request. 2016-05-11 18:20:15 +02:00
Mateusz Mackowiak
567c23a3df [Objc] Support for variations of application/json type 2016-05-11 17:39:28 +02:00
Takuro Wada
77428b8a83 Fix npm error & import error in generated code 2016-05-12 00:32:09 +09:00
wing328
d6ad7dc0b0 Merge pull request #2831 from zhenjun115/master
a new pom.mustache for android api client using volley HTTP library;
2016-05-11 17:43:42 +08:00
Mateusz Mackowiak
6206785038 [Objc] bump AFNetworking version to 3 2016-05-11 10:40:43 +02:00
wing328
2784db0604 fix escpaing " and \ 2016-05-11 16:14:03 +08:00
zhenjun115
ee15ef3579 a new pom.mustache for android api client using volley HTTP library; 2016-05-11 13:05:54 +08:00
Mateusz Mackowiak
fa7d3c9bad [Objc]
- Moved Logging to separate Logger file
- Moved selectHeaderAccept and selectHeaderContentType to sanitizer
- little optimizations
2016-05-10 22:06:50 +02:00
Mateusz Mackowiak
94f49d2275 [Objc] bump version of JSONModel to 1.2 and ISO8601 to 0.5 2016-05-10 21:53:14 +02:00
Guo Huang
80d210a413 added travis.yml, remove old README.md 2016-05-10 11:13:56 -07:00
wing328
1cb1b0351c update php sample 2016-05-10 22:38:21 +08:00
wing328
4f28ed3cd3 Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-05-10 20:02:33 +08:00
wing328
55746f01b1 Merge branch 'csharp-bug' of https://github.com/guohuang/swagger-codegen into guohuang-csharp-bug 2016-05-10 20:01:44 +08:00
wing328
5aaf570782 Merge pull request #2818 from wing328/bug/fix_2795
[C#] fix constructor with readonly property at the end
2016-05-10 19:08:17 +08:00
wing328
cd6f5877ac add bin/typescript-fetch-petstore-all.sh 2016-05-10 18:01:17 +08:00
wing328
1b36083afd fix #2795 2016-05-10 17:40:21 +08:00
wing328
5bbed79581 Merge pull request #2815 from wing328/ruby_move_test_case
[Ruby] update Ruby test cases
2016-05-10 15:22:01 +08:00
wing328
31daa2b092 update ruby test files 2016-05-10 14:56:14 +08:00
wing328
d54877b5d3 add ruby spec for configuration, api client, replace should with expect 2016-05-10 14:18:06 +08:00
Guo Huang
e7f68287c1 updated function to support multiple collection formats 2016-05-09 22:01:32 -07:00
Andrew Z Allen
0b8c936972 Update TypeScript to do a better check for empty on basePath.
In Angular if a value is not defined for injection it is passed as
undefined. That means that most of the time `if (value) {` is a
reasonable test. Unfortunately since `""` (empty string) is also falsey
by nature, an empty string will not trigger the if properly.

Instead you should check `if (value !== undefined) {`.
2016-05-09 22:59:25 -06:00
Andrew Z Allen
51ad775aee Update the injector static variable to contain all injected values.
In Angular.js, values are injected into service in one of two ways:

1) Inline (by name).
2) By a static injector variable.

The TypeScript generator uses the 2nd method. This method requires you
to explicitly enumerate all the values you would like to have injected.
If you fail to inject a value the Angular DI system will simply pass you
`undefined`. The constructor is expecting 3 values to be passed (the
final being basePath) but the injector static only defines 2 values.
This results in basePath always being undefined no matter what you
define it to be.

This change updates the injector variable to handle that properly.
2016-05-09 22:46:50 -06:00
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
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
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
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
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
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
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
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
36ada7f5fc Merge branch 'validation' of https://github.com/scottrw93/swagger-codegen into scottrw93-validation 2016-05-09 10:51:23 +08:00
Scott Williams
25ebd5466d Update pattern to support Perl /pattern/modifiers convention 2016-05-09 01:11:29 +01:00
Jim Schubert
705ed78de1 [csharp] regenerate client 2016-05-08 08:35:28 -04:00
Mateusz Mackowiak
fbd6a95799 [Objc] Generator supports binary and BiteArray and maps data to NSData 2016-05-08 12:54:12 +02:00
zhenjun115
6709a92cbc remove pom.mustache from android api client using volley HTTP library; 2016-05-07 23:38:05 +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
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