summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-02-12Added port handling support for UNIX systems and moved it to the constructorAndrey Andreev1-10/+10
2012-02-10Merge upstream branchAndrey Andreev9-95/+296
2012-02-10Merge pull request #1022 from toopay/pdoPhil Sturgeon8-93/+294
Fixed PDO issues.
2012-02-10Grammar correctionTaufan Aditya1-1/+1
2012-02-09Merge pull request #1024 from narfbg/develop-issue-1021Eric Barnes1-2/+2
Fix issue #1021
2012-02-09Fix link to changelogAndrey Andreev1-2/+2
2012-02-09TypoTaufan Aditya1-1/+1
2012-02-09Change PHP.net mirror to the main mirrorTaufan Aditya1-2/+2
2012-02-09Added database.phpTaufan Aditya1-0/+2
2012-02-09Fixed PDOTaufan Aditya7-93/+292
2012-02-08Merge remote-tracking branch 'upstream/develop' into develop-db-mssqlAndrey Andreev4-37/+36
2012-02-08Merge pull request #1018 from narfbg/develop-inputPhil Sturgeon2-37/+30
Fix CI_Input::is_ajax_request()
2012-02-08Remove a few spacesAndrey Andreev1-2/+2
2012-02-08Fix CI_Input::is_ajax_request()Andrey Andreev2-37/+30
2012-02-06Merge pull request #1016 from kevincupp/developGreg Aker3-0/+6
Adding in a few 503 status codes for common errors
2012-02-05Adding in a few 503 status codes for common errors in response to this ↵Kevin Cupp3-0/+6
ExpressionEngine bug about errors getting cached by reverse proxies who cache 200 responses: http://expressionengine.com/bug_tracker/bug/17420
2012-02-02Merge remote-tracking branch 'upstream/develop' into develop-db-mssqlAndrey Andreev2-56/+78
2012-02-02Merge pull request #942 from narfbg/develop-issue-154Phil Sturgeon2-56/+78
Fix issue #154
2012-02-01Merge remote-tracking branch 'upstream/develop' into develop-db-mssqlAndrey Andreev2-1/+2
2012-02-01Merge upstreamAndrey Andreev16-825/+474
2012-02-01Merge pull request #1006 from duggan/patch-1Phil Sturgeon2-1/+2
HTTPS detection fix
2012-02-01Add note about HTTPS detection change to 3.0 changelogRoss Duggan1-0/+1
2012-01-31HTTPS detection fixRoss Duggan1-1/+1
More closely follow the wording of the $_SERVER['HTTPS'] description in the PHP manual, which specifies a "non-empty" value rather than "non-null"
2012-01-27Merge upstream branchAndrey Andreev15-741/+433
2012-01-27Merge pull request #992 from narfbg/develop-db-mysqliPhil Sturgeon6-354/+197
Improve the MySQLi database driver
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
Improve the MySQL database driver
2012-01-27Merge pull request #987 from timw4mail/developPhil Sturgeon1-0/+16
Added Try/Catch example to styleguide
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-26Replace array_key_exists() with isset() and ! empty()Andrey Andreev1-5/+5
2012-01-26A minor improvement to insert_id()Andrey Andreev1-4/+4
2012-01-26Make _escape_identifiers() public, so DB_forge can use itAndrey Andreev1-1/+1
2012-01-25Merge pull request #974 from CroNiX/patch-3Phil Sturgeon1-3/+6
Docs: Added bit about having mod_rewrite enabled for removing index.php
2012-01-25Added bit about having mod_rewrite enabled for removing index.php CroNiX1-3/+6
Added note about htaccess rules might not work for all server configurations
2012-01-25Switch a few properties from public to protectedAndrey Andreev1-5/+5
2012-01-25Merge pull request #973 from CroNiX/patch-2Phil Sturgeon1-1/+1
Change hardcoded "application" directory to use the APPPATH constant as ...
2012-01-25Change hardcoded "application" directory to use the APPPATH constant as it ↵CroNiX1-1/+1
would not work if you relocate /application or /system folders outside of web root.
2012-01-25Update the changelogAndrey Andreev1-0/+1
2012-01-25Improve the MSSQL database driverAndrey Andreev4-300/+164
2012-01-25Merge pull request #842 from narfbg/develop-encryptPhil Sturgeon1-75/+37
Improve the Encryption library
2012-01-25Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-16/+10
2012-01-25Merge pull request #957 from cryode/bug/force_downloadPhil Sturgeon1-16/+10
Fix bug #195
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
This reverts commit e943bc418b1a233fce98fa5ae80d0873e1e5245f.
2012-01-24Cleaned up a few things in PDO driverTimothy Warren1-32/+39