summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2011-08-26Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon18-96/+252
2011-08-26Merge pull request #304 from MVUG/mvug_fixes_odbcPhil Sturgeon1-1/+1
2011-08-26changed private functions to protected so MY_URI can override them.Paul1-2/+2
2011-08-25odbc called incorrect parent in constructMichiel Vugteveen1-1/+1
2011-08-25oci8 driver escape string quotes fixMichiel Vugteveen1-0/+1
2011-08-25fixed logical operator OR in core/langFrank Michel1-1/+1
2011-08-25fix for issue #292 with multiple language filesFrank Michel1-2/+2
2011-08-25Merge pull request #291 from kenjis/html_escapeGreg Aker1-0/+24
2011-08-25Merge remote-tracking branch 'alexbilbie/csrf-override' into feature/csrf-verifyEric Barnes1-6/+20
2011-08-25add html_escape() function to escape HTML.kenjis1-0/+24
2011-08-24Merge pull request #270 from bubbafoley/extend-autoloaderPhil Sturgeon1-1/+1
2011-08-24Merge pull request #268 from bubbafoley/developEric Barnes1-3/+3
2011-08-24Changed doc block options. Fixes #100Eric Barnes1-1/+1
2011-08-23make _ci_autoloader() protected so it can be properly extended.Shane Pearson1-1/+1
2011-08-22Fix #8 - Load core classes from the application folder first.Shane Pearson1-3/+3
2011-08-22Fixed #56yterajima1-2/+2
2011-08-21Merge pull request #253 from chonthu/developPhil Sturgeon1-5/+16
2011-08-21Merge branch 'issue227' of https://github.com/johnbellone/CodeIgniter into de...Phil Sturgeon1-4/+4
2011-08-21Merge pull request #235 from JoeCianflone/developEric Barnes1-1/+1
2011-08-21Merge pull request #255 from kylefarris/masterGreg Aker1-0/+66
2011-08-22Added a function that's able to take some really bad date formats from system...Kyle Farris1-0/+66
2011-08-21Merge pull request #247 from danmontgomery/developPhil Sturgeon4-15/+25
2011-08-21Merge pull request #251 from darkhouse/feature/issue26Phil Sturgeon1-26/+28
2011-08-21added ability to log certain error types, not all under a thresholdNithin1-5/+16
2011-08-21Merge pull request #234 from johnbellone/issue31Greg Aker1-1/+1
2011-08-21Merge pull request #230 from dhorrigan/developGreg Aker1-3/+3
2011-08-21Fixed issue #26. Added max_filename_increment as a config setting.Adam Jackett1-26/+28
2011-08-21Merge branch 'develop' of https://github.com/waldmeister/codeigniter-reactor ...Phil Sturgeon1-1/+1
2011-08-21Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker1-1/+1
2011-08-21Fixed issue #150 (for mysql and mysqli), now returns the actual column length.danmontgomery4-15/+25
2011-08-21Fix for issue #106Dan Montgomery1-1/+1
2011-08-21Cleaning up some tabs/spaces issues. Also stripped trailing white space from...Greg Aker1-52/+51
2011-08-21Merge branch 'issue45' of https://github.com/johnbellone/CodeIgniter into joh...Greg Aker1-9/+39
2011-08-21I hate tabsJohn Bellone1-2/+2
2011-08-21Fixing stylish thingsJohn Bellone1-5/+10
2011-08-21Changed orderJohn Bellone1-1/+1
2011-08-21Making changes to stop remote spoofingJohn Bellone1-4/+4
2011-08-21Added new config parameter "csrf_exclude_uris" which allows for URIs to be wh...Alex Bilbie1-1/+11
2011-08-21Revert 43194ea1af658914a89ca49aed4dca4617b9c4ff^..HEADAlex Bilbie2-50/+19
2011-08-21Changing to set as add will not save over existing valueJohn Bellone1-1/+1
2011-08-21Ability to move the view folder out of the Application directoryJoe Cianflone1-1/+1
2011-08-21Nah, who needs this?John Bellone1-0/+3
2011-08-21Returning value from _setup_memcached() nowJohn Bellone1-3/+2
2011-08-21Fixing configurationJohn Bellone1-3/+16
2011-08-21Formatting, damn tabsJohn Bellone1-3/+3
2011-08-21Changed set_wordwrap() to cast the parameter as a boolean instead of using a ...Dan Horrigan1-2/+2
2011-08-21Changed set_alt_message() to cast the message a string to prevent possible is...Dan Horrigan1-1/+1
2011-08-21Fixed problem with needless seperator at begin/end of stringDavid Behler1-1/+1
2011-08-21Making changes to support other Memcached extensionJohn Bellone1-2/+12
2011-08-21Merge pull request #223 from chonthu/patch-1Eric Barnes1-2/+6