summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-08-23Merge pull request #275 from appleboy/developEric Barnes1-1/+1
User Guide error on upgrade_203.html file
2011-08-23Update: User Guide error on upgrade_203.html fileBo-Yi Wu1-1/+1
2011-08-22Merge pull request #258 from yterajima/issue56Greg Aker1-2/+2
Fixed #56:_compile_session_data() should be 'protected'
2011-08-22Fixed #56yterajima1-2/+2
_compile_session_data() is 'protected' to be able to extend MY_Profiler.
2011-08-21Merge pull request #253 from chonthu/developPhil Sturgeon3-5/+21
added ability to log certain error types, not all under a threshold
2011-08-21Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker3-2/+37
2011-08-21Fixing a spelling error.Greg Aker1-1/+1
2011-08-21Merge pull request #235 from JoeCianflone/developEric Barnes3-2/+37
Ability to move the view folder out of the Application directory
2011-08-21Merge pull request #255 from kylefarris/masterGreg Aker3-0/+87
New Date Helper Function and More Documentation
2011-08-22Added documentation for the nice_date function in the date_helper.Kyle Farris1-0/+14
2011-08-22Added documentation for some other rule someone added but didn't document.Kyle Farris1-0/+7
2011-08-22Added a function that's able to take some really bad date formats from ↵Kyle Farris1-0/+66
systems that idiots wrote and convert them to something useful.
2011-08-21Merge pull request #247 from danmontgomery/developPhil Sturgeon5-15/+26
Fixes issue #150, field_data() now returns the actual column length
2011-08-21Merge pull request #251 from darkhouse/feature/issue26Phil Sturgeon3-26/+36
Fixed issue #26. Added max_filename_increment as a config setting.
2011-08-21added ability to log certain error types, not all under a thresholdNithin3-5/+21
2011-08-21Merge pull request #234 from johnbellone/issue31Greg Aker1-1/+1
Fix #31: Changing to set as add will not save over existing value
2011-08-21Updated changelog for max_filename_increment setting.Adam Jackett1-0/+1
2011-08-21Merge pull request #230 from dhorrigan/developGreg Aker1-3/+3
A few small tweaks to CI_Email
2011-08-21Fixed issue #26. Added max_filename_increment as a config setting.Adam Jackett2-26/+35
2011-08-21Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker3-1/+11
2011-08-21Fixed issue #150 (for mysql and mysqli), now returns the actual column length.danmontgomery5-15/+26
2011-08-21Merge pull request #240 from chonthu/developPhil Sturgeon2-0/+10
updated changelog and documentation for active record new 3rd argument op
2011-08-21Added documentation to the user guideJoe Cianflone1-1/+3
2011-08-21Merge pull request #238 from danmontgomery/patch-1Phil Sturgeon1-1/+1
Fix #106: select_max() problem with Reserved Words
2011-08-21Fix for issue #106Dan Montgomery1-1/+1
2011-08-21Cleaning up some tabs/spaces issues. Also stripped trailing white space ↵Greg Aker1-52/+51
from the file.
2011-08-21Merge branch 'issue45' of https://github.com/johnbellone/CodeIgniter into ↵Greg Aker1-9/+39
johnbellone-issue45
2011-08-21I hate tabsJohn Bellone1-2/+2
2011-08-21Fixing stylish thingsJohn Bellone1-5/+10
2011-08-21Fixed more awesome stuff.Phil Sturgeon1-1/+1
2011-08-21Fixed some stuff.Phil Sturgeon1-1/+1
2011-08-21updated changelog and documentation for active record new 3rd argument ↵Nithin Meppurathu2-0/+12
option #none# to like clause
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 Cianflone2-1/+34
* index.php -- added the $view_folder var and VIEWPATH constant * Loader.php -- changed the private _ci_view_paths var so that it's not hardcoded to the view dir, but looks for the VIEWPATH constant instead
2011-08-21Nah, who needs this?John Bellone1-0/+3
2011-08-21Merge pull request #232 from dhorrigan/error_reporting_levelEric Barnes1-1/+1
Changed the 'development' environment default error reporting.
2011-08-21Changed error reporting level to -1, which will show ALL PHP errors. This ↵Dan Horrigan1-1/+1
will future-proof the solution. Thanks @ericbarnes for pointing that out.
2011-08-21Returning value from _setup_memcached() nowJohn Bellone1-3/+2
2011-08-21Fixing configurationJohn Bellone1-3/+16
2011-08-21Changed the 'development' environment default error reporting to included ↵Dan Horrigan1-1/+1
E_STRICT errors. E_ALL does not include these errors.
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
ternary. Also fixed the doc block.
2011-08-21Changed set_alt_message() to cast the message a string to prevent possible ↵Dan Horrigan1-1/+1
issues when sending NULL or FALSE.
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
Added ability for db like param $side to use 'none'
2011-08-21Added ability to _like paramater side to use 'none', in case one wants to ↵Nithin1-2/+6
query like instead of where without case being sensitive
2011-08-21Merge branch 'resolve_issue_65' of https://github.com/benedmunds/CodeIgniter ↵Greg Aker2-2/+3
into benedmunds-resolve_issue_65 Conflicts: user_guide/changelog.html
2011-08-21Small tweak to the changlog item from the previous commitGreg Aker1-1/+1
2011-08-21Merge branch 'resolve_issue_48' of https://github.com/benedmunds/CodeIgniter ↵Greg Aker2-4/+4
into benedmunds-resolve_issue_48 Conflicts: user_guide/changelog.html
2011-08-21Removed unneeded code in CI_Email's set_alt_message.Frank de Jonge1-1/+1