summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon27-324/+259
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon130-130/+130
2012-03-09Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driverAndrey Andreev4-20/+34
2012-03-09Merge upstream branchAndrey Andreev42-774/+2080
2012-03-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into featur...Mike Funk4-20/+34
2012-03-08moved delimiter assigning to constructor, removed extra function.Mike Funk1-24/+10
2012-03-08Fix issue #940Andrey Andreev1-2/+2
2012-03-08Fixed bug with rules not being passed to _config_delimiters or back into $thi...Mike Funk1-3/+5
2012-03-08Merge upstream branchAndrey Andreev86-4677/+4863
2012-03-07Merge pull request #1143 from IT-Can/issue-1141Andrey Andreev1-7/+6
2012-03-07Fix issue #501Andrey Andreev1-11/+9
2012-03-07fix + style fixMichiel Vugteveen1-7/+6
2012-03-07comment fixMichiel Vugteveen1-1/+1
2012-03-07oopsMichiel Vugteveen1-1/+1
2012-03-07removed is_methodMichiel Vugteveen1-18/+6
2012-03-07merged latest develop branch, fixed changelog conflict.Mike Funk49-1448/+2610
2012-03-07merged from develop, fixed conflict in user guide.Mike Funk49-1448/+2610
2012-03-07added method() and is_method()Michiel Vugteveen1-0/+29
2012-03-06updated and merged user guide with develop branch.Mike Funk49-1459/+2667
2012-03-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driverAndrey Andreev1-2/+1
2012-03-06Move dsn property from the PDO to CI_DB_driver so other DB drivers can use it...Andrey Andreev2-2/+2
2012-03-06Merge upstream branchAndrey Andreev1-3/+5
2012-03-06Revert a comment changeAndrey Andreev1-1/+1
2012-03-06Just some comment fixes and cleared spacesAndrey Andreev1-33/+27
2012-03-06Property visibility declarations for CI_DB_driverAndrey Andreev1-40/+35
2012-03-06Merge upstream branchAndrey Andreev22-177/+132
2012-03-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev22-162/+123
2012-03-06Merge pull request #1138 from timw4mail/developAndrey Andreev1-70/+41
2012-03-06Made _protect_identifiers publicTimothy Warren1-1/+4
2012-03-06Made protect_identifiers publicTimothy Warren1-1/+1
2012-03-06Merge upstream branchAndrey Andreev17-147/+315
2012-03-06Added visibility keywords to DB_driver methodsTimothy Warren1-70/+38
2012-03-06Changed rewrite_short_tags to have no effect on PHP 5.4Andrey Andreev1-1/+1
2012-03-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon3-13/+42
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-06Fix issue #1125 ... for realAndrey Andreev1-0/+35
2012-03-05Removed order_by() from PostgreSQL driver too.SammyK1-9/+1
2012-03-05Fixed bug for PostgreSQL driver where setting a limit() on update() or delete...SammyK1-2/+2
2012-03-05Fix issue #64Hamza Bhatti1-1/+1
2012-03-05Removed oci8-specific stuff from DB_driver.php and added a constructor to DB_...Andrey Andreev3-23/+20
2012-03-05Partially fix issue #306Andrey Andreev1-4/+3
2012-03-05Fix issue #1125Andrey Andreev1-1/+35
2012-03-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-issue-499Andrey Andreev8-78/+191
2012-03-04Merged develop and fixed conflicts.Phil Sturgeon132-6247/+5666
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developJohn Crepezzi44-1488/+2793
2012-03-04Fix indentation for changes from pull #1121Andrey Andreev1-25/+24
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-12/+55
2012-03-04Updated with 2.1-stable.Phil Sturgeon1-19/+15
2012-03-04Merge pull request #1116 from tubalmartin/helpers|url|2.1-stablePhil Sturgeon1-20/+16