summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-03-12Merge upstream branchAndrey Andreev1-2/+2
2012-03-12Update the list of supported databasesAndrey Andreev1-2/+2
2012-03-12Postgres to PostgreSQLAndrey Andreev2-8/+8
2012-03-12Merge upstream branchAndrey Andreev9-43/+72
2012-03-12Just some cleanup in the Table classAndrey Andreev1-7/+3
2012-03-12Merge pull request #1078 from mikedfunk/feature/table_configAndrey Andreev3-1/+18
Ability to use a configuration file for the Table class
2012-03-12Remove collation parameter from db_set_charset() (no longer needed)Andrey Andreev4-8/+8
2012-03-12merged latest develop branch.Mike Funk160-269/+335
2012-03-12Changed space to tab in docblock.Mike Funk1-1/+1
2012-03-12Postgre to PostgresAndrey Andreev1-1/+1
2012-03-12Merge pull request #1079 from mikedfunk/feature/form_val_configAndrey Andreev3-1/+20
Feature/form val config error_prefix and error_suffix
2012-03-12Fix escape_str() and change _prep_query() to just return the queryAndrey Andreev1-4/+3
2012-03-12Add missing semicolonsAndrey Andreev2-2/+2
2012-03-12Remove usage of SET NAMES and the deprecated mysql_escape_string() from ↵Andrey Andreev2-30/+4
MySQL/MySQLi drivers
2012-03-12Merge pull request #1173 from nihaopaul/developAndrey Andreev2-0/+23
form_dropdown() will now also take an array for unity with other form he...
2012-03-12defaults for the functionnihaopaul1-3/+3
2012-03-12test if isset(['name']) is actually set instead of assuming it to benihaopaul1-1/+1
2012-03-12code readability improvementsnihaopaul1-1/+5
2012-03-12form_dropdown() will now also take an array for unity with other form ↵nihaopaul1-3/+3
helpers., false => FALSE and the options check fixed
2012-03-12form_dropdown() will now also take an array for unity with other form ↵nihaopaul1-1/+1
helpers., codestyle cleanup only
2012-03-12form_dropdown() will now also take an array for unity with other form ↵nihaopaul1-1/+2
helpers., codestyle cleanup only
2012-03-12form_dropdown() will now also take an array for unity with other form helpers.nihaopaul2-0/+18
2012-03-12Fix conflicts (or at least trying to do so)Andrey Andreev0-0/+0
2012-03-12Fix _limit()Andrey Andreev1-1/+1
2012-03-12Merge upstream branchAndrey Andreev158-215/+238
2012-03-12Merge changes from upstream and fix _limit()Andrey Andreev159-215/+238
2012-03-11Fix erroneus regex from previous commitAndrey Andreev1-1/+1
2012-03-11Added an Android <= 2.1 specific check to force_download()Andrey Andreev2-7/+20
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 Andreev3-34/+3
2012-03-10Fix camelize()Andrey Andreev1-8/+5
2012-03-10Merge pull request #1159 from dododedodonl/patch-2Phil Sturgeon1-1/+1
Removed quotes from the Content-Type header...
2012-03-10Removed quotes from the Content-Type header to support mime-type detection ↵dododedodonl1-1/+1
on android
2012-03-10Merge pull request #1157 from toopay/travisPhil Sturgeon1-0/+11
Travis setup
2012-03-10Travis setupTaufan Aditya1-0/+11
2012-03-10Allow drivers to be loaded as an array, like models and libraries.Christopher Guiney1-1/+10
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-09_protect_identifiers() to protect_identifier()Andrey Andreev1-2/+2
2012-03-09Merge upstream branchAndrey Andreev41-492/+685
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