summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-11-22Merge master (2.1.0) and fixed conflicts.Phil Sturgeon9-45/+57
2011-11-22Readded PDO drivers.Phil Sturgeon5-15/+565
2011-11-21Updated syntax in changewlog.Phil Sturgeon1-1/+1
2011-11-16Migrations - Changed config migration_version to state it is used in ↵Eric Barnes2-25/+22
migration->current. Removed white space and coding standards.
2011-11-14Merge pull request #670 from zwilias/developDerek Jones1-14/+14
Use `#.` instead of simply `#` to activate github's auto-enumerator
2011-11-14Use `#.` instead of simply `#` to activate github's auto-enumeratorIlias Van Peer1-14/+14
2011-11-14Merge branch 'release/2.1.0'Pascal Kriete202-731/+5366
Conflicts: user_guide/helpers/url_helper.html
2011-11-14Changelogging and setting release date.Pascal Kriete1-2/+3
2011-11-14Tweaking the xss filter for IE <comment> tags, parameter injection, and ↵Pascal Kriete1-50/+41
weird html5 attributes.
2011-11-14Removing stray docblocksPascal Kriete1-12/+0
2011-11-13Fixed conflicts.Phil Sturgeon6-165/+185
2011-11-13Changelog tweaking the Sphinx docs to match old HTML docs for 2.1 and ↵Phil Sturgeon1-22/+52
accurately describe what 3.0 has added so far.
2011-11-13More changelog tweaking.Phil Sturgeon1-0/+3
2011-11-13Added TLS and SSL support to Email library. Fixes issue #171Radu Potop1-1/+19
2011-11-13Resolved issue 65 - made action on form_open_multipart helper function call ↵Ben Edmunds1-1/+1
optional
2011-11-13Updated changelog.Phil Sturgeon1-9/+10
2011-11-13Fix invalid datetime formatSyahril Zulkefli1-3/+3
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Merge pull request #665 from syahzul/developPhil Sturgeon2-4/+4
Fixed invalid date time format in date_helper and xmlrpc library.
2011-11-13Fix invalid datetime formatSyahril Zulkefli1-3/+3
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Fix invalid date formatSyahril Zulkefli1-1/+1
2011-11-13Merge pull request #664 from andrew-s/developEric Barnes1-0/+1
Added in BingBot, MSNBot is being phased out
2011-11-12Added in BingBot, MSNBot is being phased outAndrew Seymour1-0/+1
2011-11-12Modified spacing of user agent arraysEric Barnes1-157/+157
2011-11-12Merge pull request #663 from appleboy/bug/agentEric Barnes1-5/+8
Fix issue #652 : Add OpenWeb Mobile User Agent
2011-11-12Merge pull request #662 from cloudmanic/patch-1Eric Barnes1-1/+1
Fixed small typeo
2011-11-12Add OpenWeb Mobile User AgentBo-Yi Wu1-5/+8
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2011-11-12Fixed small typeoCloudmanic Labs, LLC1-1/+1
2011-11-12Merge pull request #639 from timw4mail/patch-3Eric Barnes1-4/+19
Fixed one-liner code on Database Connection page of userguide
2011-11-11Merge pull request #653 from mpmont/developGreg Aker2-0/+2
Added the mime type for pptx.
2011-11-10Fix some typopurwandi1-2/+2
2011-11-10Modified repo from mercurial to git on User Guidepurwandi1-4/+4
2011-11-08Changelog update.mpmont1-0/+1
2011-11-08Merge branch 'develop' of github.com:EllisLab/CodeIgniter into developPhil Sturgeon5-19/+29
2011-11-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-11-08Merge branch 'release/2.1.0' of github.com:EllisLab/CodeIgniter into ↵Phil Sturgeon1-1/+1
release/2.1.0
2011-11-08Added ->db->replace() for MySQLi.Phil Sturgeon1-0/+19
2011-11-08Updating changelogAaron Kuzemchak1-0/+1
2011-11-08Enables real page numbers for URI segment in Pagination libraryAaron Kuzemchak2-13/+78
2011-11-08Merge pull request #654 from polyetilen/patch-1Phil Sturgeon1-1/+1
Update user_guide_src/source/tutorial/static_pages.rst
2011-11-08Update user_guide_src/source/tutorial/static_pages.rstAleksandras Ragovskis1-1/+1
2011-11-08Added the mime type for pptx. The new Power point format.mpmont1-0/+1
2011-11-07Adding auto-detection of best redirect method in url_helper.Brandon Jones2-11/+18
2011-11-07Merge pull request #651 from polyetilen/patch-1Phil Sturgeon1-1/+1
Logic error in pages tutorial code example.
2011-11-07Syntax errorpolyetilen1-1/+1
2011-11-05Merge pull request #648 from daparky/release/2.1.0Phil Sturgeon1-1/+1
Changelog HTML fix.
2011-11-04The link to common functions wasn't closed properly under the 'Added ↵daparky1-1/+1
html_escape() to the Common functions' change.
2011-11-02Copied into GitHub from @kenjis 's bitbucket ↵saintnicster1-2/+37
repo.https://bitbucket.org/kenjis/ci-user-guide/changeset/3d579dd14afe