18346 Commits

Author SHA1 Message Date
Adam Panzer
2aadbee8ed
validate(s)_presence_of
Migration should create pluralized table names
Change controller filenames
2016-10-03 14:47:01 -07:00
wing328
00cc060827 Merge pull request #3637 from cbornet/fix_multi_inheritance
[All] Fix some inheritance/composition issues and add allOf unit tests
2016-10-03 23:18:43 +08:00
Miguel García
e633073082 Add a new cli command to output version information (2nd attempt) #3892 (#3899)
* Properly git-ignore all nbactions.xml files.

* Add a command line action to print the program version (#3892).

I am using maven resource filtering capabilities so that an existing version.properties resource file
gets filtered upon build and populated with the project version tag. This resource is then read
at runtime as required.

* Using a different version tag when unreadable.
2016-10-03 17:14:54 +08:00
wing328
1840956320 Merge pull request #3913 from wing328/python_flask_no_tags
[Python][Flask] fix python flask controller issue without tag
2016-10-03 09:56:49 +08:00
wing328
4a74e788ec fix python flask controller without tag (default_controller) 2016-10-03 09:32:20 +08:00
Jim Schubert
b7708a44bf [aspnet5] Fix basePath application to operations (#3911)
* [aspnet5] Fix basePath application to operations

* [aspnet5] Regenerate sample
2016-10-02 21:56:19 +08:00
wing328
a6287bed1d Merge branch '2.3.0' of https://github.com/swagger-api/swagger-codegen into 2.3.0 2016-10-02 17:24:37 +08:00
wing328
62b6cf4609 Merge remote-tracking branch 'origin/master' into 2.3.0 2016-10-02 17:24:17 +08:00
Bartek Kryza
40a1879797 Bugfix/issue 3723 (#3726)
* Extended request generation logic with support for serialized body content types other than Json

* Updated the Petstore Python client tests

* Fixed body content type identification for strings
2016-10-02 17:02:03 +08:00
Charles
d4f9a16cf6 Cgardens nested object regex (#3879)
* stop parsing key of object at first comma.

* update samples
2016-10-02 16:32:17 +08:00
Scott Richter
b2e2643fd2 [Cpprest] Fixing issue #3773 (#3876)
* Fixed errors with cpprest client generation when generating a client that uses arrays of primitive types (vector) and file responses (HttpContent).

* Updated the petstore sample using script.

* Removed debug code.

* Removed extra newline to match master.

* Fixed binary file handling in cpprest. Updated petstore samples.

* Update readme to add Cummins to list

* Cleaning up for pull. Removing unnecessary changes.

* Fixing petstore

* Fixing error in build.

* Fixed error in stream copy for binary data

* Replaced tab with 4 spaces in all modified files.

Replaced tab with 4 spaces in all modified files.
2016-09-30 10:31:24 +08:00
Alex Nolasco
07df71e959 Issue#3829. Objective-C client code, discriminator generated in both base and child. 2016-09-29 09:28:44 -04:00
wing328
3d231e4e4b Merge pull request #3900 from wing328/escape_callback
[Java][Python] Escape callback parameter for java(okhttp) and python
2016-09-29 17:45:30 +08:00
wing328
f59c28d08a escape callback parameter for java(okhttp) and python 2016-09-29 17:41:47 +08:00
Dalibor Karlović
19f1c7e095 feature(PHP QA) add initial PHP client template tweaks to improve emitted code quality 2016-09-29 08:48:24 +02:00
wing328
34525853b6 Merge pull request #3897 from wing328/fix_html_warnings
[Doc] Fix warning in HTML generators
2016-09-29 11:35:11 +08:00
wing328
a7ed1ad202 fix warning in html generator 2016-09-29 11:09:54 +08:00
Cédric Luthi
4325e5cca1 [objc] Remove the custom security policy
There are several issues with the security policy:

* The security policy is created with `AFSSLPinningModeNone` which means that even if pinned certificates are set (if config.sslCaCert is not nil), they will be ignored. Pinning will not work at all with this security policy.

* The configuration wrapper for the security policy is a bad idea.
  * `verifySSL` controls both invalid certificates and domain validation. A vanilla `AFSecurityPolicy` clearly exposes both `allowInvalidCertificates` and `validatesDomainName`.
  * `sslCaCert` only allows for a single pinned certificate. A vanilla `AFSecurityPolicy` clearly exposes a set of pinned certificates and makes it very convenient to load them with either `+[AFSecurityPolicy policyWithPinningMode:]` or `+[AFSecurityPolicy certificatesInBundle:]`

Since the security policy does not work at all and adds confusion, it is better to just remove it and let the user configure a security policy that fits their needs.
2016-09-29 00:23:22 +02:00
Dalibor Karlović
10d3dea89e [PHP] fix PHPUnit invocation, add basic phpunit.xml.dist (#3864)
* feature(phpunit) fix PHPUnit invocation, add basic phpunit.xml.dist

* fix(phpunit) add proper paths relative to phpunit.xml.dist
2016-09-28 19:44:07 +08:00
wing328
ec25bd793f [Java] Remove duplicated model description in Spring, JAX-RS models (#3887)
* fix duplicated description in spring model

* fix duplicated description in jaxrs models

* fix resteasy dependency
2016-09-28 19:34:38 +08:00
wing328
a090ce07e5 Merge pull request #3875 from arnested/mention-security-script-in-pull-request-template
Mention security script in pull request template
2016-09-28 18:48:32 +08:00
Dalibor Karlović
70fa2fb78e [PHP] Better PSR2 compatibility (#3863)
* feature(php-cs-fixer) add php-cs-fixer support

* feature(php-cs-fixer) tweak Mustache templates to fit PSR2

* feature(php-cs-fixer) bin/php-petstore.sh output
2016-09-27 08:23:44 +08:00
wing328
0f25501746 Merge pull request #3873 from ButterflyNetwork/swift-thread-safe-manager
[Swift] Use thread safe manager dictionary
2016-09-27 07:48:20 +08:00
Arne Jørgensen
8b681df0e6 Mention security script in pull request template 2016-09-26 22:21:09 +02:00
Jason Gavris
9e54dce92f [Swift] Use thread safe manager dictionary 2016-09-26 11:27:07 -04:00
wing328
fa12cd3787 Replace ^M with new line (\r) in mustache template (#3865)
* fix jaxrs line break

* fix java gradle bat line break

* fix scala gradle line break

* fix undertow crt line break

* fix spring line break

* fix undertow line break in pom

* rollback undertwo petstore to use petstore.yaml
2016-09-26 16:49:44 +08:00
wing328
1dc09f3619 Merge pull request #3868 from wing328/swift_fix_url_param
[Swfit] fix path parameter with baseName mustache tag
2016-09-26 11:33:29 +08:00
wing328
bee27aee9b [swfit] fix url param with base name 2016-09-26 11:01:02 +08:00
Yuta HIGUCHI
2155b7b09e [JaxRS]Show correct default value on CLI option description (#3862)
* Show correct default value on CLI option description

Fixes #3861

* Changes after ./bin/jaxrs-petstore-server.sh
2016-09-24 15:11:15 +08:00
David Biesack
fedb0cc352 add title, description to HTML output (#3860)
* add schema title, description to HTML output

* Include title, description in petstore sample (and HTML output)
2016-09-24 11:14:36 +08:00
wing328
b2344e10cb Merge pull request #3857 from wing328/go_fix_trailing_comma
[Go] fix trailing comma in go api client
2016-09-24 01:16:32 +08:00
wing328
dce532e8c7 fix trailing comma in go api client 2016-09-24 00:57:01 +08:00
wing328
f47208a75b Merge branch 'master' of https://github.com/swagger-api/swagger-codegen 2016-09-24 00:17:54 +08:00
wing328
84f03e67f5 Merge branch 'neilotoole-issue-3690-additional-fields' 2016-09-24 00:17:42 +08:00
wing328
110c22ea98 Merge branch 'issue-3690-additional-fields' of https://github.com/neilotoole/swagger-codegen into neilotoole-issue-3690-additional-fields 2016-09-24 00:17:18 +08:00
wing328
83916f23d0 Merge pull request #3855 from wing328/ts_fetch_basepath_fix
[Typescript] fix typescript-fetch base path by removing ending slash
2016-09-23 19:59:25 +08:00
wing328
d1c1c9d08f fix typescript-fetch base path by removing ending slash 2016-09-23 19:12:40 +08:00
Kamil
9301db60e6 redundant quotation mark (#3837)
* Removed redundant quotation mark

This additional quotation mark is causing problems in out project and should be removed.

ngrep output:
```
Content-Disposition: form-data; name="file"; filename="file""
  ..Content-Transfer-Encoding: binary..Content-Type: image/jpg..Content-Length: 27855..........JFIF....
```

* updated petstore sample

* removed line break
2016-09-23 18:33:27 +08:00
Sergii Rustamov
fee23f2230 Support cpprest on Linux (#3847)
* Support cpprest on Linux

* Update petstore code
2016-09-23 18:32:33 +08:00
wing328
569997b073 Merge pull request #3853 from mattalexx/proposed
Fix custom generator execution example in README template
2016-09-23 13:27:38 +08:00
wing328
116bf3ff88 Merge pull request #3854 from jvosantos/patch-1
Update README.md
2016-09-23 09:17:18 +08:00
Vasco Santos
b8843ab466 Update README.md
Added a new company to the company list
2016-09-23 02:06:12 +01:00
Matt Alexander
12fb4becd7 Fix custom generator execution example 2016-09-22 14:36:08 -05:00
wing328
e3b891a924 Merge pull request #3850 from wing328/fix_swift_pod_file
[Swift] add default value to swift podspec
2016-09-22 19:26:24 +08:00
wing328
9f75f8d3cb Merge pull request #3813 from mwgray/unwrapRequired-init-optional-parameters
add optional parameters to init when unwrapRequired is true
2016-09-22 18:51:52 +08:00
Kim Sondrup
9bb097fcf5 [PHP] Correct Composer license identifier (#3848)
* [PHP] Correct Composer license identifier

* Update petstore PHP
2016-09-22 18:49:08 +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
wing328
70ed52cee0 add default value to swift podspec 2016-09-22 18:41:53 +08:00
wing328
cfed530997 Merge pull request #3843 from wing328/fix_ts_angular2_model_optional
[Typescript][Angular2] Fix required properties in the model
2016-09-21 20:32:04 +08:00
wing328
d11c7ad09a fix typescript angular2 model - optional/required 2016-09-21 20:08:27 +08:00