summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)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
2012-03-11Make timespan() helper show fuzzier periods if requiredRoger Herbert1-45/+86
2012-03-11Merge pull request #1164 from tiyowan/directory-helper-unit-testsPhil Sturgeon1-0/+42
2012-03-11Add unit tests for directory helperHamza Bhatti1-0/+42
2012-03-11Merge pull request #1161 from toopay/unit-testsPhil Sturgeon8-28/+119
2012-03-10Fix incomplete and skipped testTaufan Aditya8-28/+119
2012-03-10Merge pull request #1155 from chrisguiney/developPhil Sturgeon1-1/+10
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 Andreev3-34/+3
2012-03-10Fix camelize()Andrey Andreev1-8/+5
2012-03-10Fixed camelize.Phil Sturgeon3-7/+7
2012-03-10Merge pull request #1159 from dododedodonl/patch-2Phil Sturgeon1-1/+1
2012-03-10Removed quotes from the Content-Type header to support mime-type detection on...dododedodonl1-1/+1
2012-03-10Merge pull request #1156 from tiyowan/feature/unit-testsPhil Sturgeon3-12/+12
2012-03-10Merge pull request #1157 from toopay/travisPhil Sturgeon1-0/+11
2012-03-10Travis setupTaufan Aditya1-0/+11
2012-03-10Fix test errors in Loader_test.php and URI_test.phpHamza Bhatti3-12/+12
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
2012-03-09Fix issue #1148tiyowan1-23/+41
2012-03-09Adding Support to Properly Escape Objects that have __toString() magic method...Joel Kallman1-1/+1
2012-03-09Merge pull request #1055 from toopay/unit-testsPhil Sturgeon4-11/+37
2012-03-09Allow arrays to be used for enum/set constraint.Phil Sturgeon1-3/+26
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
2012-03-09Merge upstream branchAndrey Andreev56-923/+2338
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 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-07Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into featur...Mike Funk1-5/+11
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