summaryrefslogtreecommitdiffstats
path: root/system
AgeCommit message (Expand)AuthorFilesLines
2011-09-04utilizing ternary syntax to clean up some conditionalsAaron Kuzemchak1-40/+6
2011-09-04Enables real page numbers for URI segment in Pagination libraryAaron Kuzemchak1-12/+73
2011-09-03Merge pull request #379 from tomcode/language-set-typosPhil Sturgeon1-1/+1
2011-09-03Changed up to down for down method error lineThomas Traub1-1/+1
2011-09-02fixes potential SQL injection vector in Active Record offset()kenjis1-1/+1
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-30Fixed issue #105 SQL log errorsNiklas Nilsson1-8/+11
2011-08-30Added the 'user_data' key to the userdata property so that sessions using a d...Kyle Farris1-1/+2
2011-08-30Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker16-38/+86
2011-08-30A bit more cleanup in the date helper.Greg Aker1-59/+54
2011-08-30CI Coding standards cleanup in the date helper.Greg Aker1-25/+40
2011-08-30Merge pull request #325 from freewil/developPhil Sturgeon3-10/+19
2011-08-29Merge remote-tracking branch 'upstream/develop' into developMichael Dennis23-104/+261
2011-08-29Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon2-2/+2
2011-08-28always use charset config itemfreewil2-5/+13
2011-08-28Fixed recent change to $this->db->field_data() which errored for field types ...Phil Sturgeon2-4/+4
2011-08-28Fix the default migration path.bubbafoley1-1/+1
2011-08-28always use charset config itemfreewil3-7/+8
2011-08-26Changed CI_VERSION to represent develop branchEric Barnes1-1/+1
2011-08-26Fixed conflict with changelog.Phil Sturgeon1-0/+1
2011-08-26Removed some error suppression, which would hide a Notice if the path cannot ...Phil Sturgeon1-1/+1
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-26Small formatting fix.kylefarris1-1/+1
2011-08-26Added get_compiled_select(), get_compiled_insert(), get_compiled_update(), ge...Kyle Farris1-34/+223
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-24Updated version function to use PDO constantTimothy Warren2-2/+2
2011-08-24Merge pull request #270 from bubbafoley/extend-autoloaderPhil Sturgeon1-1/+1
2011-08-24Fixed class comment and reconnect functionTimothy Warren1-2/+6
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-23Fixed db->close() and db->free_result() functionsTimothy Warren2-3/+2
2011-08-23Got PDO workingTimothy Warren2-93/+42
2011-08-23make _ci_autoloader() protected so it can be properly extended.Shane Pearson1-1/+1
2011-08-23Started PDO db driverTimothy Warren5-0/+1246
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