summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-03-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into featur...Mike Funk6-23/+50
2012-03-08moved delimiter assigning to constructor, removed extra function.Mike Funk1-24/+10
2012-03-08Fix issue #940Andrey Andreev2-2/+3
2012-03-08Fixed bug with rules not being passed to _config_delimiters or back into $thi...Mike Funk1-3/+5
2012-03-07Merge pull request #1143 from IT-Can/issue-1141Andrey Andreev1-7/+6
2012-03-07Fix issue #501Andrey Andreev2-11/+10
2012-03-07fix + style fixMichiel Vugteveen1-7/+6
2012-03-07Merge pull request #1142 from IT-Can/input-methodAndrey Andreev3-3/+31
2012-03-07userguide fixMichiel Vugteveen1-1/+1
2012-03-07comment fixMichiel Vugteveen1-1/+1
2012-03-07oopsMichiel Vugteveen1-1/+1
2012-03-07removed is_methodMichiel Vugteveen3-39/+11
2012-03-07merged from develop, fixed conflict in user guide.Mike Funk58-1497/+2807
2012-03-07added method() and is_method()Michiel Vugteveen3-3/+59
2012-03-07Update the example on extending libraries with a constructorAndrey Andreev1-5/+11
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-06Just some comment fixes and cleared spacesAndrey Andreev1-33/+27
2012-03-06Property visibility declarations for CI_DB_driverAndrey Andreev1-40/+35
2012-03-06Resolve _protect_identifiers()/protect_identifiers() usage issuesAndrey Andreev23-162/+124
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-06Added visibility keywords to DB_driver methodsTimothy Warren1-70/+38
2012-03-06Merge pull request #1137 from JonoB/developPhil Sturgeon0-0/+0
2012-03-06Changed rewrite_short_tags to have no effect on PHP 5.4Andrey Andreev2-1/+2
2012-03-06Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon4-13/+44
2012-03-06Removed reset_validation() method from run() methodJonoB3-4/+17
2012-03-06Fixed a bug in CI_Session::_unserialize()Andrey Andreev2-4/+7
2012-03-06Fix issue #1125 ... for realAndrey Andreev1-0/+35
2012-03-06Merge pull request #1133 from SammyK/developAndrey Andreev2-9/+2
2012-03-06Updated changelogSammyK1-0/+1
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-05Moved change log entry from 2.1.1 to 3.0.Phil Sturgeon1-1/+1
2012-03-05Merge pull request #1131 from tiyowan/developPhil Sturgeon2-1/+2
2012-03-05Add changelog entry (bug fix for issue #64)Hamza Bhatti1-0/+1
2012-03-05Fix issue #64Hamza Bhatti1-1/+1
2012-03-05Merge pull request #1130 from timw4mail/developAndrey Andreev1-1/+1
2012-03-05Fixed note in documentationTimothy Warren1-1/+1
2012-03-05Add a note to the num_rows() documentationAndrey Andreev1-2/+7
2012-03-05Removed oci8-specific stuff from DB_driver.php and added a constructor to DB_...Andrey Andreev4-23/+22
2012-03-05Partially fix issue #306Andrey Andreev2-4/+4
2012-03-05Fix issue #1125Andrey Andreev1-1/+35
2012-03-05Merge pull request #1087 from narfbg/develop-issue-499Andrey Andreev2-19/+21
2012-03-05Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-issue-499Andrey Andreev11-109/+261
2012-03-05Removed reset_validation() method from run() methodJonoB3-4/+17
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developJohn Crepezzi56-1504/+2940
2012-03-04Fix indentation for changes from pull #1121Andrey Andreev2-34/+33
2012-03-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon3-15/+88
2012-03-04Updated with 2.1-stable.Phil Sturgeon2-19/+17