summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-02-08Merge upstream branchAndrey 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 upstream branchAndrey Andreev2-56/+78
2012-02-02Merge pull request #942 from narfbg/develop-issue-154Phil Sturgeon2-56/+78
Fix issue #154
2012-02-01Merge upstreamAndrey 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 remote-tracking branch 'upstream/develop' into develop-issue-128Andrey Andreev6-354/+197
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-27Remove an unnecessary unset()Andrey Andreev1-1/+0
2012-01-27Fix issue #128Andrey Andreev2-11/+13
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-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-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-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
2012-01-24Revert a space in the license agreement :)Andrey Andreev1-1/+1
2012-01-24Revert a space in the license agreement :)Andrey Andreev1-1/+1
2012-01-24Fix bug #195Eric Roberts1-16/+10
Fixes bug #195 regarding non-existent user agent strings when using force_download() helper.
2012-01-20Replace AND with &&Andrey Andreev1-4/+2
2012-01-20Revert if() merge, for readabilityAndrey Andreev1-5/+22
2012-01-19Some more cleaningAndrey Andreev1-4/+2
2012-01-19Still update the session on AJAX calls, just don't regenerate the session IDAndrey Andreev1-6/+30
2012-01-19Fix issue #154Andrey Andreev2-68/+51
2012-01-17Merge pull request #931 from talkingwithsean/patch-1Phil Sturgeon1-0/+1
APC Validate apc_store TTL
2012-01-16APC throws "apc_store() expects parameter 3 to be long, string given". ↵Sean Fisher1-0/+1
Validates the TTL to an integer.
2012-01-12Merge pull request #846 from aquariuz/developPhil Sturgeon3-3/+3
fixed 2 bugs
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
User Guide example for htaccess assumed root