summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-09-01Merge pull request #361 from Stolz/masterGreg Aker1-0/+5
2011-09-01Merge pull request #363 from mmestrovic/patch-3Greg Aker1-1/+1
2011-09-01Merge pull request #364 from mmestrovic/patch-4Phil Sturgeon1-1/+3
2011-09-01Updated download links for current and older versions.mmestrovic1-1/+3
2011-09-01Added reference for CUBRID database as supported in CI.mmestrovic1-1/+1
2011-08-31Merge pull request #359 from mmestrovic/patch-2Phil Sturgeon2-0/+5
2011-08-31Added missing profiler section (session_data)Stolz1-0/+5
2011-08-31Added step 2: Replace config/user_agents.phpmmestrovic1-0/+4
2011-08-31General changes: Added Windows 7 to the list of user platforms.mmestrovic1-0/+1
2011-08-31Removing class="reactor" from changelog items for 2.1.0 release. There is on...Greg Aker1-15/+15
2011-08-31Adding bare-bones 2.1.0 upgrade notes documentation file.Greg Aker1-0/+87
2011-08-31Merge pull request #350 from splitfeed/developGreg Aker2-8/+12
2011-08-30Fixed issue #105 SQL log errorsNiklas Nilsson2-8/+12
2011-08-30Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker26-55/+173
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 Sturgeon4-10/+21
2011-08-29Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon5-7/+6
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-28Merge pull request #326 from bubbafoley/patch-1Phil Sturgeon1-1/+1
2011-08-28Fix the default migration path.bubbafoley1-1/+1
2011-08-28always use charset config itemfreewil4-7/+10
2011-08-27Merge pull request #321 from Symvaro/developPhil Sturgeon2-0/+2
2011-08-27add Android user agentBruno Bierbaumer1-0/+1
2011-08-27add Android user agentBruno Bierbaumer1-0/+1
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
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 first...Phil Sturgeon1-2/+2
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 Sturgeon31-107/+410
2011-08-26Merge pull request #304 from MVUG/mvug_fixes_odbcPhil Sturgeon2-1/+2
2011-08-26Merge pull request #305 from p4ul/patch-2Greg Aker2-2/+7
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
2011-08-25Fix hiperlink Added html_escape() on changelogpurandi1-1/+1
2011-08-25Merge pull request #293 from frankmichel/developDerek Jones1-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 Aker3-0/+27
2011-08-25Merge pull request #290 from purandi/developGreg Aker1-1/+1