summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2019-01-08Merge branch '3.1-stable' into developAndrey Andreev16-56/+62
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 Andreev1-4/+15
2019-01-08[ci skip] Fix #5674Andrey Andreev1-2/+2
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, BCIT172-506/+506
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
2018-12-27Update copyright date to 2019Jim Parry163-326/+326
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-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] 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 Andreev1-1/+1
2018-11-16[ci skip] Fix #5624Andrey Andreev3-27/+9
2018-09-11[ci skip] Fix #5590 (add a default error message for FV valid_base64 rule)Andrey Andreev1-0/+1
2018-09-11[ci skip] Fix #5587Andrey Andreev1-1/+4
2018-08-22[ci skip] Drop a dead return statementAndrey Andreev1-1/+0
2018-08-22[ci skip] Close #5513Andrey Andreev1-0/+5
2018-08-22[ci skip] Fix #5571Andrey Andreev1-1/+1
2018-08-22[ci skip] Add exceptions for 2 error cases in FV set_rules()Andrey Andreev1-1/+2
2018-08-22[ci skip] Changelog entry for #5545, PR #5563Andrey Andreev1-1/+1
2018-08-22Merge pull request #5563 from it-can/fix5545Andrey Andreev5-6/+8
fix #5545
2018-08-22[ci skip] Fix #5561Andrey Andreev1-16/+18
2018-08-07fix #5545Michiel Vugteveen5-6/+8
2018-07-26More on #5542Andrey Andreev1-1/+1
2018-07-22[ci skip] Fix #5542Andrey Andreev2-2/+2
2018-06-26Using `isset`.tianhe19861-2/+2
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-06-22Using null comparison instead of isset().tianhe19861-6/+4
Signed-off-by: tianhe1986 <w1s2j3229@163.com>
2018-06-15Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
2018-06-15[ci skip] Fix #5526Andrey Andreev1-1/+1
2018-06-12Merge branch '3.1-stable' into developAndrey Andreev6-1/+99
Conflicts resolved: system/core/CodeIgniter.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst
2018-06-12[ci skip] Mark the start of 3.1.10 developmentAndrey Andreev1-1/+1
2018-06-12[ci skip] Prepare 3.1.9 releaseAndrey Andreev6-1/+99
2018-06-12Merge pull request #5510 from johndekroon/developAndrey Andreev2-3/+15
Only use the output of idn_to_ascii() if it worked properly
2018-06-12[ci skip] Correct an erroneous variable name from PR #5510Andrey Andreev1-1/+1
2018-06-12Merge pull request #5510 from johndekroon/developAndrey Andreev2-3/+15
Only use the output of idn_to_ascii() if it worked properly
2018-06-11Fixing codestyleJohn de Kroon2-3/+3
2018-06-01[ci skip] Close #5482Andrey Andreev1-4/+4
2018-06-01Merge pull request #5516 from wpyh/patch-1Andrey Andreev1-3/+3
Use Config::base_url() properly
2018-06-01Merge pull request #5516 from wpyh/patch-1Andrey Andreev1-3/+3
Use Config::base_url() properly
2018-05-30Use Config::base_url() properlyWilliam Poetra Yoga1-3/+3
Using the Config::slash_item() method, we get double forward slashes. For example, base_url = 'http://localhost:8080/' and asset is '/assets/my_asset.css', then the generated URL would be 'http://localhost:8080//assets/my_asset.css'. This patch fixes that, so the generated URL would be 'http://localhost:8080/assets/my_asset.css'. There is actually already an analog example in the case if index_page === TRUE, where the site_url() function is used.
2018-05-25Only use the output of idn_to_ascii() if it worked properlyJohn de Kroon2-3/+15
2018-05-18http:// to https://Mehdi Bounya163-354/+354
2018-05-01[ci skip] Close #5487Andrey Andreev1-1/+1
2018-04-24[ci skip] Close #5479Andrey Andreev1-3/+3
2018-04-24Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-05 15:57:56 +0100