summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-03-24Update user_agents.phpMuhammad Umer Farooq1-0/+1
2019-03-20[ci skip] Merge pull request #5724 from kevmo/patch-1Andrey Andreev1-1/+1
Punctuation error fixed in documentation (add apostrophe).
2019-03-20[ci skip] Merge pull request #5724 from kevmo/patch-1Andrey Andreev1-1/+1
Punctuation error fixed in documentation (add apostrophe).
2019-03-16Punctuation error fixed (add apostrophe).kevin moore1-1/+1
2019-03-16[ci skip] Add changelog entry for PR #5708Andrey Andreev1-0/+1
2019-03-16[ci skip] Merge pull request #5708 from mchobbylong/developAndrey Andreev1-5/+7
Resolve race condition in redis driven session key get_lock
2019-03-16[ci skip] Merge pull request #5708 from mchobbylong/developAndrey Andreev1-5/+7
Resolve race condition in redis driven session key get_lock
2019-03-15Remove unnecessary codeMichael Long1-1/+1
2019-03-15Fix code styleMichael Long1-1/+2
2019-03-15Refactor behaviors with different ttl of lock_keyMichael Long1-7/+7
2019-03-13[ci skip] Merge pull request #5716 from achraf52/patch-2Andrey Andreev1-2/+2
Corrected example mistake
2019-03-13[ci skip] Merge pull request #5716 from achraf52/patch-2Andrey Andreev1-2/+2
Corrected example mistake
2019-03-12Corrected example mistakeAchraf Almouloudi1-2/+2
Corrected an example mistake where the input script tries to echo "<p>fieldset content here</p>\n" but the result in "Produces" is "<p>form content here</p>" which is clearly an inconsistant result.
2019-03-02Resolve race condition in redis driven session key get_lockMichael Long1-2/+3
2019-02-26[ci skip] Fix #5701Andrey Andreev2-1/+2
2019-02-14[ci skip] More on #4186Andrey Andreev1-2/+7
2019-02-14[ci skip] Updated QB reference docs for ↵Andrey Andreev1-4/+48
38291e8e44ca5ccc6273d310127db332ace8f84a and #5017
2019-02-14Close #4186, #5631, #5668Andrey Andreev2-15/+11
2019-02-14Merge branch '3.1-stable' into developAndrey Andreev6-8/+20
2019-02-14[ci skip] Polish changes from PR #5692, apply them to pdo/oci and add a ↵Andrey Andreev3-5/+13
changelog entry
2019-02-14[ci skip] Merge pull request #5692 from ytetsuro/patch-2Andrey Andreev1-0/+7
Fixed bug that can not be changed from not null to null in oci.
2019-02-14[ci skip] Merge pull request #5692 from ytetsuro/patch-2Andrey Andreev1-0/+7
Fixed bug that can not be changed from not null to null in oci.
2019-02-12feat: add _null propertyytetsuro1-0/+7
2019-01-25[ci skip] Fix #5681Andrey Andreev4-3/+7
2019-01-16Merge branch '3.1-stable' into developAndrey Andreev4-4/+30
2019-01-16[ci skip] Start of 3.1.11 developmentAndrey Andreev6-4/+27
2019-01-16[ci skip] Prepare for 3.1.10 releaseAndrey Andreev4-6/+9
2019-01-15Merge pull request #5676 from albertleao/albertleao-patch-1Andrey Andreev1-0/+1
Added mobile google bot to user agents
2019-01-15Merge pull request #5676 from albertleao/albertleao-patch-1Andrey Andreev1-0/+1
Added mobile google bot to user agents
2019-01-13Added mobile google bot to user agentsAlbert Leao1-0/+1
2019-01-08Merge branch '3.1-stable' into developAndrey Andreev21-69/+90
Conflicts resolved: system/database/drivers/sqlite/sqlite_driver.php system/database/drivers/sqlite/sqlite_forge.php system/database/drivers/sqlite/sqlite_result.php system/database/drivers/sqlite/sqlite_utility.php system/helpers/captcha_helper.php system/helpers/email_helper.php system/helpers/inflector_helper.php system/helpers/smiley_helper.php system/language/english/form_validation_lang.php system/libraries/Cart.php system/libraries/Form_validation.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php tests/codeigniter/helpers/inflector_helper_test.php user_guide_src/source/helpers/inflector_helper.rst
2019-01-08[ci skip] Close #5482Andrey Andreev4-7/+32
2019-01-08[ci skip] Fix #5674Andrey Andreev1-2/+2
2019-01-04Merge pull request #5661 from sapics/travis-add-php7.3Andrey Andreev1-0/+3
Add PHP 7.3 tests on Travis
2019-01-04Merge pull request #5661 from sapics/travis-add-php7.3Andrey Andreev1-0/+3
Add PHP 7.3 tests on Travis
2019-01-04[ci skip] Add changelog entry for PR #5659Andrey Andreev1-0/+1
2019-01-04Merge pull request #5659 from aanbar/validation_reset_dataAndrey Andreev1-1/+1
Fix #5605
2019-01-04Merge pull request #5659 from aanbar/validation_reset_dataAndrey Andreev1-1/+1
Fix #5605
2019-01-02Merge pull request #5662 from jim-parry/copyright2019Instructor, BCIT176-513/+513
Update copyright date to 2019
2019-01-02[ci skip] Merge pull request #5657 from pawelkg/fix_html_helperAndrey Andreev1-1/+1
Fix html helper
2019-01-01Merge pull request #5662 from jim-parry/copyright2019Instructor, BCIT167-332/+332
Update copyright date to 2019
2018-12-27Update copyright date to 2019Jim Parry167-332/+332
2018-12-27Add PHP 7.3 tests on TravisTakahiro Nishino1-0/+3
2018-12-24if we are not validating an array & the post data contains an array then ↵Ahmad Anbar1-1/+1
nullify the post data for the field
2018-12-17Change comparison operator to assignment, which it should be.Paweł Kłopotek-Główczewski1-1/+1
2018-12-17Merge remote-tracking branch 'codeigniter/develop' into developPaweł Kłopotek-Główczewski1-1/+1
2018-12-17Merge remote-tracking branch 'remotes/CodeIgniter/master' into developPaweł Kłopotek-Główczewski0-0/+0
2018-12-17[ci skip] Add changelog entry for PR #5652Andrey Andreev1-0/+1
2018-12-17[ci skip] Merge pull request #5652 from Khuthaily/patch-1Andrey Andreev1-1/+1
Add px to width and height inline style output of create_captcha()
2018-12-17[ci skip] Merge pull request #5652 from Khuthaily/patch-1Andrey Andreev1-1/+1
Add px to width and height inline style output of create_captcha()