summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2014-07-11Reword invitation text on front pageFlorian Pritz1-1/+2
2014-06-06Merge remote-tracking branch 'remotes/upstream/2.2-stable' into workingFlorian Pritz122-330/+308
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
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-05-13Fix timing attack on session hashFlorian Pritz1-1/+8
2014-04-17migration 12: remove dependencies on users table againFlorian Pritz1-9/+0
2014-04-15Use alter table to rename tablesFlorian Pritz1-2/+2
2014-04-15migration 12: Remove tablename, fix ordering problemFlorian Pritz1-6/+6
2014-04-12Add foreign keys to databaseFlorian Pritz4-3/+32
2014-03-02Clean up default config commentsFlorian Pritz2-21/+34
2014-03-02INSTALL: slightly improve SQL cmdFlorian Pritz1-4/+3
2014-02-27Merge pull request #2909 from enderteszla/2.1-stableAndrey Andreev5-1/+41
2014-02-27Added a .htaccess file to the application/cache folder for security-in-depths...Ender Teszla1-0/+1
2014-02-27Deleted useless .htaccess file, added missed index.html files.Ender Teszla5-1/+40
2014-02-23user/create_apikey: Use empty comment if unsetFlorian Pritz1-0/+1
2014-02-21Implement multiple access levels for api keysFlorian Pritz6-16/+71
2014-02-15Work around PHP 5.3 limitationFlorian Pritz1-3/+5
2014-01-24client: add gentoo overlayFlorian Pritz1-0/+1
2014-01-21Disable automatic code display for SVG filesFlorian Pritz1-1/+0
2014-01-16INSTALL: clarify config change needed for mod_rewriteFlorian Pritz1-1/+1
2014-01-10let GD itself determine what it can readFlorian Pritz1-14/+5
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
2013-12-11Make oci_execute() calls inside num_rows() non-committing. Fixes #696.Aaron Krebs1-2/+2
2013-12-05Fix some spacing issues from PR #2689Andrey Andreev2-10/+5
2013-11-09use cache_function() everywhereFlorian Pritz2-21/+16
2013-11-09cache file/thumbnail responsesFlorian Pritz1-5/+13
2013-11-09implement cache_function to easily cache return values of functionsFlorian Pritz1-0/+18
2013-10-31Fix alignment of date column in plain text viewFlorian Pritz1-1/+3
2013-10-22wrap long lines in READMEFlorian Pritz1-2/+5
2013-10-22Remove unnecessary TODOFlorian Pritz1-1/+0
2013-10-22Update CSP header; change order to fix svg display in firefoxFlorian Pritz1-1/+1
2013-10-18Merge pull request #2689 from blowdoof/upstream_21Andrey Andreev3-13/+16
2013-10-18Added changelog entriesblowdoof1-0/+1
2013-10-18Merge branch 'upstream_21' of https://github.com/blowdoof/CodeIgniter into up...blowdoof0-0/+0
2013-10-18Revert "Bugfix on the active record join statement with empty conditions"blowdoof1-6/+2
2013-10-18Revert "Bugfix on the active record join statement with empty conditions"blowdoof1-5/+1
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