summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-06-05Updating release dateDerek Jones1-1/+1
2014-06-05Minor style fixes to improve readability in HMAC authenticationQuinn Chrzan1-3/+7
2014-05-31Backport HMAC authentication for CI_SessionAndrey Andreev2-23/+37
2014-05-31Fix broken changelog entriesAndrey Andreev1-2/+2
2014-05-31Add Travis-CI exception for 2.2-stable branchAndrey Andreev1-0/+1
2014-05-31Changelog messages, bump year in copyright noticesAndrey Andreev262-375/+367
2014-05-30Style fixes and adding link to Mcrypt in upgrade instructionsQuinn Chrzan2-2/+2
2014-05-30Bumping version numbers and adding upgrade instructionsQuinn Chrzan145-148/+246
2014-05-30Merge pull request #3071 from EllisLab/bug/xor_encodeQuinn Chrzan3-69/+21
Bug/xor encode
2014-05-30Updating docs for xor_encode removalQuinn Chrzan2-7/+6
2014-05-29Removing xor_encode from Encrypt libraryQuinn Chrzan1-62/+15
2014-05-14Corrections to the tutorial.Wes Baker2-4/+4
2014-02-27Merge pull request #2909 from enderteszla/2.1-stableAndrey Andreev5-1/+41
added missed index.html files.
2014-02-27Added a .htaccess file to the application/cache folder for ↵Ender Teszla1-0/+1
security-in-depths reasons (de bene esse).
2014-02-27Deleted useless .htaccess file, added missed index.html files.Ender Teszla5-1/+40
2014-01-07Manually apply an improved version of PR #2427Andrey Andreev1-6/+5
2013-12-11Merge pull request #2761 from a-krebs/2.1-stableAndrey Andreev1-2/+2
Make oci_execute() calls inside num_rows() non-committing. Fixes #696.
2013-12-11Make oci_execute() calls inside num_rows() non-committing. Fixes #696.Aaron Krebs1-2/+2
Fixes bug in Oracle driver. Calls to oci_execute() inside num_rows() of the Oracle driver can be made non-committing to fix bug with transactions. Since calls to oci_execute are only there to reset which row is next in line for oci_fetch() calls, it's fine to not commit.
2013-12-05Fix some spacing issues from PR #2689Andrey Andreev2-10/+5
2013-10-18Merge pull request #2689 from blowdoof/upstream_21Andrey Andreev3-13/+16
Bugfix 2.1 sqlsrv driver
2013-10-18Added changelog entriesblowdoof1-0/+1
2013-10-18Merge branch 'upstream_21' of https://github.com/blowdoof/CodeIgniter into ↵blowdoof0-0/+0
upstream_21
2013-10-18Revert "Bugfix on the active record join statement with empty conditions"blowdoof1-6/+2
This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447.
2013-10-18Revert "Bugfix on the active record join statement with empty conditions"blowdoof1-5/+1
This reverts commit 2cfbfc54dc68d9e7ed7c20af4cf7693736bbd447.
2013-10-18Bugfix on the active record join statement with empty conditionsblowdoof1-2/+6
2013-10-18Bugfix on the sqlsrv forge driver rename_table functionblowdoof1-5/+3
2013-10-18Bugfix on the sqlsrv forge driver create_table functionblowdoof1-11/+9
2013-10-18removed unnecessary assignmentblowdoof1-1/+0
2013-10-18Style correctionblowdoof1-6/+6
2013-10-18Fix on sqlsrv_forge drop_tabletino1-1/+8
2013-10-18Bugfix on truncate commandtino1-1/+1
2013-08-07Merge pull request #2577 from chrishepner/2.1-stableAndrey Andreev1-3/+3
Fixed incorrect documentation for decimal validator
2013-08-07Merge pull request #2584 from PlamenVasilev/2.1-stableAndrey Andreev1-4/+4
Suhosin compatible emails
2013-08-05Suhosin compatible emailsPlamenVasilev1-4/+4
Fix problems with Suhosin and sending emails trough php mail()
2013-08-02Fixed incorrect documentation for decimal validatorChris Hepner1-3/+3
2013-07-29Fixing two broken links in the User Guide.Wes Baker2-2/+2
2013-07-16Fixing download links for old versions.Wes Baker1-28/+28
2013-07-16Fix download link for latest versionAndrey Andreev1-1/+1
2013-07-16Fix changelog errorsAndrey Andreev1-2/+2
2013-07-15Correcting URL for search box.Wes Baker144-144/+144
2013-07-08Fixing a typo in the user guide.Wes Baker139-139/+139
2013-07-08Revert "Updating User Guide for 2.1.4."Wes Baker2-8/+3
This reverts commit c5f99fdcc5c4a918b5b8fe3ddbd56ab25ad1c22b. Signed-off-by: Wes Baker <wes@wesbaker.com>
2013-07-08Updating User Guide for 2.1.4.Wes Baker147-200/+312
2013-07-05Added small improvement to the _remove_evil_attributes functionbrian9781-7/+6
Signed-off-by: brian978 <dbrian89@yahoo.com> Signed-off-by: Wes Baker <wes@wesbaker.com> Conflicts: system/core/Security.php
2013-03-15Merge pull request #2337 from moi90/2.1-stableAndrey Andreev1-1/+1
Email library: htmlspecialchars for _header_str
2013-03-15Email library: htmlspecialchars for _header_strmoi901-1/+1
2012-11-27Merge pull request #1969 from CoeusCC/patch-2Andrey Andreev1-1/+1
Error on line 1407 of db_active_rec.php traces to mis-named variables
2012-11-27Merge pull request #2021 from tomcode/linefeedsMigrationAndrey Andreev1-40/+40
Linefeeds migration #2
2012-11-21Convert liefeeds to Unix styleThomas Traub1-40/+40
2012-11-05Error on line 1407 of db_active_rec.php traces to mis-named variablesPatrick Zeinert1-1/+1
Corrected variables to $k2 and $v2