summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-02-09[ci skip] WhitespaceAndrey Andreev1-1/+1
2016-02-09Merge branch '3.0-stable' into developAndrey Andreev14-49/+193
Fixed conflicts: user_guide_src/source/overview/at_a_glance.rst
2016-02-09Add CI_Log test casesAndrey Andreev1-0/+64
2016-02-09Merge pull request #4323 from ↵Andrey Andreev1-3/+20
jspreddy/sai/log_line_formatting_extensibility_change Refactored CI_Log line formatting to allow extensibility
2016-02-09Merge pull request #4323 from ↵Andrey Andreev1-3/+20
jspreddy/sai/log_line_formatting_extensibility_change Refactored CI_Log line formatting to allow extensibility
2016-02-09Merge pull request #4445 from damiengrandi/developAndrey Andreev1-9/+9
[ci skip] Update QB phpdoc returns
2016-02-09Merge pull request #4445 from damiengrandi/developAndrey Andreev1-9/+9
[ci skip] Update QB phpdoc returns
2016-02-09fix a typo editDamien Grandi1-1/+1
2016-02-09Revert some previous changesDamien Grandi1-3/+3
2016-02-09Update DB_query_builder.php - phpdoc (some incorrect return type)Damien Grandi1-12/+12
Edit of some return type in phpdoc. This can also help to fix some autocompletion troubles in some IDE.
2016-02-08Doc block formatting change.Sai Phaninder Reddy Jonnala1-4/+3
2016-02-08[ci skip] Add a changelog entry for PR #4437Andrey Andreev1-0/+1
2016-02-08Merge pull request #4437 from ivantcholakov/3.0-stableAndrey Andreev1-1/+1
Escape the $separator parameter for humanize() inflector helper
2016-02-07hunanize() helper: Escaping the $separator argument.Ivan Tcholakov1-1/+1
2016-02-06[ci skip] Note adjustment in docsAndrey Andreev1-2/+2
2016-02-06Merge pull request #4410 from ShrmnK/developAndrey Andreev5-22/+22
[ci skip] Consistent formatting of file paths and inline code in docs
2016-02-06Merge pull request #4410 from ShrmnK/developAndrey Andreev5-22/+22
[ci skip] Consistent formatting of file paths and inline code in docs
2016-02-06Reverted formatting for non-variableSherman K1-1/+1
2016-02-05[ci skip] Add changelog entry for PR #4424Andrey Andreev1-0/+1
2016-02-05Merge pull request #4424 from jonty-comp/developAndrey Andreev1-3/+16
[ci skip] Fix PHP session_write_close() warning when writing a new session to Redis
2016-02-05Merge pull request #4424 from jonty-comp/developAndrey Andreev1-3/+16
[ci skip] Fix PHP session_write_close() warning when writing a new session to Redis
2016-02-05Fix regression on PHP7 when regenerating the session (#4362)Jonty Sewell1-1/+3
2016-02-05Fix another regression caused by 805eddaefd9503b5dbbd924bd6da66e29c4768f3Andrey Andreev2-3/+23
Also added a unit test for #4431
2016-02-05Fix a regression caused by 805eddaefd9503b5dbbd924bd6da66e29c4768f3Andrey Andreev1-2/+2
2016-02-05Fix #4431Andrey Andreev2-5/+5
2016-02-05Setting the flag to FALSE is unnecessary since it defaults to FALSE, ↵Jonty Sewell1-10/+1
therefore this block of code can be reduced to a single statement Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Set the _key_exists flag to TRUE when the key does in fact exist. Set it to ↵Jonty Sewell1-2/+7
FALSE if the ID is being regenerated, and set it to TRUE once it's been written. Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Add a flag to determine whether the redis key currently exists, and if not, ↵Jonty Sewell1-2/+17
force creation of it at write-time Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-05Revert previous changes - fixing the source of the problem rather than ↵Jonty Sewell1-9/+3
working around it Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-04Merge pull request #4434 from galdiolo/patch-14Andrey Andreev1-1/+1
[ci skip] Fix a comment
2016-02-04[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-04Add batch_size param to insert_batch(), update_batch()Andrey Andreev3-10/+25
This should resolve #42
2016-02-04Fix #4430Andrey Andreev2-0/+7
2016-02-04Fix #4427Andrey Andreev2-22/+24
2016-02-03If attempting to write an empty session to Redis, a key will not actually be ↵Jonty Sewell1-3/+9
created, so when the driver tries to set the expiration timeout on the key, 0 is returned, triggering a warning from session_write_close Signed-off-by: Jonty Sewell <jontysewell@gmail.com>
2016-02-02Merge pull request #4419 from EpicKris/hotfix/database-forge-unique-docAndrey Andreev1-4/+6
[ci skip] Added docs for UNIQUE keys in DBForge
2016-02-02Merge pull request #4419 from EpicKris/hotfix/database-forge-unique-docAndrey Andreev1-4/+6
[ci skip] Added docs for UNIQUE keys in DBForge
2016-02-01Changed Unique ValueKristian Matthews1-1/+1
Changed unique value from false to true. Signed-off-by: Kristian Matthews <kristian.matthews@me.com>
2016-01-31Added Unique Field Attribute DocKristian Matthews1-4/+6
Signed-off-by: Kristian Matthews <kristian.matthews@me.com>
2016-01-30Fix #4415 and add unit tests for https://bugs.php.net/bug.php?id=51192Andrey Andreev3-0/+16
2016-01-29Fix an error from 6af9dd6e24687b6a7b9d14a058a47edcac761e61Andrey Andreev1-1/+1
Related: #4407
2016-01-29Fix #4407Andrey Andreev2-3/+19
2016-01-29Merge pull request #4411 from kenjis/fix-upgrade_300-1Andrey Andreev1-4/+4
[ci skip] Fix formatting of paths in 3.0.0 upgrade instructions
2016-01-29Merge pull request #4411 from kenjis/fix-upgrade_300-1Andrey Andreev1-4/+4
[ci skip] Fix formatting of paths in 3.0.0 upgrade instructions
2016-01-29Fix formatting of pathskenjis1-4/+4
Signed-off-by: Kenji Suzuki <kenji.uui@gmail.com>
2016-01-29Consistent formatting of italicised file paths and inline code referencesSherman K5-23/+23
Signed-off-by: Sherman K <ShrmnK@users.noreply.github.com>
2016-01-29Fix a regression in Form helper caused by ↵Andrey Andreev2-2/+3
0139e6a4a99cbe9b0cc06f394fa12d5691193b72
2016-01-28Merge pull request #4408 from ShrmnK/developAndrey Andreev1-1/+1
[ci skip] Fixed minor typographical error in DCO doc
2016-01-28Merge pull request #4408 from ShrmnK/developAndrey Andreev1-1/+1
[ci skip] Fixed minor typographical error in DCO doc