summaryrefslogtreecommitdiffstats
path: root/user_guide
AgeCommit message (Collapse)AuthorFilesLines
2011-08-21Merge branch 'develop' into feature/unit-testsGreg Aker2-0/+10
2011-08-21Merge pull request #240 from chonthu/developPhil Sturgeon2-0/+10
updated changelog and documentation for active record new 3rd argument op
2011-08-21Merge branch 'develop' into feature/unit-testsGreg Aker4-19/+19
2011-08-21Fixed more awesome stuff.Phil Sturgeon1-1/+1
2011-08-21Fixed some stuff.Phil Sturgeon1-1/+1
2011-08-21updated changelog and documentation for active record new 3rd argument ↵Nithin Meppurathu2-0/+12
option #none# to like clause
2011-08-21Merge branch 'resolve_issue_65' of https://github.com/benedmunds/CodeIgniter ↵Greg Aker1-1/+2
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 Aker1-0/+1
into benedmunds-resolve_issue_48 Conflicts: user_guide/changelog.html
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 Aker1-0/+1
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 Aker1-0/+1
db->count_all() then db->get()
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' into feature/unit-testsGreg Aker138-1194/+1291
Conflicts: .hgignore
2011-08-20added 'planned' to version number in changelogDerek Jones1-1/+1
2011-08-20Merge branch 'release/v2.0.3' into developDerek Jones130-133/+133
Conflicts: user_guide/changelog.html
2011-08-20updated version number in user guide, removed some stray merge markers found ↵Derek Jones130-137/+131
in the change log
2011-08-14Added increment_string() docs and changelog.Phil Sturgeon2-0/+12
2011-08-14Driver children can be located in any package path. Thanks Namaless.Phil Sturgeon1-0/+1
2011-08-14Fixed a bug (Reactor #89) where MySQL export would fail if the table had ↵Phil Sturgeon1-3/+4
hyphens or other non alphanumeric/underscore characters.
2011-08-13Got changelog in sync with changes after v2.0.3 release branch merged a ↵Phil Sturgeon1-8/+39
bunch of stuff. Anyone moving a develop change into v2.0.3 should move the changelog item too.
2011-08-13Fixed conflicts in changelog.Phil Sturgeon1-1/+7
2011-08-13Fixed conflicts.Phil Sturgeon1-0/+2
2011-08-13Fixed conflicts.Phil Sturgeon1-0/+1
2011-08-13Fixed conflict in changelog.Phil Sturgeon1-0/+1
2011-08-13Merge changelog.Adam Jackett1-0/+2
2011-08-13Added having() fix to changelog.Adam Jackett1-0/+1
2011-08-13Added note for fixed issue #199 in changelog.Phil Sturgeon1-1/+2
2011-08-13Fixed conflict in changelog.Phil Sturgeon2-0/+8
2011-08-13Fixed conflicted changelog.Phil Sturgeon2-2/+9
2011-08-13Get php_sapi_name() == 'cli' involved in the 'is this the command line?' ↵Phil Sturgeon1-0/+1
decision.
2011-08-13Merged my GitHub mirror.Phil Sturgeon1-0/+1
2011-08-13Merge branch 'develop' of ellislab.beanstalkapp.com:/codeigniter into developPhil Sturgeon4-4/+24
2011-08-13If a config class was loaded first then a library with the same name is ↵Phil Sturgeon1-0/+1
loaded, the config would be ignored.
2011-08-12Merging - fingers crossedPascal Kriete9-30/+61
Conflicts: system/database/drivers/mysql/mysql_driver.php system/database/drivers/mysqli/mysqli_driver.php system/libraries/Email.php user_guide/changelog.html user_guide/database/configuration.html user_guide/helpers/url_helper.html user_guide/libraries/cart.html user_guide/libraries/form_validation.html
2011-08-11Adding a note to the changelog about 404_overrideShane Pearson1-0/+1
2011-08-10Typecast limit and offset in the Database Driver to integers. Fixes ↵Phil Sturgeon1-0/+1
https://bitbucket.org/ellislab/codeigniter-reactor/issue/341/active-record-limit-function-have-sql#comment-597403
2011-08-10Added application/x-csv as a mime.Phil Sturgeon1-0/+1
2011-08-10Fixed #378 Robots identified as regular browsers by the User Agent class.Phil Sturgeon1-5/+6
2011-08-10Fixed a bug where Email library attachments with a . in the name would using ↵Phil Sturgeon1-0/+1
invalid MIME-types.
2011-08-10Fixed a bug where using this->db->select_max(), this->db->select_min(), etc ↵Phil Sturgeon1-0/+1
could throw notices. Thanks to w43l for the patch.
2011-08-09Merge branch 'develop' of github.com:philsturgeon/codeigniter-reactor into ↵Phil Sturgeon1-0/+1
develop
2011-08-09Merge pull request #29 from darkhouse/developPhil Sturgeon1-0/+1
Minor change to MySQL and MySQLi drivers.
2011-08-09Merged conflict.Phil Sturgeon2-8/+6
2011-07-23Added having() fix to changelog.Adam Jackett1-0/+1