Skip to content

update develop#600

Merged
ajibarra merged 40 commits into
masterfrom
develop
Aug 24, 2017
Merged

update develop#600
ajibarra merged 40 commits into
masterfrom
develop

Conversation

@steinkel

Copy link
Copy Markdown
Member

No description provided.

rochamarcelo and others added 30 commits May 15, 2017 20:17
Change Tilde Version Range to Caret Version Range to allow upgrading to CakePHP 3.5.x
…end user validation email

Based on the register method, allow for a new registration token to be created as well as resetting the token registration time based on the option for token_expiration in seconds. Add a test to check that when this method is called, the token expiration is changed.
Allow upgrade to CakePHP 3.5.x
For test to pass in php <= php 7.0, token_expiration must be a different value in the test environment for the end values to be different, because the test takes less than a second.
Prevent conflict between CsrfComponent and CsrfProtectionMiddleware
stephenburgess8 and others added 10 commits August 15, 2017 11:51
Utilize `src/Table.php` from CakePHP Migrations plugin, which has
extra functionality like setting default collation and encoding etc.

See this PR for more info: cakephp/migrations#302

The above was merged to CakePHP Migrations v1.7.0.
Extend CakePHP Migrations instead of Phinx
Sugestion for issue #491 and PR 575
@coveralls

Copy link
Copy Markdown

Coverage Status

Coverage increased (+1.7%) to 81.57% when pulling e75c1ef on develop into 1414871 on master.

@ajibarra
ajibarra merged commit c0897ae into master Aug 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants