Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24617 from owncloud/autoloader_no_private | Vincent Petry | 2016-05-13 | 1 | -18/+0 |
|\ | | | | | our autoloader should not load classes in \OC | ||||
| * | All \OC\ classes are handled by the composer autoloader | Roeland Jago Douma | 2016-05-13 | 1 | -17/+0 |
| | | |||||
| * | OC_xx all live in the legacy folder | Roeland Jago Douma | 2016-05-13 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #24600 from owncloud/http-client-lazy-config | Vincent Petry | 2016-05-13 | 1 | -6/+23 |
|\ \ | | | | | | | only configure the http client once we start using it | ||||
| * | | only configure the http client once we start using it | Robin Appelman | 2016-05-12 | 1 | -6/+23 |
| | | | |||||
* | | | Merge pull request #24614 from owncloud/token-validation-log | Vincent Petry | 2016-05-13 | 1 | -3/+1 |
|\ \ \ | |_|/ |/| | | don't spam the log file with failed token validation entries | ||||
| * | | don't spam the log file with failed token validation entries | Christoph Wurst | 2016-05-13 | 1 | -3/+1 |
| | | | |||||
* | | | Move \OC\Template to PSR-4 | Roeland Jago Douma | 2016-05-13 | 6 | -0/+0 |
| | | | |||||
* | | | Move functions.php to legacy | Roeland Jago Douma | 2016-05-13 | 2 | -1/+1 |
|/ / | | | | | | | This file should really be properly namespaced etc! | ||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-13 | 4 | -0/+16 |
|/ | |||||
* | Merge pull request #24563 from owncloud/redis-factory | Morris Jobke | 2016-05-12 | 3 | -29/+101 |
|\ | | | | | factor out redis configuration into it's own factory | ||||
| * | factor out redis configuration into it's own factory | Robin Appelman | 2016-05-03 | 3 | -29/+101 |
| | | |||||
* | | Log user out correctly if max session lifetime is reached (#24552) | Christoph Wurst | 2016-05-12 | 1 | -1/+1 |
| | | |||||
* | | Move \OCP\Comments to PSR-4 (#24565) | Roeland Douma | 2016-05-12 | 7 | -0/+0 |
| | | |||||
* | | lib/private/ocs to PSR-4 (#24558) | Roeland Douma | 2016-05-12 | 12 | -24/+168 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Move OC_OCS_XX to legacy * Move \OC\OCS to PSR-4 * OC_OCS_xx to \OC\OCS\xx * Moved OC_OCS_xx to proper namespace * OC_OCS_xx is still there for legacy reasons as a wrapper * No calls to OC_OCS_xx in \OC\OCS\ | ||||
* | | Do not automatically try to enable index.php-less URLs (#24539) | Lukas Reschke | 2016-05-12 | 1 | -20/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current logic for mod_rewrite relies on the fact that people have properly configured ownCloud, basically it reads from the `overwrite.cli.ur l` entry and then derives the `RewriteBase` from it. This usually works. However, since the ownCloud packages seem to install themselves at `/owncloud` (because subfolders are cool or so…) _a lot_ of people have just created a new Virtual Host for it or have simply symlinked the path etc. This means that `overwrite.cli.url` is wrong, which fails hard if it is used as RewriteBase since Apache does not know where it should serve files from. In the end the ownCloud instance will not be accessible anymore and users will be frustrated. Also some shared hosters like 1&1 (because using shared hosters is so awesome… ;-)) have somewhat dubious Apache configurations or use versions of mod_rewrite from the mediveal age. (because updating is money or so…) Anyhow. This makes this explicitly an opt-in configuration flag. If `htaccess.RewriteBase` is set then it will configure index.php-less URLs, if admins set that after installation and don't want to wait until the next ownCloud version they can run `occ maintenance:update:htaccess`. For ownCloud 9.0 we also have to add a repair step to make sure that instances that already have a RewriteBase configured continue to use it by copying it into the config file. That way all existing URLs stay valid. That one is not in this PR since this is unneccessary in master. Effectively this reduces another risk of breakage when updating from ownCloud 8 to ownCloud 9. Fixes https://github.com/owncloud/core/issues/24525, https://github.com/owncloud/core/issues/24426 and probably some more. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-12 | 112 | -448/+448 |
| | | |||||
* | | allow configuration of memcached options (#23729) | Jörn Friedrich Dreyer | 2016-05-11 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow configuration of memcache options Use production values for memcached as explained in http://apprize.info/php/scaling/15.html The current implementiation uses ascii based serialization. This PR should reduce traffic to the memcached server. cc @MorrisJobke @FelixBoehm * add config sample * merge config options, throw hint on config error * fix typo * fix config sample | ||||
* | | Merge pull request #24531 from owncloud/psr4-loading-for-install-and-commands | Thomas Müller | 2016-05-11 | 3 | -3/+4 |
|\ \ | | | | | | | Correctly register PSR-4 autoloading before install.php and loading commands | ||||
| * | | Correctly register autoloading before install.php and loading commands | Joas Schilling | 2016-05-11 | 3 | -3/+4 |
| | | | |||||
* | | | use the UID for creating the session token, not the login name | Christoph Wurst | 2016-05-11 | 1 | -0/+1 |
| | | | |||||
* | | | delete the token in case an exception is thrown when decrypting the password | Christoph Wurst | 2016-05-11 | 2 | -5/+18 |
| | | | |||||
* | | | use the query builder instead of raw sql statements | Christoph Wurst | 2016-05-11 | 1 | -18/+27 |
| | | | |||||
* | | | fix PHPDoc and other minor issues | Christoph Wurst | 2016-05-11 | 8 | -32/+35 |
| | | | |||||
* | | | catch possible SessionNotAvailableExceptions | Christoph Wurst | 2016-05-11 | 1 | -6/+23 |
| | | | |||||
* | | | PHPDoc and other minor fixes | Christoph Wurst | 2016-05-11 | 4 | -22/+51 |
| | | | |||||
* | | | pass in $request on OCS api | Christoph Wurst | 2016-05-11 | 2 | -1/+4 |
| | | | |||||
* | | | try apache auth too | Christoph Wurst | 2016-05-11 | 2 | -8/+24 |
| | | | |||||
* | | | Fix existing tests | Christoph Wurst | 2016-05-11 | 2 | -22/+24 |
| | | | |||||
* | | | fix setup | Christoph Wurst | 2016-05-11 | 4 | -44/+42 |
| | | | |||||
* | | | Add fallback to allow user:token basic auth | Christoph Wurst | 2016-05-11 | 1 | -0/+7 |
| | | | |||||
* | | | Add token auth for OCS APIs | Christoph Wurst | 2016-05-11 | 6 | -41/+66 |
| | | | |||||
* | | | Add index on 'last_activity' | Christoph Wurst | 2016-05-11 | 5 | -6/+22 |
| | | | | | | | | | | | | | | | | | | add token type column and delete only temporary tokens in the background job debounce token updates; fix wrong class import | ||||
* | | | Add controller to generate client tokens | Christoph Wurst | 2016-05-11 | 1 | -1/+1 |
| | | | |||||
* | | | Check if session token is valid and log user out if the check fails | Christoph Wurst | 2016-05-11 | 5 | -22/+105 |
| | | | | | | | | | | | | | | | * Update last_activity timestamp of the session token * Check user backend credentials once in 5 minutes | ||||
* | | | invalidate (delete) session token on logout | Christoph Wurst | 2016-05-11 | 8 | -8/+130 |
| | | | | | | | | | | | | add 'last_activity' column to session tokens and delete old ones via a background job | ||||
* | | | token based auth | Christoph Wurst | 2016-05-11 | 11 | -221/+472 |
|/ / | | | | | | | | | | | | | | | * Add InvalidTokenException * add DefaultTokenMapper and use it to check if a auth token exists * create new token for the browser session if none exists hash stored token; save user agent * encrypt login password when creating the token | ||||
* | | Merge pull request #24493 from owncloud/command_psr4 | Thomas Müller | 2016-05-11 | 2 | -0/+0 |
|\ \ | | | | | | | Move \OCP\Command to PSR-4 | ||||
| * | | Move \OCP\Command to PSR-4 | Roeland Jago Douma | 2016-05-10 | 2 | -0/+0 |
| | | | |||||
* | | | Merge pull request #24433 from owncloud/user_psr4 | Thomas Müller | 2016-05-11 | 11 | -53/+98 |
|\ \ \ | | | | | | | | | lib/private/user to PSR-4 | ||||
| * | | | Add \OC\User\Backend | Roeland Jago Douma | 2016-05-10 | 5 | -143/+186 |
| | | | | | | | | | | | | | | | | | | | | Since some apps (ldap et al) still depend on OC_User_Backend this seemed like the cleanest approach. | ||||
| * | | | Move OC_User_Database to \OC\User\Database | Roeland Jago Douma | 2016-05-10 | 3 | -17/+19 |
| | | | | |||||
| * | | | Move \OC\User to PSR-4 | Roeland Jago Douma | 2016-05-10 | 5 | -0/+0 |
| | | | | |||||
| * | | | Move OC_User_XX to legacy folder | Roeland Jago Douma | 2016-05-10 | 3 | -0/+0 |
| |/ / | |||||
* | | | Yo-ho-oh - Murder all band 'o pirates | Thomas Müller | 2016-05-11 | 2 | -10/+0 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-11 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #24379 from owncloud/remove-unneeded-code | Lukas Reschke | 2016-05-10 | 2 | -35/+2 |
|\ \ \ | |/ / |/| | | Remove unneeded private wrapper methods | ||||
| * | | Remove unneeded private wrapper methods | Morris Jobke | 2016-05-02 | 2 | -35/+2 |
| | | | |||||
* | | | Fix phpdoc | Roeland Jago Douma | 2016-05-10 | 1 | -2/+1 |
| | | | |||||
* | | | Merge pull request #24434 from owncloud/permalinks | Lukas Reschke | 2016-05-10 | 1 | -20/+2 |
|\ \ \ | | | | | | | | | Permalinks |