summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-08-26Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developDerek Jones11-20/+26
2011-08-26Changed CI_VERSION to represent develop branchEric Barnes1-1/+1
2011-08-26Merge pull request #310 from Razican/userguide-fixesPhil Sturgeon1-5/+2
Removed some documentation for PHP 4 users
2011-08-26Removed some documentation for PHP 4 users in the active record documentation.Iban Eguia1-5/+2
2011-08-26Fixed conflict with changelog.Phil Sturgeon2-0/+2
2011-08-26Fixed conflict in url_helper docs.Phil Sturgeon1-1/+1
2011-08-26Bumped URL Helper version number.Phil Sturgeon1-1/+1
2011-08-26Moved the "is_unique" change log to 2.1.0-dev where it should have been ↵Phil Sturgeon1-2/+2
first time. Sorry about that one, had to manually separate 2.0.3 changes from 2.1.0 based mainly on memory.
2011-08-26Removed some error suppression, which would hide a Notice if the path cannot ↵Phil Sturgeon1-1/+1
be read. I discovered this by foolishly passing the file_path, not the full_path but took forever for me to realise this as the error returned (thanks to this error suppression) was "GD is not installed" instead of "File cannot be read". Seeing that notice would have made much more sense.
2011-08-26Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon31-107/+410
2011-08-26Merge pull request #304 from MVUG/mvug_fixes_odbcPhil Sturgeon2-1/+2
odbc calls incorrect parent in construct
2011-08-26Merge pull request #305 from p4ul/patch-2Greg Aker2-2/+7
changed private functions to protected so MY_URI can override them.
2011-08-27spacing removedPaul1-1/+0
2011-08-27added core heading and note about protected functions in URIPaul1-0/+6
2011-08-26changed private functions to protected so MY_URI can override them.Paul1-2/+2
2011-08-25Fixed spelling mistake. Eric Barnes1-1/+1
2011-08-25odbc called incorrect parent in constructMichiel Vugteveen2-1/+2
2011-08-25oci8 driver escape string quotes fixMichiel Vugteveen2-0/+2
2011-08-25Merge pull request #299 from purandi/developEric Barnes1-1/+1
Fixed closing a tag on html_escape() function in changelog
2011-08-25Fix hiperlink Added html_escape() on changelogpurandi1-1/+1
2011-08-25Merge pull request #293 from frankmichel/developDerek Jones1-2/+2
fix for issue #292 with multiple language files
2011-08-25fixed logical operator OR in core/langFrank Michel1-1/+1
2011-08-25Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developDerek Jones38-129/+438
2011-08-25fix for issue #292 with multiple language filesFrank Michel1-2/+2
2011-08-25Merge pull request #291 from kenjis/html_escapeGreg Aker3-0/+27
add html_escape() function to escape HTML.
2011-08-25Merge pull request #290 from purandi/developGreg Aker1-1/+1
Fix link database driver on changelog
2011-08-25Added user voice link to readmeEric Barnes1-0/+1
2011-08-25Merge remote-tracking branch 'alexbilbie/csrf-override' into feature/csrf-verifyEric Barnes4-6/+26
Conflicts: system/core/Security.php
2011-08-25add html_escape() function to escape HTML.kenjis3-0/+27
2011-08-24Merge pull request #285 from khoogheem/developPhil Sturgeon2-8/+47
MIME Type Adds/Changes
2011-08-24whitespace updatesKevin Hoogheem1-5/+5
per Phil updating some whitespace issues
2011-08-24Merge pull request #270 from bubbafoley/extend-autoloaderPhil Sturgeon2-1/+2
make _ci_autoloader() protected so it can be properly extended.
2011-08-24Fix link database driver on changelogpurandi1-1/+1
2011-08-24Added note in changelogAlex Bilbie1-0/+1
2011-08-24Merge pull request #268 from bubbafoley/developEric Barnes2-3/+4
Fix #8 - Core classes can now be replaced
2011-08-24Removed bracket from last link.Eric Barnes1-1/+1
2011-08-24MIME Type Adds/ChangesKevin Hoogheem2-8/+47
Updated MIME Types with certs and new audio/video files as well as added extra types for some existing files.
2011-08-24Added readme for github project pageEric Barnes1-0/+10
2011-08-24Changed doc block options. Fixes #100Eric Barnes1-1/+1
2011-08-24Changed doc block options. Fixes #100Eric Barnes1-1/+1
2011-08-24Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniter into developEric Barnes0-0/+0
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-23add a note to the changelog about _ci_autloader()Shane Pearson1-0/+1
2011-08-23make _ci_autoloader() protected so it can be properly extended.Shane Pearson1-1/+1
2011-08-22updated changelog messageShane Pearson1-1/+1
2011-08-22Fix #8 - Load core classes from the application folder first.Shane Pearson2-3/+4
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
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-12-19 19:40:00 +0100