summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-10-04Merge branch 'ci-issue-60' of github.com:narfbg/CodeIgniter into ci-issue-60Andrey Andreev1-1/+1
2011-10-04CI_Upload::_file_mime_typeAndrey Andreev1-0/+1
2011-10-04Merge upstream changesAndrey Andreev19-74/+77
2011-10-04Merge pull request #513 from freewil/core-cleanupPhil Sturgeon2-20/+1
cleanup docblocks, remove dated CI_CORE constant
2011-10-04add meta charset tag to error templateskenjis3-0/+3
2011-10-04Merge pull request #523 from rhbecker/developPhil Sturgeon2-31/+9
Issue 352: Since the MySQL client API version matters, PHP and MySQL vers
2011-10-04Issue 352: Since the MySQL client API version matters, PHP and MySQL version ↵RH Becker2-31/+9
checks are not sufficient to determine that set_charset functions exist.
2011-10-03Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren9-10/+49
2011-10-01Merge pull request #508 from wooptoo/developPhil Sturgeon3-2/+34
Added TLS and SSL support to Email library
2011-09-30add changelog note about CI_CORE removalfreewil1-0/+1
2011-09-30cleanup docblocks, remove dated CI_CORE constantfreewil1-20/+0
2011-09-29style edit, print error if crypto failsRadu Potop1-1/+11
2011-09-29add missing @param tagfreewil1-0/+1
2011-09-29remove redundant 'if' in typography helperfreewil1-6/+0
2011-09-28Merge pull request #494 from cenk/patch-1Phil Sturgeon3-0/+7
XHTML Basic 1.1 (xhtml-basic11) doctype.
2011-09-28Merge pull request #498 from appleboy/guidePhil Sturgeon3-7/+7
Update user guide to fix #496 issue
2011-09-28Merge pull request #504 from juanjosegzl/developPhil Sturgeon1-1/+1
Fixing issue 465: select_max is adding prefix to table aliases when is no
2011-09-28Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren8-12/+18
2011-09-28Updated documentation for TLS and SSL support in Email library.Radu Potop2-1/+5
2011-09-28Added TLS and SSL support to Email library. Fixes issue #171Radu Potop1-1/+19
2011-09-28Fixing issue 465: select_max is adding prefix to table aliases when is not ↵Juan José González1-1/+1
necessary
2011-09-27Update: user guide Previous Topic and Next Topic url errors.Bo-Yi Wu3-7/+7
2011-09-27Fix a typo on User agent library.cenk1-2/+2
2011-09-26Close <li> tag.cenk1-1/+1
2011-09-26Added XHTML Basic 1.1 (xhtml-basic11) doctype.cenk1-1/+1
2011-09-26Added XHTML Basic 1.1 (xhtml-basic11) doctype.cenk1-0/+1
2011-09-26Edited user_guide/helpers/html_helper.html via GitHubcenk1-0/+5
2011-09-26Use CI's is_php() instead of comparing against phpversion()Andrey Andreev1-1/+1
2011-09-25Added XHTML Basic 1.1 (xhtml-basic11) doctype.cenk1-0/+1
2011-09-25Merge pull request #493 from chrisberthe/issue484Phil Sturgeon2-1/+3
Fix #484 - Hash is never set to the cookie
2011-09-25Fix #484 - Hash is never set to the cookieChris Berthe2-1/+3
2011-09-24Fix an erroneus variable name and a typo in commentsAndrey Andreev1-2/+2
2011-09-24Merge pull request #491 from gerrywastaken/developPhil Sturgeon4-8/+8
Develop - fixing broken links
2011-09-24Fixing the documentation link in the Unit_test library so that it points to ↵Gerry1-2/+2
the correct page
2011-09-24Fixing the documentation link in the Typography library so that it's validGerry1-2/+2
2011-09-24Fixing the Encryption link in the Sha1 library so that it's validGerry1-2/+2
2011-09-24Fixing the documentation url given in the Table libraryGerry1-2/+2
2011-09-24Merge pull request #490 from narfbg/ci-issue-467Phil Sturgeon2-1/+2
Fix issue #467 - suppress warnings generated from get_magic_quotes_gpc()
2011-09-24Update the ChangeLogAndrey Andreev1-0/+1
2011-09-24Suppress warnings generated by get_magic_quotes_gpc() (issue #467)Andrey Andreev1-1/+1
2011-09-24Merge pull request #488 from narfbg/ci-issue-89Phil Sturgeon2-1/+2
Fix issue #89 - variable type mismatch in DB display_error()
2011-09-24Skip is_array() checkAndrey Andreev1-1/+1
2011-09-24Fix a variable type mismatch (issue #89) in system/database/DB_driver.phpAndrey Andreev2-1/+2
2011-09-24Merge pull request #487 from narfbg/ci-issue-82Phil Sturgeon2-1/+3
Escape WHERE clause field names in the DB update_string() method (Issue #82)
2011-09-24Escape WHERE clause field names in the DB update_string() methodAndrey Andreev2-1/+3
2011-09-24Fix alignment with tabs instead of spacesAndrey Andreev1-1/+1
2011-09-24Remove an unnecessary variable initializationAndrey Andreev1-2/+0
2011-09-24Added _file_mime_type() method to system/libraries/Upload.php in order to ↵Andrey Andreev2-3/+68
fix a possible MIME-type injection (issue #60)
2011-09-23Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into developTimothy Warren11-32/+185
2011-09-23resolve a difference between the two memcache set method parametersMark Huot1-1/+10