summaryrefslogtreecommitdiffstats
path: root/system/core
AgeCommit message (Expand)AuthorFilesLines
2011-08-28always use charset config itemfreewil1-1/+2
2011-08-26Changed CI_VERSION to represent develop branchEric Barnes1-1/+1
2011-08-26Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon5-15/+53
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
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-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-21Merge branch 'issue227' of https://github.com/johnbellone/CodeIgniter into de...Phil Sturgeon1-4/+4
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-21Ability to move the view folder out of the Application directoryJoe Cianflone1-1/+1
2011-08-15Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into de...Phil Sturgeon11-73/+420
2011-08-15Added some docs to CI core filesDavid Behler4-48/+221
2011-08-14Added some docs to CI core filesDavid Behler5-13/+110
2011-08-14Added some docs to CI core filesDavid Behler1-0/+14
2011-08-14Added some docs to CI core filesDavid Behler2-13/+64
2011-08-14Added some docs to CI core filesDavid Behler3-0/+32
2011-08-14Fixed conflict.Phil Sturgeon3-16/+38
2011-08-14Added some docs to CI core filesDavid Behler1-7/+22
2011-08-14Added some docs to CI core filesroot2-0/+18
2011-08-13Got changelog in sync with changes after v2.0.3 release branch merged a bunch...Phil Sturgeon1-1/+1
2011-08-13Bumped the version number. Can somebody with a working find and replace fix u...Phil Sturgeon1-1/+1
2011-08-13Fixed conflicts.Phil Sturgeon2-2/+2
2011-08-13Fixed conflict in changelog.Phil Sturgeon1-0/+15
2011-08-13Get php_sapi_name() == 'cli' involved in the 'is this the command line?' deci...Phil Sturgeon2-2/+2
2011-08-13Merged my GitHub mirror.Phil Sturgeon4-13/+45
2011-08-13Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into developPhil Sturgeon1-12/+46
2011-08-13If a config class was loaded first then a library with the same name is loade...Phil Sturgeon1-4/+4
2011-08-12Merging - fingers crossedPascal Kriete1-0/+15
2011-08-10Reset loaded files arrays in the Loader so the 404_override controller can ac...Shane Pearson2-11/+12
2011-08-10404_override route now works for missing controllers in subdirectories and fu...Shane Pearson2-2/+33
2011-07-23Added ->load->get_var() to check against ->load->_ci_cached_vars[].Phil Sturgeon1-0/+15
2011-07-02hand merged remaining unresolved files following the backout of 648b42a75739,...Derek Jones1-13/+48
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke...Derek Jones16-194/+194
2011-07-02hand merged remaining unresolved files following the backout of 648b42a75739,...Derek Jones16-194/+194
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It broke...Derek Jones16-194/+194
2011-06-15Merged base_url changes.philsturgeon1-12/+46
2011-05-08Wrapped all common functions to check if it already exists. This allows anyo...Dan Horrigan1-13/+48
2011-04-27Reverting last change. Don't know what I was thinking. :(Eric Barnes1-1/+1
2011-04-26Automatic base_url generation was missing a ending slash.Eric Barnes1-1/+1
2011-04-25Fixed double-space typo.Razican16-194/+194
2011-04-22Fixed re-searching for config file even though one had been loaded ($found wa...katzgrau1-1/+2
2011-04-21Flipping around contents of a conditional in _ci_load() so the small bits are...Greg Aker1-6/+6
2011-04-20Automated merge with http://hg.ellislab.com/CodeIgniter-ReactorGreg Aker2-24/+58