summaryrefslogtreecommitdiffstats
path: root/application/config
AgeCommit message (Collapse)AuthorFilesLines
2012-06-15Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon3-11/+12
2012-06-15Merge branch 'feature/minify_output' of ↵Phil Sturgeon1-0/+13
https://github.com/atiredmachine/CodeIgniter into develop
2012-06-14Polish changes from pull #1233 - Session class already has the ↵Andrey Andreev1-3/+3
time_reference setting - 'GMT' is a valid timezone, so nothing needs to be changed in order to work properly (upgrade notes) - Altered some description text
2012-06-13Fixed some stuff in documentation.Iban Eguia1-3/+4
2012-06-12Changed the config parameter. The session's _get_time() function has also ↵Iban Eguia1-2/+2
changed.
2012-06-10Changed the default timezone to local and explained in the config file.Iban Eguia1-2/+3
2012-06-08Merge remote-tracking branch 'upstream/develop' into new_dateIban Eguia5-256/+269
2012-06-07Add ics files support to mimes.php (issue #1441)Andrey Andreev1-1/+2
2012-06-06Added Fennec as Firefox Mobile to config/user_agents.php (issue #1063)Andrey Andreev1-3/+3
2012-06-04Direct return from mimes config, instead of using global $mimes;Phil Sturgeon1-130/+130
Global variables are generally a terrible idea, especially for something as simple as this. The mimes.php now returns an array instead of just injecting a variable name into the global namespace.
2012-05-17Changed the default controller route to use single quotes instead of double ↵Alex Bilbie1-1/+1
quotes
2012-05-11Remove a duplicate mobile user agent entryAndrey Andreev1-1/+0
2012-05-11User_agent library improvementsAndrey Andreev1-71/+76
2012-04-26Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow14-112/+130
Conflicts: system/core/Loader.php system/database/DB_query_builder.php system/database/drivers/cubrid/cubrid_driver.php system/database/drivers/mssql/mssql_driver.php system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/database/drivers/oci8/oci8_driver.php system/database/drivers/odbc/odbc_driver.php system/database/drivers/pdo/pdo_driver.php system/database/drivers/postgre/postgre_driver.php system/database/drivers/sqlite/sqlite_driver.php user_guide_src/source/changelog.rst user_guide_src/source/database/query_builder.rst
2012-04-24Added Romanian characters to the foreign_chars.phpGeorge Petsagourakis1-4/+4
fixes #131
2012-04-24Added Greek characters to the foreign_chars.phpGeorge Petsagourakis1-28/+33
2012-04-17minor style fixTimothy Warren1-2/+2
2012-04-17Updated supported database driver listTimothy Warren1-1/+2
2012-04-04Make database config easier to work withTimothy Warren1-17/+19
2012-03-27Fixed typo.Iban Eguia1-1/+1
2012-03-27Changed Date helper to return time() based on the timezone parameter.Iban Eguia1-9/+7
2012-03-26Clear some spaces and fix some inconsistencies in application/ php filesAndrey Andreev13-40/+38
2012-03-26Merge pull request #994 from Razican/doctypesAndrey Andreev1-11/+21
Doctypes
2012-03-18add support for httponly cookiesfreewil1-0/+2
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-03-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developJamie Rumbelow1-3/+3
Conflicts: system/database/DB_driver.php system/database/DB_query_builder.php
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-19Renaming Active Record to Query Builder across the systemJamie Rumbelow1-4/+4
2012-02-09Added database.phpTaufan Aditya1-0/+2
2012-01-27Added doccumentation for the new doctypes.Iban Eguia1-1/+1
2012-01-27Added some more doctypes. Fixes #952.Iban Eguia1-11/+21
2012-01-25Rudimentary minifying of output.Thor (atiredmachine)1-0/+13
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