Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge the 3.0.x branch #12644

Merged
merged 72 commits into from
Feb 25, 2017
Merged

Merge the 3.0.x branch #12644

merged 72 commits into from
Feb 25, 2017

Commits on Feb 20, 2017

  1. Regenerated build (PHP7)

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    a8fb6c7 View commit details
    Browse the repository at this point in the history

  2. Regenerated build (PHP5)

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    50a385f View commit details
    Browse the repository at this point in the history

  3. Regenerated build (PHP5)

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    c961e02 View commit details
    Browse the repository at this point in the history

  4. Regenerated build (PHP7)

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    c20a2c4 View commit details
    Browse the repository at this point in the history

  5. Using latest Zephir [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ad3f273 View commit details
    Browse the repository at this point in the history

  6. Bump dev version

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    5e5cf54 View commit details
    Browse the repository at this point in the history

  7. Added a number (0) to be a label in a form field. Null, empty string … 

    …or empty array will keep invalidating a label and using the value instead.
    @sergeyklay
    Gorka Guridi authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    8ec2e34 View commit details
    Browse the repository at this point in the history

  8. Update CONTRIBUTING.md [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    e8ee683 View commit details
    Browse the repository at this point in the history

  9. Include cipher aliases for \Phalcon\Crypt 

    The older version of Phalcon used aliases for cipher and now they are not available. They are easy to use and migration will be easier if they persist.
    @ibpavlov @sergeyklay
    ibpavlov authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    de04294 View commit details
    Browse the repository at this point in the history

  10. Test Alias cipher for \Phalcon\Crypt

    @ibpavlov @sergeyklay
    ibpavlov authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    eec247d View commit details
    Browse the repository at this point in the history

  11. Update Changelog

    @ibpavlov @sergeyklay
    ibpavlov authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ccbbfa4 View commit details
    Browse the repository at this point in the history

  12. Change test in changelog

    @ibpavlov @sergeyklay
    ibpavlov authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    e425fe1 View commit details
    Browse the repository at this point in the history

  13. Allow other except fields than unique fields

    @Jurigag @sergeyklay
    Jurigag authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    1d49f65 View commit details
    Browse the repository at this point in the history

  14. Added backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    abc0d8a View commit details
    Browse the repository at this point in the history

  15. Update tests CHANGELOG.md [ci skip] 

    Add TEST_MC_WEIGHT to export list
    @Jurigag @sergeyklay
    Jurigag authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    737455d View commit details
    Browse the repository at this point in the history

  16. Fixed #12567 [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    2d9cacb View commit details
    Browse the repository at this point in the history

  17. Cleaned .gitignorei [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    0b4d4d0 View commit details
    Browse the repository at this point in the history

  18. Update Phalcon\Mvc\Model return ResultsetInterface (#12574) 

    * Update Phalcon\Mvc\Model return ResultsetInterface

ResultsetInterface is not imported and causes problems when generating Stubs for IDE. It is generating @return type of Phalcon\Mvc\ResultsetInterface and not Phalcon\Mvc\Model\ResultsetInterface

I think it should be imported in order to easily find correct class

* Update CHANGELOG.md
    @ibpavlov @sergeyklay
    ibpavlov authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    e33fe62 View commit details
    Browse the repository at this point in the history

  19. Fixes #12573

    @Jurigag @sergeyklay
    Jurigag authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    3606bba View commit details
    Browse the repository at this point in the history

  20. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    969ca5a View commit details
    Browse the repository at this point in the history

  21. Update BACKERS.md with known links

    @Jurigag @sergeyklay
    Jurigag authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    489c505 View commit details
    Browse the repository at this point in the history

  22. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    7f639d6 View commit details
    Browse the repository at this point in the history

  23. Added mctekk and abits logos

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    115996f View commit details
    Browse the repository at this point in the history

  24. Removing the images to ensure that they are refreshed with the next c… 

    …ommit
    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    185cb65 View commit details
    Browse the repository at this point in the history

  25. Re-added the images for backers

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    8933b13 View commit details
    Browse the repository at this point in the history

  26. Added pdffiller in the backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ddeb405 View commit details
    Browse the repository at this point in the history

  27. Added links to the BACKERS.md

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    941e753 View commit details
    Browse the repository at this point in the history

  28. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    390d6ff View commit details
    Browse the repository at this point in the history

  29. Removing the images to ensure that they are refreshed with the next c… 

    …ommit
    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    3f6ad7a View commit details
    Browse the repository at this point in the history

  30. Re-added the images for backers

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    886dca2 View commit details
    Browse the repository at this point in the history

  31. Added links to the BACKERS.md

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    d897c08 View commit details
    Browse the repository at this point in the history

  32. Updated backers file

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    5974c8f View commit details
    Browse the repository at this point in the history

  33. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    764375b View commit details
    Browse the repository at this point in the history

  34. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    9e3162d View commit details
    Browse the repository at this point in the history

  35. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    05a74bf View commit details
    Browse the repository at this point in the history

  36. Bump version

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ccc03da View commit details
    Browse the repository at this point in the history

  37. Tune up Travis build

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    cfe06fa View commit details
    Browse the repository at this point in the history

  38. Fixed ModelsManager tests

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    eb7ffc2 View commit details
    Browse the repository at this point in the history

  39. Tune up PHP_CodeSniffer

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    f4f2855 View commit details
    Browse the repository at this point in the history

  40. Tune up PHP_CodeSniffer

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    e9f50cf View commit details
    Browse the repository at this point in the history

  41. Tune up the tests

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    8193730 View commit details
    Browse the repository at this point in the history

  42. Updated CHANGELOG.md [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    74bbcbe View commit details
    Browse the repository at this point in the history

  43. Cleaned Gettext::query

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    6ba5f82 View commit details
    Browse the repository at this point in the history

  44. Fixed Phalcon\Validation\Message\Group::offsetUnset

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    51cdce3 View commit details
    Browse the repository at this point in the history

  45. Allow role and resource object in isAllowed

    @Jurigag @sergeyklay
    Jurigag authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    8ec0624 View commit details
    Browse the repository at this point in the history

  46. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ec99b94 View commit details
    Browse the repository at this point in the history

  47. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    96d1dcc View commit details
    Browse the repository at this point in the history

  48. Updated Copyright [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    8a40933 View commit details
    Browse the repository at this point in the history

  49. Updated backers file

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    6b4c7ed View commit details
    Browse the repository at this point in the history

  50. Removing the images to ensure that they are refreshed with the next c… 

    …ommit
    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    4d6773c View commit details
    Browse the repository at this point in the history

  51. Re-added the images for backers

    @niden @sergeyklay
    niden authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    dda3342 View commit details
    Browse the repository at this point in the history

  52. Added links to the BACKERS.md

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    1e270c0 View commit details
    Browse the repository at this point in the history

  53. Updated dependencies

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    faea1c2 View commit details
    Browse the repository at this point in the history

  54. Regenerated build (PHP7)

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    4bae1df View commit details
    Browse the repository at this point in the history

  55. Regenerated build (PHP5)

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ae82371 View commit details
    Browse the repository at this point in the history

  56. Using latest Zephir

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    6ef803d View commit details
    Browse the repository at this point in the history

  57. Updated CHANGELOG.md [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    4ccdc99 View commit details
    Browse the repository at this point in the history

  58. Restarted Travis build

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    ebfc953 View commit details
    Browse the repository at this point in the history

  59. Regenerated build [ci skip]

    @andresgutierrez @sergeyklay
    andresgutierrez authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    d785202 View commit details
    Browse the repository at this point in the history

  60. Regenerating build for php5 [ci skip]

    @andresgutierrez @sergeyklay
    andresgutierrez authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    9baa361 View commit details
    Browse the repository at this point in the history

  61. Cleaned Phalcon\Annotations\AdapterInterface

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    5463c4e View commit details
    Browse the repository at this point in the history

  62. Cleaned the Appveyor Build

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    8dbd1c3 View commit details
    Browse the repository at this point in the history

  63. Added Phalcon\Validation for Phalcon\Mvc\Collection

    @Jurigag @sergeyklay
    Jurigag authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    88a1ecf View commit details
    Browse the repository at this point in the history

  64. install file refactoring, custom phpize & php-config paths allowed

    @DimazzzZ @sergeyklay
    DimazzzZ authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    5ea9b22 View commit details
    Browse the repository at this point in the history

  65. install BINs fix

    @DimazzzZ @sergeyklay
    DimazzzZ authored and sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    afa4413 View commit details
    Browse the repository at this point in the history

  66. Rosolved conflicts [ci skip]

    @sergeyklay
    sergeyklay committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    8b8071a View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Removed unused variables

    @sergeyklay
    sergeyklay committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    de1d970 View commit details
    Browse the repository at this point in the history

  2. Amended Uniqueness Validator test

    @sergeyklay
    sergeyklay committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    36f048a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2017

  1. Port Uniquenss Validator changes from 3.0.x

    @sergeyklay
    sergeyklay committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    56ca216 View commit details
    Browse the repository at this point in the history

  2. Regenerated build (PHP7) [ci skip]

    @sergeyklay
    sergeyklay committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    7d412f0 View commit details
    Browse the repository at this point in the history

  3. Regenerated build (PHP5) [ci skip]

    @sergeyklay
    sergeyklay committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    5600e9b View commit details
    Browse the repository at this point in the history

  4. Using latest Zephir [ci skip]

    @sergeyklay
    sergeyklay committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    d48560b View commit details
    Browse the repository at this point in the history