summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-08-20updated version number in user guide, removed some stray merge markers found ↵Derek Jones130-137/+131
in the change log
2011-08-13Bumped the version number. Can somebody with a working find and replace fix ↵Phil Sturgeon1-1/+1
up the docs?
2011-08-13Fixed conflicts in changelog.Phil Sturgeon2-2/+8
2011-08-13Fixed conflicts.Phil Sturgeon2-1/+3
2011-08-13Fixed conflicts.Phil Sturgeon3-2/+3
2011-08-13Improved logic for plural() and singular() as words like "tax" would become ↵Phil Sturgeon1-48/+67
"taxs" and it was tough to code in new rules.
2011-08-13Fixed conflict in changelog.Phil Sturgeon2-1/+3
2011-08-13Merge changelog.Adam Jackett1-0/+2
2011-08-13Fixed mysql and mysqli drivers to set NOT NULL as default for creating ↵Adam Jackett2-4/+12
fields. All other drivers were correct.
2011-08-13Added having() fix to changelog.Adam Jackett1-0/+1
2011-08-13Fixed having method to insert quotes.Adam Jackett1-1/+1
2011-08-13Added note for fixed issue #199 in changelog.Phil Sturgeon1-1/+2
2011-08-13Fixed issue #199 - Attributes passed as string does not include a space ↵Eric Barnes1-0/+4
between it and the opening tag.
2011-08-13Fixed conflict in changelog.Phil Sturgeon3-0/+23
2011-08-13sync total items count and total amount price; by sum of quantity of each ↵MarcosCoelho1-1/+3
item in cart
2011-08-13Fixed conflicted changelog.Phil Sturgeon3-2/+24
2011-08-13Was working on this file so PHP5ified the method visibility scopes. ↵Phil Sturgeon1-154/+106
Pointless, but was adding...
2011-07-15added .gitignore, removed .hg filesDerek Jones3-15/+9
2011-07-03reverted texb.ttf font which had been compromised in 982b43c3590a by a ↵Derek Jones1-0/+0
another massive whitespace 'cleanup' commit
2011-07-02hand merged remaining unresolved files following the backout of ↵Derek Jones229-2046/+2045
648b42a75739, which was a NON-trivial whitespace commit
2011-07-02backed out 648b42a75739, which was a NON-trivial whitespace commit. It ↵Derek Jones230-2110/+2110
broke the Typography class's string replacements, for instance
2011-06-22completed doc change for user_agent length increaseDerek Jones1-1/+1
2011-06-15Removed Alex's README.Phil Sturgeon1-8/+0
2011-06-15Merged base_url changes.philsturgeon4-42/+98
2011-06-15Automated merge with ssh://bitbucket.org/anaxamaxan/ci-docs-editphilsturgeon1-1/+1
2011-06-15Merged Alex Bilbies MSSQL changes.philsturgeon267-3118/+4088
2011-05-13Just edited the ridiculous bit about DOS in the CLI page.Anaxamaxan1-1/+1
2011-05-08Wrapped all common functions to check if it already exists. This allows ↵Dan Horrigan1-13/+48
anyone to override a lot more of the core by simply defining these function prior to loading them.
2011-05-06Fix #275 -- regression in db::_compile_select(). Thanks @patwork for the patchGreg Aker1-11/+15
2011-04-28hg flow init, add .hgflow filePhil Sturgeon1-0/+8
2011-04-27merging in changesGreg Aker232-2174/+2160
2011-04-27Added insert_batch() function to the PostgreSQL database driver. Thanks to ↵Greg Aker2-0/+19
epallerols for the patch.
2011-04-27Removed the GET, POST, and COOKIE Data from security since we now allow ↵Eric Barnes1-7/+1
$_GET data. Fixes #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-25swapping out preg_replace() in the driver library where str_replace() works ↵Greg Aker1-4/+4
just fine.
2011-04-25Fixed double-space typo.Razican230-2110/+2110
2011-04-25Fixed #74.Razican1-0/+5
2011-04-25Fixed #60.Razican1-11/+11
2011-04-25Fixed typo error in toc.html in documentation.Razican1-1/+1
2011-04-25Fixed #243 - Changed php version in the style guide to match requirements.Eric Barnes1-1/+1
2011-04-25Duplicate this->db->insert_batch in documentation. Fixes #202Eric Barnes1-24/+0
2011-04-23Removing debug code accidentally committed.Greg Aker1-1/+1
2011-04-23typo in modification to MySQLi driver. Fixes #236Derek Jones1-1/+1
2011-04-22default value of $total_rows in Pagination class should be number. And fix ↵kenjis2-3/+3
User Guide Pagination Class's Example which uses string to number variable.
2011-04-22Automated merge with http://hg.ellislab.com/CodeIgniter-ReactorGreg Aker1-2/+2
2011-04-22Fix #233 Fixing a regression in _get_validation_object() in the form helper ↵Greg Aker1-2/+2
after some refactoring the other day.
2011-04-22Fixed re-searching for config file even though one had been loaded ($found ↵katzgrau1-1/+2
was set to true, never reset). Also fixes getsparks issue.
2011-04-21Fix #235 error in form_helper docs.Greg Aker1-1/+1
2011-04-21Flipping around contents of a conditional in _ci_load() so the small bits ↵Greg Aker1-6/+6
are on top.