| 
							
							
								 Paŭlo Ebermann | 9be178b26a | Merge branch 'master' into new-sync-master-to-2.3.0 | 2017-03-13 21:42:41 +01:00 |  | 
			
				
					| 
							
							
								 baartosz | 26257daec3 | fixed ApiException's methods return types (#4845) | 2017-03-02 16:45:42 +08:00 |  | 
			
				
					| 
							
							
								 William Cheng | ce899e3776 | Merge remote-tracking branch 'origin/master' into 2.3.0 Conflicts:
	appveyor.yml
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SpringCodegen.java
	modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngular2ClientCodegen.java
	modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache
	modules/swagger-codegen/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
	modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache
	modules/swagger-codegen/src/main/resources/go/api.mustache
	modules/swagger-codegen/src/main/resources/objc/api-body.mustache
	modules/swagger-codegen/src/main/resources/objc/api-header.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/configuration.mustache
	modules/swagger-codegen/src/main/resources/typescript-angular2/tsconfig.mustache
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift/SwiftModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/swift3/Swift3ModelTest.java
	modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/typescriptangular2/TypeScriptAngular2ModelTest.java
	samples/client/petstore-security-test/typescript-angular2/configuration.ts
	samples/client/petstore/go/go-petstore/docs/FakeApi.md
	samples/client/petstore/go/go-petstore/fake_api.go
	samples/client/petstore/go/go-petstore/pet_api.go
	samples/client/petstore/java/feign/pom.xml
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/RFC3339DateFormat.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Animal.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/FormatTest.java
	samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
	samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/JSON.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/okhttp-gson/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/java/retrofit2/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/FakeApi.java
	samples/client/petstore/java/retrofit2rx/src/main/java/io/swagger/client/api/PetApi.java
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/core-data/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/core-data/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGPetApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGStoreApi.m
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.h
	samples/client/petstore/objc/default/SwaggerClient/Api/SWGUserApi.m
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGApiClient.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGConfiguration.h
	samples/client/petstore/objc/default/SwaggerClient/Core/SWGJSONResponseSerializer.h
	samples/client/petstore/qt5cpp/client/SWGPetApi.h
	samples/client/petstore/qt5cpp/client/SWGStoreApi.h
	samples/client/petstore/qt5cpp/client/SWGUserApi.h
	samples/client/petstore/typescript-angular2/default/configuration.ts
	samples/client/petstore/typescript-angular2/npm/README.md
	samples/client/petstore/typescript-angular2/npm/configuration.ts
	samples/client/petstore/typescript-angular2/npm/package.json
	samples/client/petstore/typescript-angular2/npm/tsconfig.json
	samples/client/petstore/typescript-fetch/builds/default/api.ts
	samples/client/petstore/typescript-fetch/builds/es6-target/api.ts
	samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts
	samples/client/petstore/typescript-fetch/tests/default/test/PetApiFactory.ts
	samples/client/petstore/typescript-fetch/tests/default/test/StoreApiFactory.ts
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
	samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
	samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/model/User.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/FakeApiController.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java
	samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApiController.java | 2017-01-05 17:44:39 +08:00 |  | 
			
				
					| 
							
							
								 wing328 | 90512e6326 | Remove Apache license from API client generators (#4197) * remove php apache license
* remove apache license from C#
* remove apache license in objc code
* remove license from swift 3 code
* remove apache license from perl code
* remove license from scala code
* remove license from ts, go, android, cpp, scala
* remove license from java api client
* restore clojure petstore files
* remove license from travis file
* clean up apache-related terms in php, ruby, python mustache tempaltes
* remove license from JS API cilent | 2016-11-16 21:44:49 +08:00 |  | 
			
				
					| 
							
							
								 Kim Sondrup | aad80b94c5 | [PHP] Change APIException to expect headers as array (#3838) * [PHP] Change APIException to expect headers as array
* Update petstore PHP | 2016-09-22 18:47:07 +08:00 |  | 
			
				
					| 
							
							
								 Ville Skyttä | 91b7494e3e | Spelling fixes | 2016-09-06 14:45:04 +03:00 |  | 
			
				
					| 
							
							
								 Arne Jørgensen | e41019fb2b | [PHP] Regenerate petstore sample | 2016-05-26 00:13:45 +02:00 |  | 
			
				
					| 
							
							
								 Arne Jørgensen | 1f02fd281f | [PHP] Regenerate petstore sample | 2016-05-14 13:45:41 +02:00 |  | 
			
				
					| 
							
							
								 wing328 | 0b7d0c34af | add debug switch to print out downloaded file info | 2016-05-14 17:11:48 +08:00 |  | 
			
				
					| 
							
							
								 Ron | 3a2ad9e2e4 | Happy new year! | 2016-01-06 16:04:16 -08:00 |  | 
			
				
					| 
							
							
								 Arne Jørgensen | 47b2ae934b | Regenerated PHP petstore sample. | 2015-10-27 22:58:25 +01:00 |  | 
			
				
					| 
							
							
								 wing328 | f154e407d2 | update coding style based on CodeSniffer | 2015-07-13 15:26:12 +08:00 |  | 
			
				
					| 
							
							
								 wing328 | 259b31ccd4 | temporary folder setting | 2015-07-13 15:21:38 +08:00 |  | 
			
				
					| 
							
							
								 Tony Tam | 07d5365c5c | merged from #902, rebuilt client | 2015-06-25 10:17:28 -07:00 |  | 
			
				
					| 
							
							
								 Branden Cash | 719a0b732e | Update sample client | 2015-06-18 11:43:48 -07:00 |  | 
			
				
					| 
							
							
								 wing328 | 7fd996bc86 | update php sample | 2015-06-09 13:31:14 +08:00 |  | 
			
				
					| 
							
							
								 Tony Tam | 64ea3f8177 | rebuilt | 2015-06-07 20:50:35 -07:00 |  | 
			
				
					| 
							
							
								 Ron | 96107193e9 | updated reverb references | 2015-06-07 11:18:49 -04:00 |  | 
			
				
					| 
							
							
								 wing328 | 7080983521 | return exception instead of null for 404, add properties to api exception class | 2015-06-02 17:25:38 +08:00 |  | 
			
				
					| 
							
							
								 wing328 | e993d08563 | rename APIClient to ApiClient, APIClientException to APIException | 2015-05-28 15:06:31 +08:00 |  |