summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-21Fixed more awesome stuff.Phil Sturgeon1-1/+1
2011-08-21Fixed some stuff.Phil Sturgeon1-1/+1
2011-08-21Nah, who needs this?John Bellone1-0/+3
2011-08-21Merge pull request #232 from dhorrigan/error_reporting_levelEric Barnes1-1/+1
Changed the 'development' environment default error reporting.
2011-08-21Changed error reporting level to -1, which will show ALL PHP errors. This ↵Dan Horrigan1-1/+1
will future-proof the solution. Thanks @ericbarnes for pointing that out.
2011-08-21Returning value from _setup_memcached() nowJohn Bellone1-3/+2
2011-08-21Fixing configurationJohn Bellone1-3/+16
2011-08-21Changed the 'development' environment default error reporting to included ↵Dan Horrigan1-1/+1
E_STRICT errors. E_ALL does not include these errors.
2011-08-21Formatting, damn tabsJohn Bellone1-3/+3
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 Aker2-2/+3
into benedmunds-resolve_issue_65 Conflicts: user_guide/changelog.html
2011-08-21Small tweak to the changlog item from the previous commitGreg Aker1-1/+1
2011-08-21Merge branch 'resolve_issue_48' of https://github.com/benedmunds/CodeIgniter ↵Greg Aker2-4/+4
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
2011-08-21Added notes to changelogBen Edmunds1-0/+1
2011-08-21Added changes to changelogBen Edmunds1-0/+1
2011-08-20Fixed a bug (#181) where a mis-spelling was in the form validation language ↵Greg Aker2-1/+2
file.
2011-08-20Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker1-9/+9
2011-08-20Fixed a bug (#200) where MySQL queries would be malformed after calling ↵Greg Aker10-0/+10
db->count_all() then db->get()
2011-08-20Resolved issue 65 - made action on form_open_multipart helper function call ↵Ben Edmunds1-1/+1
optional
2011-08-20Resolved issue 48. Removed unneeded array copy.Ben Edmunds1-2/+2
2011-08-20Resolved issue 160. Removed unneeded array copy.Ben Edmunds1-3/+2
2011-08-20Merge pull request #209 from benedmunds/resolve_issue_176Greg Aker1-9/+9
Resolve issue 176 - User Guide: Input Class Out-of-Dated and Wrong Samples
2011-08-20Resolved issue 167 - Input Class Userguide UpdateBen Edmunds1-9/+9
2011-08-20Merge branch 'master' into developGreg Aker1-8/+4
2011-08-20Removing duplicate instructions in the 2.0.3 update instructions.Greg Aker1-8/+4
2011-08-20Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developGreg Aker45-271/+2560
2011-08-20Merge pull request #203 from FrenkyNet/developDerek Jones1-1/+1
Removed unneeded code in CI_Email's set_alt_message.
2011-08-20added 'planned' to version number in changelogDerek Jones1-1/+1
2011-08-20Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniterDerek Jones1-1/+1
2011-08-20Merge branch 'release/v2.0.3' into developDerek Jones130-133/+133
Conflicts: user_guide/changelog.html
2011-08-20Merge branch 'release/v2.0.3'Derek Jones142-348/+387
2011-08-20updated version number in user guide, removed some stray merge markers found ↵Derek Jones130-137/+131
in the change log
2011-08-15Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon12-74/+423
develop
2011-08-15Merge pull request #52 from waldmeister/developPhil Sturgeon5-49/+224
Added some docs to CI core files
2011-08-15Added some docs to CI core filesDavid Behler5-49/+224
2011-08-15Merge pull request #51 from waldmeister/developPhil Sturgeon5-13/+110
Added some docs to CI core files
2011-08-14Added some docs to CI core filesDavid Behler5-13/+110
2011-08-14Merge pull request #50 from waldmeister/developPhil Sturgeon1-0/+14
Develop - Added some docs to CI core files
2011-08-14Added some docs to CI core filesDavid Behler1-0/+14
2011-08-14Merge pull request #49 from waldmeister/developPhil Sturgeon5-13/+96
Added some doc blocks to some CI core files
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-14Added increment_string() docs and changelog.Phil Sturgeon3-1/+15
2011-08-14Merge branch 'master' of ellislab.beanstalkapp.com:/codeigniterPhil Sturgeon3-15/+9