Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2020-07-09 | Merge branch '3.1-stable' into develop | Andrey Andreev | 1 | -0/+6 | |
2020-07-09 | [ci skip] Merge pull request #5970 from sapics/fix/user-guide-url | Andrey Andreev | 1 | -2/+2 | |
Fix user guide url | |||||
2020-06-24 | Fix user guide url | sapics | 1 | -2/+2 | |
Replace from https://codeigniter.com/user_guide/* to https://codeigniter.com/userguide3/* | |||||
2020-03-30 | [ci skip] Update upgrade instructions for 3.1.12 | Andrey Andreev | 1 | -0/+6 | |
2020-01-28 | Merge branch '3.1-stable' into develop | Andrey Andreev | 1 | -0/+6 | |
Conflicts resolved: .travis.yml system/database/DB_query_builder.php system/helpers/captcha_helper.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Zip.php | |||||
2019-10-08 | [ci skip] Add upgrade instructions for user_agents.php | Andrey Andreev | 1 | -0/+6 | |
2019-09-19 | Merge branch '3.1-stable' into develop | Andrey Andreev | 4 | -1/+23 | |
Conflicts resolved: system/core/CodeIgniter.php system/libraries/Cache/drivers/Cache_redis.php system/libraries/Session/drivers/Session_redis_driver.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 | |||||
2019-09-19 | [ci skip] Begin 3.1.12-dev | Andrey Andreev | 3 | -1/+17 | |
2019-08-13 | [ci skip] Add update mimes.php step to 3.1.11 upgrade instructions | Andrey Andreev | 1 | -0/+6 | |
2019-01-16 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -2/+18 | |
2019-01-16 | [ci skip] Start of 3.1.11 development | Andrey Andreev | 3 | -1/+17 | |
2019-01-16 | [ci skip] Prepare for 3.1.10 release | Andrey Andreev | 1 | -1/+1 | |
2019-01-08 | Merge branch '3.1-stable' into develop | Andrey Andreev | 2 | -11/+11 | |
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 | 1 | -0/+11 | |
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-06-12 | Merge branch '3.1-stable' into develop | Andrey Andreev | 4 | -1/+24 | |
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 | 3 | -1/+17 | |
2018-06-12 | [ci skip] Prepare 3.1.9 release | Andrey Andreev | 1 | -1/+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 | 1 | -0/+11 | |
2018-06-01 | [ci skip] Merge pull request #5503 from mehdibo/http-to-https | Andrey Andreev | 3 | -5/+5 | |
http:// to https:// | |||||
2018-05-18 | http:// to https:// | Mehdi Bounya | 3 | -5/+5 | |
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-03-22 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -1/+17 | |
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 | 3 | -1/+17 | |
2018-03-22 | [ci skip] Prepare 3.1.8 release | Andrey Andreev | 1 | -1/+1 | |
2018-01-13 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -1/+17 | |
2018-01-13 | [ci skip] Start 3.1.8-dev | Andrey Andreev | 3 | -1/+17 | |
2018-01-13 | [ci skip] Prepare 3.1.7 release | Andrey Andreev | 1 | -1/+1 | |
2017-11-15 | [ci skip] Update upgrade instructions for 3.2.0 | Andrey Andreev | 1 | -8/+48 | |
2017-11-07 | Merge branch '3.1-stable' into develop | Andrey Andreev | 1 | -0/+13 | |
2017-11-07 | [ci skip] Deprecate extra parameters of the CAPTCHA helper | Andrey Andreev | 1 | -0/+13 | |
2017-10-25 | [ci skip] Merge pull request #5311 from gonzalo-massa/gonzalo-massa-patch-1 | Andrey Andreev | 1 | -0/+3 | |
Download links for versions 2.2.4 to 2.2.6 added to docs | |||||
2017-10-25 | Missing links for CI2 versions on documentation | gonzalo-massa | 1 | -0/+3 | |
Download links for CodeIgniter versions 2.2.4, 2.2.5 and 2.2.6 added to documentation (Installation > Downloading CodeIgniter) | |||||
2017-09-25 | Merge branch '3.1-stable' into develop | Andrey Andreev | 4 | -1/+31 | |
2017-09-25 | [ci skip] Mark the start of 3.1.7-dev | Andrey Andreev | 3 | -1/+17 | |
2017-09-25 | [ci skip] Prepare 3.1.6 release | Andrey Andreev | 1 | -1/+1 | |
2017-09-25 | [ci skip] Add upgrade instructions about the APC deprecation | Andrey Andreev | 1 | -0/+14 | |
2017-06-19 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -1/+17 | |
Conflicts resolved: system/core/CodeIgniter.php tests/codeigniter/libraries/Form_validation_test.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 | |||||
2017-06-19 | [ci skip] Starting 3.1.6-dev | Andrey Andreev | 3 | -1/+17 | |
2017-06-19 | [ci skip] Prepare 3.1.5 release | Andrey Andreev | 1 | -1/+1 | |
2017-03-24 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -1/+17 | |
Conflicts resolved: system/core/CodeIgniter.php system/core/Common.php system/core/Input.php system/helpers/cookie_helper.php tests/codeigniter/helpers/html_helper_test.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 user_guide_src/source/libraries/input.rst | |||||
2017-03-20 | [ci skip] Mark the start of 3.1.5-dev | Andrey Andreev | 3 | -1/+17 | |
2017-03-20 | [ci skip] Prepare 3.1.4 release | Andrey Andreev | 1 | -1/+1 | |
2017-01-17 | [ci skip] Merge pull request #4986 from ka7/feature/spelling | Andrey Andreev | 2 | -2/+2 | |
Spelling fixes in comment blocks and docs | |||||
2017-01-16 | spelling fixes | klemens | 3 | -3/+3 | |
2017-01-10 | Merge branch '3.1-stable' into develop | Andrey Andreev | 3 | -2/+18 | |
Conflicts resolved: system/core/CodeIgniter.php 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/email_helper.php system/helpers/smiley_helper.php system/libraries/Cart.php system/libraries/Email.php system/libraries/Image_lib.php system/libraries/Javascript.php system/libraries/Javascript/Jquery.php system/libraries/Session/SessionHandlerInterface.php user_guide_src/source/changelog.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrading.rst | |||||
2017-01-09 | [ci skip] Mark the beginning of 3.1.4-dev | Andrey Andreev | 3 | -1/+17 | |