summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Collapse)AuthorFilesLines
2011-08-31One more formatting fix.Kyle Farris1-5/+5
2011-08-31Merged changes with development.Kyle Farris1-4/+8
2011-08-31Fixed some items based on code comments by gaker.Kyle Farris1-47/+49
2011-08-26Small formatting fix.kylefarris1-1/+1
2011-08-26Added get_compiled_select(), get_compiled_insert(), get_compiled_update(), ↵Kyle Farris1-34/+223
get_compiled_delete(), and reset_query() methods. to the Active Record class.
2011-08-26changed private functions to protected so MY_URI can override them.Paul1-2/+2
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
add html_escape() function to escape HTML.
2011-08-25Merge remote-tracking branch 'alexbilbie/csrf-override' into feature/csrf-verifyEric Barnes1-6/+20
Conflicts: system/core/Security.php
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
make _ci_autoloader() protected so it can be properly extended.
2011-08-24Merge pull request #268 from bubbafoley/developEric Barnes1-3/+3
Fix #8 - Core classes can now be replaced
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
_compile_session_data() is 'protected' to be able to extend MY_Profiler.
2011-08-21Merge pull request #253 from chonthu/developPhil Sturgeon1-5/+16
added ability to log certain error types, not all under a threshold
2011-08-21Merge pull request #235 from JoeCianflone/developEric Barnes1-1/+1
Ability to move the view folder out of the Application directory
2011-08-21Merge pull request #255 from kylefarris/masterGreg Aker1-0/+66
New Date Helper Function and More Documentation
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 Sturgeon4-15/+25
Fixes issue #150, field_data() now returns the actual column length
2011-08-21Merge pull request #251 from darkhouse/feature/issue26Phil Sturgeon1-26/+28
Fixed issue #26. Added max_filename_increment as a config setting.
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
Fix #31: Changing to set as add will not save over existing value
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 Jackett1-26/+28
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 ↵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-21Added new config parameter "csrf_exclude_uris" which allows for URIs to be ↵Alex Bilbie1-1/+11
whitelisted from CSRF verification. Fixes #149
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
* 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-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
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 Aker1-1/+1
into benedmunds-resolve_issue_65 Conflicts: user_guide/changelog.html
2011-08-21Merge branch 'resolve_issue_48' of https://github.com/benedmunds/CodeIgniter ↵Greg Aker1-4/+3
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