summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source
AgeCommit message (Collapse)AuthorFilesLines
2019-01-08Merge branch '3.1-stable' into developAndrey Andreev3-11/+26
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 Andreev2-2/+16
2019-01-04[ci skip] Add changelog entry for PR #5659Andrey Andreev1-0/+1
2019-01-02Merge pull request #5662 from jim-parry/copyright2019Instructor, BCIT2-3/+3
Update copyright date to 2019
2018-12-27Update copyright date to 2019Jim Parry2-3/+3
2018-12-17[ci skip] Add changelog entry for PR #5652Andrey Andreev1-0/+1
2018-12-17[ci skip] Add changelog entry for PR #5651Andrey Andreev1-0/+1
2018-11-16[ci skip] Fix #5627Andrey Andreev1-0/+1
2018-11-16[ci skip] Fix #5624Andrey Andreev1-0/+1
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-0/+1
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-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-08-22[ci skip] Close #5513Andrey Andreev1-0/+4
2018-08-22[ci skip] Fix #5571Andrey Andreev1-0/+1
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] Changelog entry for #5545, PR #5563Andrey Andreev1-0/+1
2018-08-22[ci skip] Fix #5561Andrey Andreev1-0/+1
2018-08-16Fix grammar mistakes in cli.rstManuel Figueroa1-2/+2
2018-08-15Update changelog.rstAchraf Almouloudi1-1/+1
2018-08-13Update encryption.rstAchraf Almouloudi1-2/+2
2018-07-22[ci skip] Fix #5542Andrey Andreev1-0/+1
2018-07-22[ci skip] Add changelog entry for PR #5531Andrey Andreev1-0/+1
2018-06-15Merge branch '3.1-stable' into developAndrey Andreev1-3/+4
2018-06-15[ci skip] Fix #5526Andrey Andreev1-0/+3
2018-06-12Merge branch '3.1-stable' into developAndrey Andreev5-2/+34
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 Andreev5-3/+24
2018-06-12[ci skip] Prepare 3.1.9 releaseAndrey Andreev3-4/+5
2018-06-12[ci skip] Add a changelog entry for PR #5510Andrey Andreev1-0/+1
2018-06-04[ci skip] Update upgrade instructions for PR #5512Andrey Andreev1-0/+7
2018-06-01[ci skip] Close #5482Andrey Andreev2-7/+21
2018-06-01[ci skip] Add changelog entry for #5516Andrey Andreev1-0/+1
2018-06-01[ci skip] Merge pull request #5503 from mehdibo/http-to-httpsAndrey Andreev33-91/+91
http:// to https://
2018-05-18http:// to https://Mehdi Bounya33-91/+91
2018-05-02Fix sphinx warning messageMaster Yoda1-1/+1
2018-04-24[ci skip] Close #5479Andrey Andreev1-0/+9
2018-04-24Merge branch '3.1-stable' into developAndrey Andreev2-2/+14
2018-04-23[ci skip] Move changelog entry for PR #5391 from 3.1.8 to 3.1.9Andrey Andreev1-1/+4
Apparently I forgot to cherry-pick the actual change into 3.1-stable
2018-04-23[ci skip] Add changelog entry for PR #5471Andrey Andreev1-0/+3
2018-04-14[ci skip] Add changelog entry for #5462 (PR #5464)Andrey Andreev1-0/+1
2018-04-13Fix #5448Andrey Andreev1-0/+5
2018-03-26[ci skip] Alter CI_Upload documentation on client_name (#5446)Andrey Andreev1-1/+1
2018-03-22Merge branch '3.1-stable' into developAndrey Andreev6-7/+41
Conflicts resolved: system/core/CodeIgniter.php system/core/Security.php system/database/DB_query_builder.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-03-22[ci skip] Mark the start of 3.1.9 developmentAndrey Andreev5-3/+25
2018-03-22[ci skip] Prepare 3.1.8 releaseAndrey Andreev3-4/+4
2018-03-15[ci skip] Merge pull request #5437 from MadGuyyy/developAndrey Andreev1-1/+1
Docs spelling fix: utlize -> utilize