summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2012-02-28tab separator in _config_delimiters dockblock.Mike Funk1-1/+1
2012-02-28fixed some mismatched brackets.Mike Funk1-4/+4
2012-02-28changed _config_delimiters() to protected.Mike Funk1-1/+1
2012-02-24added config process method checking for delimiter values, updated changelog ↵Mike Funk1-0/+24
and user guide.
2012-02-24fixed active record inconsistency.Mike Funk1-1/+1
2012-02-24Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developMike Funk4-14/+60
2012-02-24Merge pull request #1069 from narfbg/develop-db-selectAndrey Andreev4-14/+60
Add an optional database name parameter to db_select()
2012-02-24Update database property when switching to a new oneAndrey Andreev4-4/+48
2012-02-23Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into developMike Funk127-6488/+6519
2012-02-22Fix issue 1070Andrey Andreev1-24/+10
2012-02-22Add an optional database name parameter to db_select()Andrey Andreev4-14/+16
2012-02-17Syntax error, causing MySQL utility could not usedTaufan Aditya1-1/+1
2012-02-17Fixed issue #960Marcos Garcia1-7/+0
2012-02-16Merge pull request #934 from wilburhimself/developPhil Sturgeon1-1/+1
Fixed error in inflector_helper.php in the singular function.
2012-02-16Merge pull request #1046 from YorickPeterse/developPhil Sturgeon1-1/+1
Lowered the file permissions for file caches.
2012-02-15Lowered the file permissions for file caches.Yorick Peterse1-1/+1
See #1045 for more information. Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
2012-02-14Fix another issueAndrey Andreev1-1/+1
2012-02-14Fix issue #1039Andrey Andreev2-9/+10
2012-02-13Merge pull request #921 from narfbg/develop-image-libPhil Sturgeon1-248/+187
Image_lib::image_reproportion() to not need both width and height
2012-02-13Added missing spaceTimothy Warren1-1/+1
2012-02-13Re-added if ! empty clauseTimothy Warren1-1/+4
2012-02-13Refixed Old-style pdo connection stringTimothy Warren1-7/+6
2012-02-13Semicolon automatically added if not exists after hostname, if only database ↵Taufan Aditya1-2/+7
was not empty
2012-02-12Fixed rtrim issue in hostname fragment, for backward compabilityTaufan Aditya1-5/+3
2012-02-10Changed double quotes to singleTimothy Warren1-1/+1
2012-02-10Fixed old-style pdo connection stringTimothy Warren1-1/+5
2012-02-10Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev5-93/+286
2012-02-10Grammar correctionTaufan Aditya1-1/+1
2012-02-09TypoTaufan Aditya1-1/+1
2012-02-09Change PHP.net mirror to the main mirrorTaufan Aditya1-2/+2
2012-02-09Fixed PDOTaufan Aditya5-93/+286
2012-02-08Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev2-37/+33
2012-02-08Remove a few spacesAndrey Andreev1-2/+2
2012-02-08Fix CI_Input::is_ajax_request()Andrey Andreev1-37/+29
2012-02-05Adding in a few 503 status codes for common errors in response to this ↵Kevin Cupp2-0/+4
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-image-libAndrey Andreev1-56/+77
2012-02-01Merge upstreamAndrey Andreev12-821/+448
2012-02-01Merge remote-tracking branch 'upstream/develop' into develop-image-libAndrey Andreev13-821/+449
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-27Switch _process_fields() from private to protectedAndrey Andreev1-1/+1
2012-01-27Add PHP version check in db_pconnect()Andrey Andreev1-0/+6
2012-01-27Improve the MySQLi database driverAndrey Andreev5-354/+189
2012-01-26Improve the MySQL database driverAndrey Andreev4-375/+205
2012-01-25Merge pull request #842 from narfbg/develop-encryptPhil Sturgeon1-75/+37
Improve the Encryption library
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-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