summaryrefslogtreecommitdiffstats
path: root/system/libraries
AgeCommit message (Expand)AuthorFilesLines
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-11/+9
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon30-30/+30
2012-03-09Merge upstream branchAndrey Andreev3-13/+98
2012-03-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into featur...Mike Funk1-11/+9
2012-03-08moved delimiter assigning to constructor, removed extra function.Mike Funk1-24/+10
2012-03-08Fixed bug with rules not being passed to _config_delimiters or back into $thi...Mike Funk1-3/+5
2012-03-07Fix issue #501Andrey Andreev1-11/+9
2012-03-07merged latest develop branch, fixed changelog conflict.Mike Funk6-290/+354
2012-03-07merged from develop, fixed conflict in user guide.Mike Funk6-290/+354
2012-03-06updated and merged user guide with develop branch.Mike Funk6-290/+354
2012-03-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-4/+6
2012-03-06Removed reset_validation() method from run() methodJonoB1-4/+5
2012-03-06Fixed a bug in CI_Session::_unserialize()Andrey Andreev1-4/+6
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developJohn Crepezzi8-540/+497
2012-03-04Fix indentation for changes from pull #1121Andrey Andreev1-25/+24
2012-03-04Allow users to specify an array for validation, instead of alway using the $_...JonoB1-12/+55
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon5-222/+162
2012-03-04Merged conflicts.Phil Sturgeon1-1/+1
2012-03-03Fixed a bug - CI_Upload::_file_mime_type() could've failed if popen() is used...tubalmartin1-1/+1
2012-03-03Merge upstream branchAndrey Andreev2-3/+6
2012-03-03Updated tabs, reinserted license, and fixed logic on get()Mike Davies1-25/+37
2012-03-02Merge pull request #1107 from diogoosorio/developAndrey Andreev1-2/+5
2012-03-02Made the code more readable, updated the changelog.Diogo Osório1-1/+1
2012-03-02#1080 - Check if the SMTP connection and authentication were successfull.Diogo Osório1-2/+5
2012-03-02Limit db session select to single rowTimothy Warren1-1/+1
2012-03-02Merge upstream branchAndrey Andreev1-0/+14
2012-03-02updated error_array #565Michiel Vugteveen1-0/+14
2012-03-02Merge upstream branchAndrey Andreev1-7/+5
2012-03-02Fix issue #803 (Profiler library didn't handle objects properly)Andrey Andreev1-7/+5
2012-03-01Merge upstream branchAndrey Andreev2-212/+137
2012-03-01Fix issue #153 (E_NOTICE generated by getimagesize())Andrey Andreev1-9/+7
2012-03-01Some other minor improvements to the Email libraryAndrey Andreev1-81/+67
2012-03-01Switch ANDs to &&, || to OR in the Email classAndrey Andreev1-14/+13
2012-03-01Remove access lines and fix method description blocks in the Email classAndrey Andreev1-84/+25
2012-03-01Switch private properties in the Email class to protectedAndrey Andreev1-24/+25
2012-02-29Added support for Wincache when running CI on Windows boxesMike Davies2-1/+156
2012-02-29Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-zipAndrey Andreev31-2396/+1458
2012-02-29Minor clean-upAndrey Andreev1-3/+2
2012-02-29removed double slashMichiel Vugteveen1-1/+1
2012-02-29Merge remote-tracking branch 'upstream/develop' into develop-issue-863Andrey Andreev2-24/+81
2012-02-29Merged in 2.1-stable changes.Phil Sturgeon2-24/+81
2012-02-28tab separation in docblock.Mike Funk1-1/+1
2012-02-28tab separator in _config_delimiters dockblock.Mike Funk1-1/+1
2012-02-28using tabs as @item seperators in docblocks.Mike Funk1-2/+2
2012-02-28fixed some mismatched brackets.Mike Funk1-4/+4
2012-02-28changed _config_delimiters() to protected.Mike Funk1-1/+1
2012-02-28Merge upstream branchAndrey Andreev1-4/+4
2012-02-28Replace AND with &&Andrey Andreev1-1/+1
2012-02-28Fix issue #177Andrey Andreev1-28/+14
2012-02-24added config process method checking for delimiter values, updated changelog ...Mike Funk1-0/+24