summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2012-02-01Merge remote-tracking branch 'upstream/develop' into develop-db-sqlite3Andrey Andreev2-1/+2
2012-02-01Merge pull request #1006 from duggan/patch-1Phil Sturgeon2-1/+2
2012-02-01Add note about HTTPS detection change to 3.0 changelogRoss Duggan1-0/+1
2012-01-31HTTPS detection fixRoss Duggan1-1/+1
2012-01-27Merge upstream branchAndrey Andreev16-824/+473
2012-01-27Merge pull request #992 from narfbg/develop-db-mysqliPhil Sturgeon6-354/+197
2012-01-27Switch _process_fields() from private to protectedAndrey Andreev1-1/+1
2012-01-27Add PHP version check in db_pconnect()Andrey Andreev2-1/+7
2012-01-27Update the changelogAndrey Andreev1-0/+2
2012-01-27Improve the MySQLi database driverAndrey Andreev5-354/+189
2012-01-27Merge pull request #985 from narfbg/develop-db-mysqlPhil Sturgeon4-375/+205
2012-01-27Merge pull request #987 from timw4mail/developPhil Sturgeon1-0/+16
2012-01-27Added try catch example in style guideTimothy Warren1-0/+16
2012-01-26Improve the MySQL database driverAndrey Andreev4-375/+205
2012-01-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren3-79/+44
2012-01-26Another minor improvementAndrey Andreev1-4/+4
2012-01-26Replace array_key_exists() with isset()Andrey Andreev1-5/+5
2012-01-26DB forge escaping relatedAndrey Andreev2-12/+12
2012-01-25Merge pull request #974 from CroNiX/patch-3Phil Sturgeon1-3/+6
2012-01-25Added bit about having mod_rewrite enabled for removing index.php CroNiX1-3/+6
2012-01-25Merge pull request #973 from CroNiX/patch-2Phil Sturgeon1-1/+1
2012-01-25Change hardcoded "application" directory to use the APPPATH constant as it wo...CroNiX1-1/+1
2012-01-25Merge pull request #842 from narfbg/develop-encryptPhil Sturgeon1-75/+37
2012-01-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-16/+10
2012-01-25Remove an access description line and switch private to protectedAndrey Andreev2-2/+1
2012-01-25Merge pull request #957 from cryode/bug/force_downloadPhil Sturgeon1-16/+10
2012-01-24Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren158-2604/+1945
2012-01-24Revert "Cleaned up a few things in PDO driver"Timothy Warren1-39/+32
2012-01-24Cleaned up a few things in PDO driverTimothy Warren1-32/+39
2012-01-24Revert a space in the license agreement :)Andrey Andreev1-1/+1
2012-01-24Revert a space in the license agreement :)Andrey Andreev4-4/+4
2012-01-24Fix bug #195Eric Roberts1-16/+10
2012-01-19Some cleaningAndrey Andreev1-18/+3
2012-01-19Some more cleaningAndrey Andreev1-4/+2
2012-01-17Merge pull request #931 from talkingwithsean/patch-1Phil Sturgeon1-0/+1
2012-01-16APC throws "apc_store() expects parameter 3 to be long, string given". Valida...Sean Fisher1-0/+1
2012-01-16Replaced a method with a variableAndrey Andreev1-1/+1
2012-01-16Add a comment for CI_DB_sqlite3_result::num_rows()Andrey Andreev1-0/+3
2012-01-16Add SQLite3 database driverAndrey Andreev9-4/+1548
2012-01-12Merge pull request #846 from aquariuz/developPhil Sturgeon3-3/+3
2012-01-12array keys should be 0, 1, and 2. key 3 results in error (invalid offset)Ronald Beilsma1-1/+1
2012-01-10Two returnsAndrey Andreev1-3/+2
2012-01-10Merge pull request #908 from insign/patch-1Phil Sturgeon1-1/+1
2012-01-10Merge pull request #906 from narfbg/develop-issue-904Phil Sturgeon3-10/+8
2012-01-10Merge pull request #892 from narfbg/develop-core-securityPhil Sturgeon1-173/+106
2012-01-10Merge pull request #912 from narfbg/develop-fix-fhPhil Sturgeon2-8/+8
2012-01-10Merge pull request #911 from narfbg/develop-fix-langPhil Sturgeon1-1/+1
2012-01-10Fix a bug in system/core/CodeIgniter.phpAndrey Andreev1-1/+1
2012-01-10Fix a bug in the File helperAndrey Andreev1-7/+7
2012-01-10closedir closes directory handle, not directory pathRonald Beilsma1-1/+1