summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2012-03-11AND -> &&Roger Herbert1-5/+5
2012-03-11refactored to start from latest version, also less diff painRoger Herbert1-15/+20
2012-03-11Revert "Make timespan() helper show fuzzier periods if required"Roger Herbert1-86/+45
This reverts commit 03dbcf0669abdddf6bb459a423b99e7aed73e453.
2012-03-11Make timespan() helper show fuzzier periods if requiredRoger Herbert1-45/+86
2012-03-10Fix incomplete and skipped testTaufan Aditya2-3/+3
2012-03-10Merge pull request #1155 from chrisguiney/developPhil Sturgeon1-1/+10
Allow drivers to be loaded as an array, like models and libraries.
2012-03-10Fixing some spacing.Christopher Guiney1-2/+2
2012-03-10Really fix camelize()Andrey Andreev1-1/+1
2012-03-10Remove PHP 5.1.6-specific codeAndrey Andreev2-33/+2
2012-03-10Fix camelize()Andrey Andreev1-8/+5
2012-03-10Fixed camelize.Phil Sturgeon1-1/+1
2012-03-10Removed quotes from the Content-Type header to support mime-type detection ↵dododedodonl1-1/+1
on android
2012-03-10Allow drivers to be loaded as an array, like models and libraries.Christopher Guiney1-1/+10
2012-03-09Adding Support to Properly Escape Objects that have __toString() magic ↵Joel Kallman1-1/+1
method so that the object can be passed directly as a parameter in a condition without having to manually convert to a string Signed-off-by: Joel Kallman <jkallman@eclarian.com>
2012-03-09Allow arrays to be used for enum/set constraint.Phil Sturgeon1-3/+26
This was working in MySQL but not MySQLi.
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
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
2012-03-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Mike Funk4-20/+34
feature/form_val_config
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 ↵Mike Funk1-3/+5
$this->_config_rules.
2012-03-07Merge pull request #1143 from IT-Can/issue-1141Andrey Andreev1-7/+6
Captcha helper change issue #1141
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-06Move dsn property from the PDO to CI_DB_driver so other DB drivers can use ↵Andrey Andreev2-2/+2
it without declaring it
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 Andreev22-162/+123
2012-03-06Merge pull request #1138 from timw4mail/developAndrey Andreev1-70/+41
Added visibility keywords to DB_driver methods
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-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 ↵SammyK1-2/+2
delete() would throw a syntax error from Postgres.
2012-03-05Fix issue #64Hamza Bhatti1-1/+1
Modify regular expression to be able to handle SQL bracket delimiters for column names that contain special characters or SQL keywords. Signed-off-by: Hamza Bhatti <tiyowan@gmail.com>
2012-03-05Removed oci8-specific stuff from DB_driver.php and added a constructor to ↵Andrey Andreev3-23/+20
DB_result to handle initialization
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