summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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()
2018-12-17[ci skip] Add changelog entry for PR #5651Andrey Andreev1-0/+1
2018-12-17[ci skip] Merge pull request #5651 from pawelkg/developAndrey Andreev1-1/+1
Test if cache file is writable before unlink it
2018-12-17[ci skip] Merge pull request #5651 from pawelkg/developAndrey Andreev1-1/+1
Test if cache file is writable before unlink it
2018-12-12Fix tabsPaweł Kłopotek-Główczewski1-1/+1
2018-12-09Add px to width and height for inline styleKhaled1-1/+1
The image's width and height are always more than 0; so, adding "px" after the width and height is necessary for HTML validation.
2018-12-09Test if cache file is writable before unlink itPaweł Kłopotek-Główczewski1-1/+1
2018-11-16[ci skip] Fix #5627Andrey Andreev2-1/+2
2018-11-16[ci skip] Fix #5624Andrey Andreev4-27/+10
2018-09-11[ci skip] Fix #5590 (add a default error message for FV valid_base64 rule)Andrey Andreev2-0/+2
2018-09-11[ci skip] Fix #5587Andrey Andreev2-1/+5
2018-09-10[ci skip] Merge pull request #5592 from Tusharmalik/developAndrey Andreev1-3/+3
corrected the serial number of 'source/installation/upgrade_319'
2018-09-10[ci skip] Merge pull request #5592 from Tusharmalik/developAndrey Andreev1-3/+3
corrected the serial number of 'source/installation/upgrade_319'
2018-09-10corrected the serial number of 'source/installation/upgrade_319' and changed ↵tusharmalik1-3/+3
the heading size
2018-09-05[ci skip] Merge pull request #5583 from johndekroon/developAndrey Andreev1-1/+2
Documented undocumented feature
2018-09-05[ci skip] Merge pull request #5583 from johndekroon/developAndrey Andreev1-1/+2
Documented undocumented feature
2018-09-03Documented undocumented featureJohn de Kroon1-1/+2
The 'none' option is a valid option, which was documented in the 2.x documentation. I added it since it is still supported in 3.x.
2018-09-03Merge pull request #1 from bcit-ci/developJohn de Kroon214-496/+675
Update from source
2018-08-22[ci skip] Drop a dead return statementAndrey Andreev1-1/+0
2018-08-22[ci skip] Close #5513Andrey Andreev3-1/+10
2018-08-22[ci skip] Fix #5571Andrey Andreev2-1/+2
2018-08-22[ci skip] Merge pull request #5570 from mfigueroa/patch-1Andrey Andreev1-2/+2
Fix grammar mistakes in cli.rst
2018-08-22[ci skip] Merge pull request #5568 from achraf52/patch-1Andrey Andreev1-1/+1
Corrected wrong "email" library link
2018-08-22[ci skip] Merge pull request #5570 from mfigueroa/patch-1Andrey Andreev1-2/+2
Fix grammar mistakes in cli.rst
2018-08-22[ci skip] Merge pull request #5568 from achraf52/patch-1Andrey Andreev1-1/+1
Corrected wrong "email" library link
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-08 09:00:46 +0100