summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2012-03-02Merge pull request #1100 from rrdial/2.1-stableAndrey Andreev2-6/+7
2.1-stable: bug fix: compile binds before caching the query…
2012-03-01compile binds before caching the query, otherwise the cached query will ↵Ryan Dial2-6/+7
never match the unbound query. updated changlog to mention bug fix.
2012-02-12Merge pull request #757 from narfbg/2.1-stablePhil Sturgeon2-24/+83
Improve CI_Upload::_file_mime_type() realiability (2.1-stable)
2011-12-26Merge pull request #709 from tubalmartin/2.1-stablePhil Sturgeon1-0/+14
2.1.0 - Fatal error: Call to undefined method CI_DB_Driver::_reset_select()
2011-12-15Merge remote-tracking branch 'upstream/2.1-stable' into 2.1-stableAndrey Andreev2-1/+2
2011-12-14Merge pull request #766 from andrewmackrodt/2.1-stablePhil Sturgeon2-1/+2
Fixed issue #538: CI_Image_lib->new_image doesn't recognise backslashes
2011-12-13Tweak MIME regular expression check againAndrey Andreev1-1/+1
2011-12-11Updated changelog with fix for bug #538.Andrew Mackrodt1-0/+1
2011-12-11Fix regular expression for validating MIME type stringAndrey Andreev1-1/+1
2011-12-11Fix for Issue #538.Andrew Mackrodt1-1/+1
2011-12-09Update the ChangeLogAndrey Andreev1-0/+5
2011-12-09Improve CI_Upload::_file_mime_type()Andrey Andreev1-24/+78
2011-12-02Merge pull request #733 from narfbg/2.1-stable-upload-hotfixPhil Sturgeon2-3/+7
Hotfix for a bug in the Upload library
2011-12-02Update the change logAndrey Andreev1-1/+2
2011-12-02Update a comment, just to be clearerAndrey Andreev1-1/+1
2011-12-02Hotfix for a file type detection bug in the Upload libraryAndrey Andreev1-2/+5
2011-12-01Merge pull request #729 from Repox/2.1-stablePhil Sturgeon1-2/+8
This fixes issue #725
2011-12-01This fixes issue #725Repox1-2/+8
2011-11-27Merge pull request #710 from johnnicely/2.1-stablePhil Sturgeon2-1/+2
Changed form_open() to compare $action against base_url().
2011-11-24Changed form_open() to compare $action against base_url()John Nicely2-1/+2
Checking for strpos($action, $CI->config->site_url()) === FALSE causes CSRF token to not be added in form_open() output. When site_url()'s first parameter ($uri) is empty, site_url's return value is the base URL plus the $CI->config->item('index_page') value. form_open() and CodeIgniter's URI routing do not require index.php to be in the URL, so any call to form_open() in which the $action parameter does not have index.php will always return false for the strpos() call.
2011-11-24Added dummy _reset_select() method to CI_DB_Driver class to allow Active ↵Túbal Martín1-0/+14
Record class to be disabled. Otherwise a fatal error is triggered.
2011-11-23Merge pull request #697 from MVUG/upload-fixes-2.1Phil Sturgeon3-3/+20
Fixed bug in Upload library tmp_path does not exists, should be tmp_name.
2011-11-23dutch typoMichiel Vugteveen1-1/+1
2011-11-23changelog updatedMichiel Vugteveen1-0/+17
2011-11-23tmp_path does not exists, should be tmp_nameMichiel Vugteveen1-1/+1
2011-11-23docx and xlsx have a zip/application mimetypeMichiel Vugteveen1-2/+2
2011-11-22Readded PDO drivers.Phil Sturgeon5-15/+565
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-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-10Fix some typopurwandi1-2/+2
2011-11-10Modified repo from mercurial to git on User Guidepurwandi1-4/+4
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-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
2011-11-02updated changelog messageShane Pearson1-1/+1
2011-11-02Fix #8 - Load core classes from the application folder first.Shane Pearson2-5/+5
2011-11-02Merge branch 'release/2.1.0' of github.com:EllisLab/CodeIgniter into ↵Phil Sturgeon1-1/+1
release/2.1.0