summaryrefslogtreecommitdiffstats
path: root/application
AgeCommit message (Collapse)AuthorFilesLines
2011-10-14REALLY fixed merge problem.Kyle Farris1-43/+0
2011-10-14Fixed merge error.Kyle Farris1-1/+0
2011-10-14Merged with developmentKyle Farris13-132/+213
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-04Merge pull request #282 from timw4mail/developPhil Sturgeon1-1/+1
PDO driver for Database class.
2011-10-04add meta charset tag to error templateskenjis3-0/+3
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-13Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren1-1/+1
2011-09-07Added toopay's change and bolded the version number...as that's baller...or ↵Troy McCormick1-1/+1
some such...
2011-09-07Added environment flag to ensure there is no security risk, per ericbarnes ↵Troy McCormick1-1/+1
on IRC...
2011-09-07Added CodeIgniter version information to footer of default welcome message view.Troy McCormick1-1/+1
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 Jones13-56/+56
broke the Typography class's string replacements, for instance
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones13-56/+56
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 Sturgeon17-144/+258
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.Razican13-56/+56
2011-04-20Visual updates to the welcome_message view file and default error templates. ↵Greg Aker4-87/+195
Thanks to danijelb for the pull request.
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 ↵Derek Jones1-0/+6
attack vector when multi-byte character set connections are employed. (Does not impact Latin-1, UTF-8, etc. encodings)
2011-04-19Removed APPPATH.'third_party' from the packages autoloader to negate ↵Greg Aker1-1/+1
needless file stats if no packages exist or if the developer does not load any other packages by default.
2011-03-15Removed migrations folder, accidentally sneaked in during a bad merge.Phil Sturgeon1-32/+0
2011-03-09Removed migrate controller.Phil Sturgeon1-40/+0
2011-03-09Merged recent Core changes and fixed conflict.Phil Sturgeon7-73/+167
2011-03-09Would have helped if I saved the file before committing. see 849bdda643eeGreg Aker1-0/+15
2011-03-09Removing the unnecessary constructor in the welcome controller. Also added ↵Greg Aker1-6/+1
comments in the index method that may help users new to CodeIgniter.
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-09 11:18:19 +0100