summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-03-11Merge branch '3.0-stable' into developAndrey Andreev24-125/+290
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
2016-03-11[ci skip] Mark the start of 3.0.6 developmentAndrey Andreev6-4/+26
2016-03-11[ci skip] Fix a wrong page link in the changelogAndrey Andreev1-1/+1
2016-03-11[ci skip] Prepare for 3.0.5 releaseAndrey Andreev4-5/+5
2016-03-11Add a defensive check in CI_Loader::_ci_load()Andrey Andreev2-0/+9
Prevents possible internal variable overwrites when loading views
2016-03-11Fix a number of CI_Cache bugsAndrey Andreev5-16/+47
Fixes #4277 Supersedes #4474 Really fixes #4066
2016-03-11Revert an unintended change from a027a7fd0d770cec0d71e888d8b6f4aa1568ce9fAndrey Andreev1-1/+1
2016-03-10Fix a logical error from last commitAndrey Andreev1-1/+1
2016-03-10Improve ext/session error messagesAndrey Andreev5-32/+55
2016-03-07Merge pull request #4472 from vibbow/patch-1Andrey Andreev1-1/+1
[ci skip] Update get_instance() return type in docblock
2016-03-07Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey 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-03-07[ci skip] Add random_compat as a suggested package in composer.jsonAndrey Andreev1-0/+3
2016-03-07[ci skip] Fix Profiler not applying htmlspecialchars() to all inputsAndrey Andreev2-26/+19
2016-03-07Fix #4475Andrey Andreev3-3/+13
2016-03-07[ci skip] Fix transactions for the ibase driverAndrey Andreev2-1/+2
Reported via the forums: http://forum.codeigniter.com/thread-64559.html
2016-03-07Merge pull request #4506 from mixinix/patch-1Andrey Andreev1-4/+4
[ci skip] Update Calendar docs
2016-03-07Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev1-4/+4
2016-03-07Merge pull request #4506 from mixinix/patch-1Andrey Andreev1-4/+4
[ci skip] Update Calendar docs
2016-03-06Update calendar.rstmixinix1-4/+4
2016-03-04Merge pull request #4502 from brutalcrozt/developAndrey Andreev1-1/+2
[ci skip] Update image_lib docs
2016-03-04Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev7-9/+10
2016-03-04Merge pull request #4502 from brutalcrozt/developAndrey Andreev1-1/+2
[ci skip] Update image_lib docs
2016-03-02Doc , update image_lib.rstAdi Prasetyo1-1/+2
> at *the* same level *as*
2016-03-01[ci skip] Move flock() call in CI_Log::write_log() immediately after fopen()Andrey Andreev1-2/+2
2016-02-29[ci skip] Add changelog entries for PR #4491 and ↵Andrey Andreev1-0/+2
215922144082eb4b613e2418ba552776d23ea1db
2016-02-29[ci skip] Apply #4491 to Memcached driverAndrey Andreev1-1/+1
2016-02-29Merge pull request #4491 from roastduck/developAndrey Andreev1-1/+1
[ci skip] Clean current lock key on close() in redis session driver
2016-02-29Merge pull request #4491 from roastduck/developAndrey Andreev1-1/+1
[ci skip] Clean current lock key on close() in redis session driver
2016-02-29fix typo__RD1-1/+1
2016-02-29delete lock directly -> call _release_lock()__RD1-2/+1
2016-02-29Merge pull request #4495 from galdiolo/patch-15Andrey Andreev1-1/+1
[ci skip] Fix a comment typo
2016-02-29Merge pull request #4495 from galdiolo/patch-15Andrey Andreev1-1/+1
[ci skip] Fix a comment typo
2016-02-29[ci skip] fix commentClaudio Galdiolo1-1/+1
2016-02-28clean current lock key in redis session driverroastduck1-0/+1
set $this->_lock_key to NULL after close Signed-off-by: roastduck <beantang.tang@gmail.com>
2016-02-27Merge pull request #4489 from sprakashtd/developAndrey Andreev4-6/+6
Downgraded log level for some pesky messages to INFO
2016-02-27Downgraded log level for some pesky messages to INFOsprakash44-6/+6
2016-02-24Merge pull request #4480 from versalle88/developAndrey Andreev2-2/+2
Changed class_exists() calls to ignore __autoload()
2016-02-24Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into developAndrey Andreev2-2/+2
2016-02-24Merge pull request #4480 from versalle88/developAndrey Andreev2-2/+2
Changed class_exists() calls to ignore __autoload()
2016-02-23Fixed typoversalle881-1/+1
2016-02-23Removedversalle881-1/+1
2016-02-23Changed calls to class_exists to ignore __autoload() to match other callsversalle881-1/+1
2016-02-23Changed calls to class_exists to ignore __autoload() to match other callsversalle882-2/+2
2016-02-20Update CodeIgniter.phpvibbow1-1/+1
Declare get_instance() return type
2016-02-17[ci skip] Update docs to reflect escape_like_str() usage with ESCAPE '\!'Andrey Andreev2-1/+14
Closes #4462
2016-02-15[ci skip] Add changelog entry for PR #4453Andrey Andreev1-0/+4
2016-02-15[ci skip] Polish changes from PR #4453Andrey Andreev1-2/+3
2016-02-15Merge pull request #4453 from EpicKris/feature/Autoload-Driver-Object-NameAndrey Andreev2-6/+15
Autoload Driver Object Names