summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-03-10Removed quotes from the Content-Type header to support mime-type detection ↵dododedodonl1-1/+1
on android
2012-03-10Merge pull request #1156 from tiyowan/feature/unit-testsPhil Sturgeon3-12/+12
Fix test errors in Loader_test.php and URI_test.php
2012-03-10Merge pull request #1157 from toopay/travisPhil Sturgeon1-0/+11
Travis setup
2012-03-10Travis setupTaufan Aditya1-0/+11
2012-03-10Fix test errors in Loader_test.php and URI_test.phpHamza Bhatti3-12/+12
Change exceptions from Exception to RuntimeException since PHPUnit 3.6 doesn't like you to expect generic exceptions. The error it gives is: InvalidArgumentException: You must not expect the generic exception class travis-ci.org/#!/tiyowan/CodeIgniter/builds/832518 This issue addressed by using exceptions that are more specific.
2012-03-10Allow drivers to be loaded as an array, like models and libraries.Christopher Guiney1-1/+10
2012-03-10Merge pull request #1153 from tiyowan/feature/unit-testsPhil Sturgeon1-23/+41
Fix issue #1148
2012-03-09Fix issue #1148tiyowan1-23/+41
Rewrote tests to use reflection to access protected/private functions of Table class. This fixes fatal errors that prevent the test suite from executing other tests. Signed-off-by: tiyowan <tiyowan@gmail.com>
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-09Merge pull request #1055 from toopay/unit-testsPhil Sturgeon4-11/+37
Unit tests
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 Sturgeon31-333/+289
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon157-160/+161
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-09Add tiyowan suggestion #1147Taufan Aditya2-10/+13
2012-03-09Merged with latest commitTaufan Aditya179-6688/+6143
2012-03-08Fix documentation entry for the decimal form validation rule (issue #1149)Andrey Andreev1-1/+1
2012-03-08Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Mike Funk6-23/+50
feature/form_val_config
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 ↵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 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
Added method() #783
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-07Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into ↵Mike Funk1-5/+11
feature/all_flashdata
2012-03-07merged latest develop branch, fixed changelog conflict.Mike Funk58-1497/+2807
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-06updated and merged user guide with develop branch.Mike Funk58-1503/+2860
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 Andreev23-162/+124
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-06Merge pull request #1137 from JonoB/developPhil Sturgeon0-0/+0
Removed reset_validation() method from run() method
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
Fixed bug for PostgreSQL driver where limit() & order_by() throws error
2012-03-06Updated changelogSammyK1-0/+1