Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2019-01-08 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -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 #5482 | Andrey Andreev | 2 | -2/+16 | |
2019-01-04 | [ci skip] Add changelog entry for PR #5659 | Andrey Andreev | 1 | -0/+1 | |
2019-01-02 | Merge pull request #5662 from jim-parry/copyright2019 | Instructor, BCIT | 2 | -3/+3 | |
Update copyright date to 2019 | |||||
2018-12-27 | Update copyright date to 2019 | Jim Parry | 2 | -3/+3 | |
2018-12-17 | [ci skip] Add changelog entry for PR #5652 | Andrey Andreev | 1 | -0/+1 | |
2018-12-17 | [ci skip] Add changelog entry for PR #5651 | Andrey Andreev | 1 | -0/+1 | |
2018-11-16 | [ci skip] Fix #5627 | Andrey Andreev | 1 | -0/+1 | |
2018-11-16 | [ci skip] Fix #5624 | Andrey Andreev | 1 | -0/+1 | |
2018-09-11 | [ci skip] Fix #5590 (add a default error message for FV valid_base64 rule) | Andrey Andreev | 1 | -0/+1 | |
2018-09-11 | [ci skip] Fix #5587 | Andrey Andreev | 1 | -0/+1 | |
2018-09-10 | [ci skip] Merge pull request #5592 from Tusharmalik/develop | Andrey Andreev | 1 | -3/+3 | |
corrected the serial number of 'source/installation/upgrade_319' | |||||
2018-09-10 | corrected the serial number of 'source/installation/upgrade_319' and changed ↵ | tusharmalik | 1 | -3/+3 | |
the heading size | |||||
2018-09-05 | [ci skip] Merge pull request #5583 from johndekroon/develop | Andrey Andreev | 1 | -1/+2 | |
Documented undocumented feature | |||||
2018-09-03 | Documented undocumented feature | John de Kroon | 1 | -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 #5513 | Andrey Andreev | 1 | -0/+4 | |
2018-08-22 | [ci skip] Fix #5571 | Andrey Andreev | 1 | -0/+1 | |
2018-08-22 | [ci skip] Merge pull request #5570 from mfigueroa/patch-1 | Andrey Andreev | 1 | -2/+2 | |
Fix grammar mistakes in cli.rst | |||||
2018-08-22 | [ci skip] Merge pull request #5568 from achraf52/patch-1 | Andrey Andreev | 1 | -1/+1 | |
Corrected wrong "email" library link | |||||
2018-08-22 | [ci skip] Merge pull request #5570 from mfigueroa/patch-1 | Andrey Andreev | 1 | -2/+2 | |
Fix grammar mistakes in cli.rst | |||||
2018-08-22 | [ci skip] Changelog entry for #5545, PR #5563 | Andrey Andreev | 1 | -0/+1 | |
2018-08-22 | [ci skip] Fix #5561 | Andrey Andreev | 1 | -0/+1 | |
2018-08-16 | Fix grammar mistakes in cli.rst | Manuel Figueroa | 1 | -2/+2 | |
2018-08-15 | Update changelog.rst | Achraf Almouloudi | 1 | -1/+1 | |
2018-08-13 | Update encryption.rst | Achraf Almouloudi | 1 | -2/+2 | |
2018-07-22 | [ci skip] Fix #5542 | Andrey Andreev | 1 | -0/+1 | |
2018-07-22 | [ci skip] Add changelog entry for PR #5531 | Andrey Andreev | 1 | -0/+1 | |
2018-06-15 | Merge branch '3.1-stable' into develop | Andrey Andreev | 1 | -3/+4 | |
2018-06-15 | [ci skip] Fix #5526 | Andrey Andreev | 1 | -0/+3 | |
2018-06-12 | Merge branch '3.1-stable' into develop | Andrey Andreev | 5 | -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 development | Andrey Andreev | 5 | -3/+24 | |
2018-06-12 | [ci skip] Prepare 3.1.9 release | Andrey Andreev | 3 | -4/+5 | |
2018-06-12 | [ci skip] Add a changelog entry for PR #5510 | Andrey Andreev | 1 | -0/+1 | |
2018-06-04 | [ci skip] Update upgrade instructions for PR #5512 | Andrey Andreev | 1 | -0/+7 | |
2018-06-01 | [ci skip] Close #5482 | Andrey Andreev | 2 | -7/+21 | |
2018-06-01 | [ci skip] Add changelog entry for #5516 | Andrey Andreev | 1 | -0/+1 | |
2018-06-01 | [ci skip] Merge pull request #5503 from mehdibo/http-to-https | Andrey Andreev | 33 | -91/+91 | |
http:// to https:// | |||||
2018-05-18 | http:// to https:// | Mehdi Bounya | 33 | -91/+91 | |
2018-05-02 | Fix sphinx warning message | Master Yoda | 1 | -1/+1 | |
2018-04-24 | [ci skip] Close #5479 | Andrey Andreev | 1 | -0/+9 | |
2018-04-24 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -2/+14 | |
2018-04-23 | [ci skip] Move changelog entry for PR #5391 from 3.1.8 to 3.1.9 | Andrey Andreev | 1 | -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 #5471 | Andrey Andreev | 1 | -0/+3 | |
2018-04-14 | [ci skip] Add changelog entry for #5462 (PR #5464) | Andrey Andreev | 1 | -0/+1 | |
2018-04-13 | Fix #5448 | Andrey Andreev | 1 | -0/+5 | |
2018-03-26 | [ci skip] Alter CI_Upload documentation on client_name (#5446) | Andrey Andreev | 1 | -1/+1 | |
2018-03-22 | Merge branch '3.1-stable' into develop | Andrey Andreev | 6 | -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 development | Andrey Andreev | 5 | -3/+25 | |
2018-03-22 | [ci skip] Prepare 3.1.8 release | Andrey Andreev | 3 | -4/+4 | |
2018-03-15 | [ci skip] Merge pull request #5437 from MadGuyyy/develop | Andrey Andreev | 1 | -1/+1 | |
Docs spelling fix: utlize -> utilize |