summaryrefslogtreecommitdiffstats
path: root/application/config
AgeCommit message (Collapse)AuthorFilesLines
2012-03-09Bumped CodeIgniter's PHP requirement to 5.2.4.Phil Sturgeon14-14/+14
Yes I know PHP 5.4 just came out, and yes I know PHP 5.3 has lovely features, but there are plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not widely supported enough. CodeIgniter is great for distributed applications, and this is the highest we can reasonably go without breaking support. PHP 5.3 will most likely happen in another year or so. Fingers crossed on that one anyway...
2012-02-29updated branchMichiel Vugteveen1-2/+2
2012-02-29docx and xlsx was already fixesMichiel Vugteveen1-2/+2
2012-02-29Merged in 2.1-stable changes.Phil Sturgeon1-2/+2
2012-02-28mime types doc, docx, xlsx fixesMichiel Vugteveen1-3/+3
2012-02-09Added database.phpTaufan Aditya1-0/+2
2012-01-08Merge pull request #850 from RS71/developPhil Sturgeon1-0/+2
CSRF optional token regeneration
2012-01-04Updated the memcached config file.Eric Barnes1-7/+31
2012-01-04Merge pull request #668 from GustavBertram/developEric Barnes1-0/+22
Added a proper default config file for Cache_memcached - GWB
2012-01-03Some additions to mimes.phpAndrey Andreev1-6/+7
2012-01-02Updating copyright date to 2012Greg Aker13-13/+13
2011-12-31Update application/config/config.phpRS711-0/+2
2011-12-28Turn "pconnect" off by default.Phil Sturgeon1-1/+1
Some users were complaining this was effecting their performance and having it on by default can potentially cause issues with people who don't understand what it does. Having it off by default means people are only effected if they want to be, which is safer.
2011-12-24Changes "ie" to "e.g." mrw1-1/+1
The instruction is followed by an example database type, not a clarification of what database types in general are, so it should use "e.g."
2011-11-29The DB_driver can now use failover databases if specifiedFelix Balfoort1-1/+2
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-27Merge pull request #690 from Repox/developPhil Sturgeon1-1/+1
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-24Updating the user agent after being corrected on commit b8daad7Repox1-1/+1
Relates to issue #683.
2011-11-23docx and xlsx have a zip/application mimetypeMichiel Vugteveen1-2/+2
2011-11-22Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon1-0/+1
2011-11-22Merge master (2.1.0) and fixed conflicts.Phil Sturgeon1-2/+1
2011-11-21Added 'opera mobi' to user agents making it identified as 'Opera Mini'. ↵Repox1-0/+1
Fixes issue #683
2011-11-16Migrations - Changed config migration_version to state it is used in ↵Eric Barnes1-8/+5
migration->current. Removed white space and coding standards.
2011-11-14Adding a default memcached config file - GWBGustav Bertram1-5/+10
2011-11-14Adding a default memcached config file - GWBGustav Bertram1-0/+17
2011-11-12Added in BingBot, MSNBot is being phased outAndrew Seymour1-0/+1
2011-11-12Modified spacing of user agent arraysEric Barnes1-157/+157
2011-11-12Add OpenWeb Mobile User AgentBo-Yi Wu1-5/+8
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2011-11-08Added the mime type for pptx. The new Power point format.mpmont1-0/+1
2011-11-02add Nintendo mobile devicescomp5001-1/+4
2011-10-27Added links to the user guide for Encryption class and Session class.Kyle Ridolfo1-0/+3
2011-10-27Added long missing Migration documentation.Phil Sturgeon1-3/+2
2011-10-27Fix #537 issue: replace new wav mimetypeBo-Yi Wu1-3/+3
2011-10-21fixing typo in attribution blockDerek Jones13-13/+13
2011-10-20adding new license file (OSL 3.0) and updating readme to ReSTDerek Jones13-2/+336
added notice of license to all source files. OSL to all except the few files we ship inside of the application folder, those are AFL. Updated license in user guide. incrementing next dev version to 3.0 due to licensing change
2011-10-18Renamed constant, added 10px margin to backtraceTimothy Warren1-1/+1
2011-10-18Minor formatting changesTimothy Warren1-1/+1
2011-10-18Moved backtrace constant to config/constants.phpTimothy Warren1-0/+12
2011-10-14REALLY fixed merge problem.Kyle Farris1-43/+0
2011-10-14Fixed merge error.Kyle Farris1-1/+0
2011-10-14Merged with developmentKyle Farris9-131/+209
2011-10-14trying to resolve some merge issuesKyle Farris1-41/+41
2011-10-07Fix #537 issue: replace new wav mimetypeBo-Yi Wu1-2/+2
2011-10-05Changed translation of D and d in foreign chars. Fixes #500Eric Barnes1-2/+2
2011-10-03Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-0/+1
2011-09-25Added XHTML Basic 1.1 (xhtml-basic11) doctype.cenk1-0/+1
2011-09-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-0/+29
2011-09-18Migrations: Added a config that allows the system to migration to the latest ↵Cloudmanic Labs, LLC1-0/+16
migration when you load the library. This way you do not have to call migrations anywhere else in your code and can always be at the latest migration
2011-09-18Added support to select the name of the database table you are going to use ↵Cloudmanic Labs, LLC1-0/+13
in Migrations
2011-09-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren5-133/+173