summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-12-13Spacing added, @philsturgeon is too picky!Andrew Seymour1-1/+1
2011-12-13Merged the two if's together as suggested by @philsturgeon - updated the ↵Andrew Seymour2-6/+4
Changelog to include something that may be important
2011-12-13Updated Cart.php to handle quantity changes differently (now ↵Andrew Seymour2-5/+24
auto-increments), also updated the changelog to reflect this change for the people that are currently using this library
2011-12-09Added ability to change the separator value in the humanize functionEric Barnes3-9/+16
2011-12-09Merge pull request #755 from zclancy/developEric Barnes1-1/+1
Fixed typo in introductory paragraph.
2011-12-09Fixed typo in introductory paragraph.Zac Clancy1-1/+1
2011-12-06Merge branch 'develop' of https://github.com/tomasz154/CodeIgniter into ↵Eric Barnes1-0/+2
tomasz154-develop Conflicts: user_guide_src/source/changelog.rst
2011-12-06updated changelog with dbforge fixTomasz T1-0/+1
2011-12-06Merge pull request #735 from tomasz154/developPhil Sturgeon2-1/+8
Made an "innocuous SQL statement" more innocuous SELECT * FROM was running in the PostgreSQL drivers just for the sake of returning valid SQL, which could of course be insanely slow on large tables.
2011-12-06Merge pull request #647 from tomcode/patch-1Phil Sturgeon1-3/+3
Zip class checks file exists to prevent error warnings in the log
2011-12-06Update system/libraries/Zip.phpThomas Traub1-2/+2
2011-12-06Updated change logEric Barnes1-0/+1
2011-12-06Merge branch 'develop' of https://github.com/michaeljdennis/CodeIgniter into ↵Eric Barnes1-11/+30
michaeljdennis-develop Conflicts: system/libraries/Image_lib.php user_guide/changelog.html
2011-12-06Added change log item for bug #608Eric Barnes1-0/+1
2011-12-06Merge pull request #608 from spol/Image_lib-bugfixEric Barnes1-1/+4
Fixes an issue with the Image_lib class not clearing properties completely
2011-12-05Update system/libraries/Zip.phpThomas Traub1-1/+1
2011-12-05changed _create_table to return true if table already existsTomasz T1-1/+2
2011-12-05changed create_table method to check whether a value returned from driver's ↵Tomasz T1-0/+6
forge is sql or bool (acts exactly as create_database)
2011-12-05Took out the now unnecessary error suppressionThomas Traub1-2/+2
2011-12-05Merge pull request #741 from tomcode/patch-2Phil Sturgeon1-0/+1
The changelog entry for issue #647 Zip.php, add file exists check to prevent stat failed error
2011-12-05The changelog entry for issue #647Thomas Traub1-0/+1
2011-12-04Added change log message about logger chmod. Refs: #739Eric Barnes1-0/+1
2011-12-04Merge pull request #739 from jeroenvdgulik/feature/logger-chmod-bugEric Barnes1-2/+6
- Stop logger from trying to chmod on each event
2011-12-04Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developEric Barnes1-7/+10
2011-12-04Updated change log with fixed issues.Eric Barnes1-0/+2
2011-12-04Merge pull request #738 from EllisLab/feature/is_uniqueEric Barnes1-7/+10
Fix for is_unique when you are not connected to a db. Refs: #724
2011-12-04- Stop logger from trying to chmod on each event to safe i/o and prevent ↵Jeroen van der Gulik1-2/+6
error messages popping up when the user is different then the webserver
2011-12-04Fix for is_unique when you are not connected to a db. Refs: #724Eric Barnes1-7/+10
2011-12-04Changed pagination construct to call initialize so it sets the anchor class ↵Eric Barnes1-10/+6
properly. Fixes #737
2011-12-04Changed visibility of pagination properties and methods.Eric Barnes1-39/+38
2011-12-02SELECT * FROM isn't that innocuous, changed to SELECT 1Tomasz T1-1/+1
2011-12-01Merge pull request #728 from Repox/developPhil Sturgeon1-1/+8
call_user_func_array() error with $this->db->call_function(). This fixes issue #725
2011-12-01Merge pull request #730 from JackWebbHeller/patch-1Phil Sturgeon1-2/+6
Stop CI overriding the set config value for Maximum Execution Time, when running from CLI
2011-12-01Removed `$_SERVER['REMOTE_ADDR']` following feedbackJack Webb-Heller1-1/+1
2011-12-01CodeIgniter ignores the set config value for Maximum Execution Time, ↵Jack Webb-Heller1-2/+6
overwriting it with its own value of 300 seconds. Whilst this is sensible in the vast majority of situations (browsers), when running a script from CLI, it is likely that execution times may need to be longer. Therefore, don't override the time limit if being run from the CLI - instead default back to PHP's own configuration.
2011-12-01This fixes issue #725Repox1-1/+8
2011-11-29Merge pull request #719 from fhjbalfoort/developPhil Sturgeon4-6/+77
DB_driver failover if a connection cannot be established to the main connection
2011-11-29Changed the array structure in the userguideFelix Balfoort1-16/+36
2011-11-29changed much to many in the documentationFelix Balfoort1-1/+1
2011-11-29Updated change log and and database configuration to include failoverFelix Balfoort2-0/+23
2011-11-29Merge branch 'develop' of github.com:fhjbalfoort/CodeIgniter into developFelix Balfoort0-0/+0
Conflicts: application/config/database.php
2011-11-29The DB_driver can now use failover databases if specifiedFelix Balfoort2-6/+34
The DB_driver can now use failover databases if specified. If the main connection shouldn't connect for some reason the DB_driver will now try to connect to specified connections in the failover config. Example config: $db['default']['hostname'] = 'localhost'; $db['default']['username'] = ''; $db['default']['password'] = ''; $db['default']['database'] = ''; $db['default']['dbdriver'] = 'mysql'; $db['default']['dbprefix'] = ''; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = ''; $db['default']['char_set'] = 'utf8'; $db['default']['dbcollat'] = 'utf8_general_ci'; $db['default']['swap_pre'] = ''; $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; $db['default']['failover'] = array(); $db['default']['failover'][0]['hostname'] = 'localhost1'; $db['default']['failover'][0]['username'] = ''; $db['default']['failover'][0]['password'] = ''; $db['default']['failover'][0]['database'] = ''; $db['default']['failover'][0]['dbdriver'] = 'mysql'; $db['default']['failover'][0]['dbprefix'] = ''; $db['default']['failover'][0]['pconnect'] = TRUE; $db['default']['failover'][0]['db_debug'] = TRUE; $db['default']['failover'][0]['cache_on'] = FALSE; $db['default']['failover'][0]['cachedir'] = ''; $db['default']['failover'][0]['char_set'] = 'utf8'; $db['default']['failover'][0]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][0]['swap_pre'] = ''; $db['default']['failover'][0]['autoinit'] = TRUE; $db['default']['failover'][0]['stricton'] = FALSE; $db['default']['failover'][0]['failover'] = array(); $db['default']['failover'][1]['hostname'] = 'localhost2'; $db['default']['failover'][1]['username'] = ''; $db['default']['failover'][1]['password'] = ''; $db['default']['failover'][1]['database'] = ''; $db['default']['failover'][1]['dbdriver'] = 'mysql'; $db['default']['failover'][1]['dbprefix'] = ''; $db['default']['failover'][1]['pconnect'] = TRUE; $db['default']['failover'][1]['db_debug'] = TRUE; $db['default']['failover'][1]['cache_on'] = FALSE; $db['default']['failover'][1]['cachedir'] = ''; $db['default']['failover'][1]['char_set'] = 'utf8'; $db['default']['failover'][1]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][1]['swap_pre'] = ''; $db['default']['failover'][1]['autoinit'] = TRUE; $db['default']['failover'][1]['stricton'] = FALSE; $db['default']['failover'][1]['failover'] = array(); Signed-off-by: Felix Balfoort <fhjbalfoort@gmail.com>
2011-11-29The DB_driver can now use failover databases if specifiedFelix Balfoort2-5/+51
The DB_driver can now use failover databases if specified. If the main connection shouldn't connect for some reason the DB_driver will now try to connect to specified connections in the failover config. Example config: $db['default']['hostname'] = 'localhost'; $db['default']['username'] = ''; $db['default']['password'] = ''; $db['default']['database'] = ''; $db['default']['dbdriver'] = 'mysql'; $db['default']['dbprefix'] = ''; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = ''; $db['default']['char_set'] = 'utf8'; $db['default']['dbcollat'] = 'utf8_general_ci'; $db['default']['swap_pre'] = ''; $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; $db['default']['failover'] = array(); $db['default']['failover'][0]['hostname'] = 'localhost1'; $db['default']['failover'][0]['username'] = ''; $db['default']['failover'][0]['password'] = ''; $db['default']['failover'][0]['database'] = ''; $db['default']['failover'][0]['dbdriver'] = 'mysql'; $db['default']['failover'][0]['dbprefix'] = ''; $db['default']['failover'][0]['pconnect'] = TRUE; $db['default']['failover'][0]['db_debug'] = TRUE; $db['default']['failover'][0]['cache_on'] = FALSE; $db['default']['failover'][0]['cachedir'] = ''; $db['default']['failover'][0]['char_set'] = 'utf8'; $db['default']['failover'][0]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][0]['swap_pre'] = ''; $db['default']['failover'][0]['autoinit'] = TRUE; $db['default']['failover'][0]['stricton'] = FALSE; $db['default']['failover'][0]['failover'] = array(); $db['default']['failover'][1]['hostname'] = 'localhost2'; $db['default']['failover'][1]['username'] = ''; $db['default']['failover'][1]['password'] = ''; $db['default']['failover'][1]['database'] = ''; $db['default']['failover'][1]['dbdriver'] = 'mysql'; $db['default']['failover'][1]['dbprefix'] = ''; $db['default']['failover'][1]['pconnect'] = TRUE; $db['default']['failover'][1]['db_debug'] = TRUE; $db['default']['failover'][1]['cache_on'] = FALSE; $db['default']['failover'][1]['cachedir'] = ''; $db['default']['failover'][1]['char_set'] = 'utf8'; $db['default']['failover'][1]['dbcollat'] = 'utf8_general_ci'; $db['default']['failover'][1]['swap_pre'] = ''; $db['default']['failover'][1]['autoinit'] = TRUE; $db['default']['failover'][1]['stricton'] = FALSE; $db['default']['failover'][1]['failover'] = array(); Signed-off-by: Felix Balfoort <fhjbalfoort@gmail.com>
2011-11-28Merge pull request #716 from timw4mail/developPhil Sturgeon1-4/+0
Fixed syntax error in PDO driver.
2011-11-28Fixed sytax error in pdo driverTimothy Warren1-4/+0
2011-11-27Merge pull request #690 from Repox/developPhil Sturgeon2-5/+6
Proposal for an updated mod_rewrite suggestion. The existing mod_rewrite example in the documentation led to confusion with new users about how to include CSS, JS and image files.
2011-11-27Merge pull request #628 from kridolfo/patch-1Eric Barnes1-0/+3
Added links to the user guide for Encryption class and Session class.
2011-11-27Merge branch 'patch-1' of https://github.com/has2k1/CodeIgniter into ↵Eric Barnes2-5/+5
has2k1-patch-1 Conflicts: user_guide_src/source/changelog.rst
2011-11-27Updated docs for increment_string example.Eric Barnes1-1/+1
2011-11-24Merge pull request #704 from bitrayne/developPhil Sturgeon3-7/+13
Allow a custom file name for email attachments.
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-02 19:23:50 +0100