summaryrefslogtreecommitdiffstats
path: root/system/core/CodeIgniter.php
AgeCommit message (Collapse)AuthorFilesLines
2017-06-19Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
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-devAndrey Andreev1-1/+1
2017-06-19[ci skip] Prepare 3.1.5 releaseAndrey Andreev1-1/+1
2017-05-25[ci skip] Fix #5131Andrey Andreev1-1/+1
2017-03-20[ci skip] Mark the start of 3.1.5-devAndrey Andreev1-1/+1
2017-03-20[ci skip] Prepare 3.1.4 releaseAndrey Andreev1-1/+1
2017-01-09[ci skip] Mark the beginning of 3.1.4-devAndrey Andreev1-1/+1
2017-01-09[ci skip] Prepare 3.1.3 releaseAndrey Andreev1-1/+1
2017-01-03Update copyright data to 2017Master Yoda1-2/+2
2016-12-31Update copyright data to 2017Master Yoda1-2/+2
2016-12-14Move csrf_verify() call out of CI_InputAndrey Andreev1-1/+1
2016-12-14Isolate CI_Security instantiation from CI_Input; improve testsAndrey Andreev1-2/+2
2016-12-14Drop all PHP 5.3-related codeAndrey Andreev1-51/+0
2016-12-14Merge branch '3.1-stable' into developAndrey Andreev1-1/+4
2016-12-01[ci skip] Fix #4928Andrey Andreev1-1/+4
2016-10-28Merge branch '3.1-stable' into developAndrey Andreev1-2/+21
Resolved conflicts: system/core/CodeIgniter.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/form_validation.rst
2016-10-28[ci skip] Mark the start of 3.1.3-devAndrey Andreev1-1/+1
2016-10-28[ci skip] Prepare for 3.1.2 releaseAndrey Andreev1-1/+1
2016-10-27Close #4875Andrey Andreev1-1/+20
2016-10-27[ci skip] This is 3.1.2-devAndrey Andreev1-1/+1
2016-10-22[ci skip] Prepare for 3.1.1 releaseAndrey Andreev1-1/+1
2016-08-10Merge branch '3.1-stable' into developAndrey Andreev1-5/+1
2016-07-28[ci skip] Use const keyword to define CI_VERSIONAndrey Andreev1-1/+1
Because.
2016-07-28Remove dead code written for PHP 5.2Andrey Andreev1-5/+1
2016-07-26Merge branch '3.1-stable' into developAndrey Andreev1-1/+1
Conflicts resolved: .travis.yml system/core/CodeIgniter.php system/database/drivers/oci8/oci8_forge.php system/database/drivers/pdo/subdrivers/pdo_oci_forge.php system/helpers/path_helper.php system/libraries/Email.php user_guide_src/source/changelog.rst user_guide_src/source/conf.py user_guide_src/source/contributing/index.rst user_guide_src/source/general/requirements.rst user_guide_src/source/general/styleguide.rst user_guide_src/source/installation/downloads.rst user_guide_src/source/installation/upgrade_310.rst user_guide_src/source/installation/upgrading.rst
2016-07-26[ci skip] Mark the start of 3.1.1 developmentAndrey Andreev1-1/+1
2016-07-26Prepare for 3.1.0 releaseClaudio Galdiolo1-1/+1
2016-03-22[ci skip] Fix CI_VERSIONAndrey Andreev1-1/+1
2016-03-21[ci skip] Mark the start of 3.0.7 developmentAndrey Andreev1-1/+1
2016-03-21[ci skip] Prepare for 3.0.6 releaseAndrey Andreev1-1/+1
2016-03-11[ci skip] Mark the start of 3.0.6 developmentAndrey Andreev1-1/+1
2016-03-11[ci skip] Prepare for 3.0.5 releaseAndrey Andreev1-1/+1
2016-03-07Merge pull request #4472 from vibbow/patch-1Andrey Andreev1-1/+1
[ci skip] Update get_instance() return type in docblock
2016-03-07Update CodeIgniter.phpvibbow1-1/+1
2016-02-20Update CodeIgniter.phpvibbow1-1/+1
Declare get_instance() return type
2016-02-15Pass CI_Config as a parameter to CI_URI constructorAndrey Andreev1-1/+1
2016-01-13[ci skip] Mark the start of 3.0.5 developmentAndrey Andreev1-1/+1
2016-01-11[ci skip] Merge branch '3.0-stable' into developAndrey Andreev1-1/+1
2016-01-11[ci skip] Update ellislab.com links to https tooAndrey Andreev1-1/+1
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev1-2/+2
2016-01-11[ci skip] Update codeigniter.com links to httpsAndrey Andreev1-2/+2
2016-01-11Merge branch '3.0-stable' into developAndrey Andreev1-2/+2
2016-01-11[ci skip] Bump year to 2016Andrey Andreev1-2/+2
2015-11-04[ci skip] Start of 3.0.4 developmentAndrey Andreev1-1/+1
2015-10-31[ci skip] Update changelog, version & upgrade instructionsAndrey Andreev1-1/+1
2015-10-12[ci skip] This is 3.0.3-devAndrey Andreev1-1/+1
2015-10-08[ci skip] Prepare 3.0.2 releaseAndrey Andreev1-1/+1
2015-08-07[ci skip] Start of 3.1.0-devAndrey Andreev1-1/+1
2015-08-07[ci skip] Start of 3.0.2-devAndrey Andreev1-1/+1
2015-04-01[ci skip] Update version numbersAndrey Andreev1-1/+1