summaryrefslogtreecommitdiffstats
path: root/application/config
AgeCommit message (Collapse)AuthorFilesLines
2011-11-22Merge master (2.1.0) and fixed conflicts.Phil Sturgeon1-2/+1
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-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 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
2011-09-01Merge pull request #358 from mmestrovic/developGreg Aker1-124/+125
added Windows 7 platform
2011-09-01Merge pull request #362 from marcoscoelho/feature/typoGreg Aker3-3/+3
fixes some typo
2011-08-31fixes some typoMarcosCoelho3-3/+3
2011-08-31added Windows 7 platform mmestrovic1-124/+125
renamed Windows Longhorn to Windows Vista fixed tabs changed order of nt5.1 and nt5.0 platforms
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
Conflicts: system/core/Security.php
2011-08-24whitespace updatesKevin Hoogheem1-5/+5
per Phil updating some whitespace issues
2011-08-24MIME Type Adds/ChangesKevin Hoogheem1-8/+42
Updated MIME Types with certs and new audio/video files as well as added extra types for some existing files.
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 ↵Alex Bilbie1-0/+2
whitelisted from CSRF verification. Fixes #149
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 ↵Derek Jones2-1/+44
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones11-53/+53
broke the Typography class's string replacements, for instance
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones11-53/+53
broke the Typography class's string replacements, for instance
2011-05-20modified the 'use_set_names' variable in the MySQL/i drivers to be a class ↵Derek Jones1-1/+2
property instead of static, in case multiple database servers are connected to in a single request. Also clarified description of the 'dbcollat' setting in the configuration files
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