summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-29Display better errors for CLI requestsFlorian Pritz3-125/+15
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-23Move migration code to CLI callable functionFlorian Pritz6-14/+70
This is necessary to prevent migrations from running multiple times in parallel. A git hook can be used to run this after checkout so impact should be fairly low. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-22update gentoo overlay URLFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-17Fix comptability with php 5.6Florian Pritz1-1/+2
References: http://ellislab.com/forums/viewthread/244510/#1066558 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-07-11Reword invitation text on front pageFlorian Pritz1-1/+2
The new text is friendlier and less presumptuous and actually describes the reason why I introduced the invitation system. Not sure why I didn't write that in the first place. Thanks to <https://lobste.rs/about> for the idea. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-06-06Merge remote-tracking branch 'remotes/upstream/2.2-stable' into workingFlorian Pritz122-330/+308
Signed-off-by: Florian Pritz <bluewind@xinu.at> Conflicts: system/libraries/Session.php user_guide/
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-05-13Fix timing attack on session hashFlorian Pritz1-1/+8
http://seclists.org/fulldisclosure/2014/May/54 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-04-17migration 12: remove dependencies on users table againFlorian Pritz1-9/+0
When using external authentication databases (ldap, fluxbb, ..) the users table is empty so adding the constraints won't work. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-04-15Use alter table to rename tablesFlorian Pritz1-2/+2
For some strange reason using "rename table" causes an exception in system/database/DB_driver.php:query() because it trys to call num_rows() on a boolean. Using "alter table" works. According to the php manpage mysqli::query() it should return a boolean too, but whatever... Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-04-15migration 12: Remove tablename, fix ordering problemFlorian Pritz1-6/+6
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-04-12Add foreign keys to databaseFlorian Pritz4-3/+32
Changing the referrer value for the root admin from 0 to NULL to make the foreign key check work. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-03-02Clean up default config commentsFlorian Pritz2-21/+34
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-03-02INSTALL: slightly improve SQL cmdFlorian Pritz1-4/+3
Signed-off-by: Florian Pritz <bluewind@xinu.at>
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-02-23user/create_apikey: Use empty comment if unsetFlorian Pritz1-0/+1
False gets converted to "0" when being stored in the DB which we don't want. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-02-21Implement multiple access levels for api keysFlorian Pritz6-16/+71
This allows to use an api key to write a completly standalone client. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-02-15Work around PHP 5.3 limitationFlorian Pritz1-3/+5
$this in anonymous functions is only supported in PHP >= 5.4 Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-24client: add gentoo overlayFlorian Pritz1-0/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-21Disable automatic code display for SVG filesFlorian Pritz1-1/+0
People usually want to view them rather than read the code. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-16INSTALL: clarify config change needed for mod_rewriteFlorian Pritz1-1/+1
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2014-01-10let GD itself determine what it can readFlorian Pritz1-14/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
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-11-09use cache_function() everywhereFlorian Pritz2-21/+16
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-11-09cache file/thumbnail responsesFlorian Pritz1-5/+13
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-11-09implement cache_function to easily cache return values of functionsFlorian Pritz1-0/+18
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-31Fix alignment of date column in plain text viewFlorian Pritz1-1/+3
This got broken by 2a6a1c63cb21015009fe4fd13f62cdac64e1fe36 and 05a4d686b578794c180ddfaf4945a9d7443f330e. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-22wrap long lines in READMEFlorian Pritz1-2/+5
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-22Remove unnecessary TODOFlorian Pritz1-1/+0
It's fine if users can invite an unlimited amount of people. Signed-off-by: Florian Pritz <bluewind@xinu.at>
2013-10-22Update CSP header; change order to fix svg display in firefoxFlorian Pritz1-1/+1
Apparently firefox doesn't like "style-src * 'unsafe-inline'", but wants "style-src 'unsafe-inline' *" otherwise it doesn't honor 'unsafe-inline'. In chromium both behave the same. Signed-off-by: Florian Pritz <bluewind@xinu.at>
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
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-01 22:55:44 +0100