summaryrefslogtreecommitdiffstats
path: root/application/config
AgeCommit message (Expand)AuthorFilesLines
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
2011-09-18Added support to select the name of the database table you are going to use i...Cloudmanic Labs, LLC1-0/+13
2011-09-06Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren5-133/+173
2011-09-01Merge pull request #358 from mmestrovic/developGreg Aker1-124/+125
2011-09-01Merge pull request #362 from marcoscoelho/feature/typoGreg Aker3-3/+3
2011-08-31fixes some typoMarcosCoelho3-3/+3
2011-08-31added Windows 7 platform mmestrovic1-124/+125
2011-08-28always use charset config itemfreewil1-0/+2
2011-08-27add Android user agentBruno Bierbaumer1-0/+1
2011-08-25Merge remote-tracking branch 'alexbilbie/csrf-override' into feature/csrf-verifyEric Barnes1-0/+2
2011-08-24whitespace updatesKevin Hoogheem1-5/+5
2011-08-24MIME Type Adds/ChangesKevin Hoogheem1-8/+42
2011-08-23Got PDO workingTimothy Warren1-1/+1
2011-08-21added ability to log certain error types, not all under a thresholdNithin1-0/+4
2011-08-21Added new config parameter "csrf_exclude_uris" which allows for URIs to be wh...Alex Bilbie1-0/+2
2011-08-13Fixed conflicts.Phil Sturgeon1-1/+1
2011-08-10Added application/x-csv as a mime.Phil Sturgeon1-1/+1
2011-08-10Disabled migrations by default.Phil Sturgeon1-1/+1
2011-07-02hand merged remaining unresolved files following the backout of 648b42a75739,...Derek Jones2-1/+44
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke...Derek Jones11-53/+53
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke...Derek Jones11-53/+53
2011-05-20modified the 'use_set_names' variable in the MySQL/i drivers to be a class pr...Derek Jones1-1/+2
2011-05-08Merged tip.Phil Sturgeon11-54/+60
2011-05-04Fixed conflict with migrations merge.Phil Sturgeon1-0/+42
2011-05-04Added Migration class and language file.Phil Sturgeon1-1/+5
2011-04-25Fixed double-space typo.Razican11-53/+53
2011-04-20Automated merge with http://hg.ellislab.com/CodeIgniter-ReactorDerek Jones1-0/+6
2011-04-19modified MySQL and MySQLi drivers to address a potential SQL injection attack...Derek Jones1-0/+6
2011-04-19Removed APPPATH.'third_party' from the packages autoloader to negate needless...Greg Aker1-1/+1
2011-03-08Added 'json' to config/mimes.php.Phil Sturgeon1-1/+2
2011-02-16Merged CodeIgniter Core changes and integrated rob1's secure cookie change in...Phil Sturgeon5-72/+93
2011-02-14Removed Migration code for now, will come back later.Phil Sturgeon1-38/+0
2011-02-11Adding config option to require 'secure' setting for all cookies- requires ht...Robin Sowell1-0/+2
2011-02-09Fixed issue #41: Added audio/mp3 mime type to mp3.Phil Sturgeon1-1/+1
2011-02-07Added Migrations library, config and an example controller/migration file.Phil Sturgeon1-0/+38
2011-01-27Automated merge with https://bitbucket.org/ellislab/codeigniterPhil Sturgeon5-73/+94
2011-01-17Accidentally left csrf to turned on in last commitEric Barnes1-1/+1
2011-01-17Added access scope to security library and added config options for csrf prot...Eric Barnes1-2/+8
2011-01-12Changed instructions for location of log path. Fixes #305Eric Barnes1-1/+1
2011-01-11Reworked convert_foreign_characters in text helper. Thanks to Mario Ricalde.Eric Barnes1-52/+52
2011-01-06Altered User agent library so that is_browser(), is_mobile() and is_robot() c...Phil Sturgeon1-0/+1
2011-01-05Added text/x-csv to mimes.php.Phil Sturgeon1-1/+1