summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Expand)AuthorFilesLines
2012-05-21Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into errorsTimothy Warren1-2/+2
2012-05-17Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon15-131/+134
2012-05-17Fixed conflicts from merging in 2.1.1.Phil Sturgeon1-1/+1
2012-05-17Added upgrade for 2.1.1 and updated version.Phil Sturgeon1-1/+1
2012-05-17merge upstreamTimothy Warren15-131/+134
2012-05-17Cleanup the core classesAndrey Andreev15-132/+135
2012-05-17Check cookie against md5 regex.Alexander Hofstede1-1/+1
2012-05-14Move errors to views folderTimothy Warren1-2/+2
2012-05-07Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developWes Baker16-427/+494
2012-05-02Reverted rui_string change.Phil Sturgeon2-6/+3
2012-04-30Reverted recent commit, cookie_prefix was breaking things.Phil Sturgeon1-1/+0
2012-04-28Important spelling fix to CodeIgniter.php fileChris Berthe1-1/+1
2012-04-27Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-...Timothy Warren2-11/+16
2012-04-27Merge pull request #1298 from zivyuan/patch-1Phil Sturgeon1-0/+1
2012-04-27Merge upstream branchAndrey Andreev16-508/+588
2012-04-27Update system/core/Input.php ziv1-0/+1
2012-04-27Fix Config.php and partially fix Image_lib.phpTimothy Warren1-7/+0
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren3-10/+13
2012-04-26Merge pull request #1262 from Korri/developPhil Sturgeon1-2/+2
2012-04-26Fixed conflicts.Phil Sturgeon4-28/+25
2012-04-26Fixed issue #122 - ruri_string() in subdirs.Phil Sturgeon2-3/+6
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow16-263/+272
2012-04-24Updating XSS cleaning to better handle base64 encoded attributes.Wes Baker1-6/+8
2012-04-23Use tabs to separate class propertiesTimothy Warren14-55/+54
2012-04-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patchTimothy Warren2-14/+11
2012-04-23Merge upstreamTimothy Warren1-3/+1
2012-04-23Merge pull request #1271 from dixy/develop-microtimeAndrey Andreev1-7/+4
2012-04-23Fix issue #1265Andrey Andreev1-8/+8
2012-04-21Use parameter 'get_as_float' of microtime()dixy1-7/+4
2012-04-19Fix syntax errorTimothy Warren1-1/+1
2012-04-19Additional formatting fixesTimothy Warren13-204/+243
2012-04-19Normalize comments in core filesTimothy Warren11-184/+217
2012-04-17Adding a package adds configuration folder to the end of the list.Korri1-2/+2
2012-04-13Switch erroneously declared protected properties in Output class to publicAndrey Andreev1-7/+7
2012-04-03Some improvements to the additions from pull #1234Andrey Andreev1-7/+7
2012-04-02The current name is too wide change to get_content_type()consistent with set_...Songpol Sripaoeiam1-1/+1
2012-04-01Fix style codingSongpol Sripao-eiam1-1/+2
2012-04-01bracket on a new lineSongpol Sripaoeiam1-5/+6
2012-04-01add function get_current_content_type to output class and user manual librarySongpol Sripaoeiam1-0/+18
2012-03-28Fix a CI_Loader::_ci_load_class() bugAndrey Andreev1-1/+1
2012-03-26Some style adjustments and fixed comments in the Loader classAndrey Andreev1-30/+29
2012-03-26Some style adjustments and fixed comments in Router and Output classesAndrey Andreev2-28/+24
2012-03-26Remove access description lines and fix comments in system/core/Common.phpAndrey Andreev1-94/+96
2012-03-26Make _initialize() a constructor and rename _call_hook() to call_hook in the ...Andrey Andreev2-27/+19
2012-03-26Add visibility declarations where they remain missingAndrey Andreev1-4/+2
2012-03-20Merge upstream branchAndrey Andreev16-59/+64
2012-03-19Merge pull request #1182 from freewil/cookies-httponlyAndrey Andreev2-5/+18
2012-03-18add support for httponly cookiesfreewil2-5/+18
2012-03-14Merged unit test progress.Phil Sturgeon3-34/+12
2012-03-14Merge branch 'feature/unit-tests' into developPhil Sturgeon2-3/+17