summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Move \OC\Template to PSR-4Roeland Jago Douma2016-05-136-0/+0
|
* Move functions.php to legacyRoeland Jago Douma2016-05-132-1/+1
| | | | This file should really be properly namespaced etc!
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-134-0/+16
|
* Merge pull request #24563 from owncloud/redis-factoryMorris Jobke2016-05-123-29/+101
|\ | | | | factor out redis configuration into it's own factory
| * factor out redis configuration into it's own factoryRobin Appelman2016-05-033-29/+101
| |
* | Log user out correctly if max session lifetime is reached (#24552)Christoph Wurst2016-05-121-1/+1
| |
* | Move \OCP\Comments to PSR-4 (#24565)Roeland Douma2016-05-127-0/+0
| |
* | lib/private/ocs to PSR-4 (#24558)Roeland Douma2016-05-1212-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 Reschke2016-05-121-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 transifexJenkins for ownCloud2016-05-12112-448/+448
| |
* | allow configuration of memcached options (#23729)Jörn Friedrich Dreyer2016-05-111-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-commandsThomas Müller2016-05-113-3/+4
|\ \ | | | | | | Correctly register PSR-4 autoloading before install.php and loading commands
| * | Correctly register autoloading before install.php and loading commandsJoas Schilling2016-05-113-3/+4
| | |
* | | use the UID for creating the session token, not the login nameChristoph Wurst2016-05-111-0/+1
| | |
* | | delete the token in case an exception is thrown when decrypting the passwordChristoph Wurst2016-05-112-5/+18
| | |
* | | use the query builder instead of raw sql statementsChristoph Wurst2016-05-111-18/+27
| | |
* | | fix PHPDoc and other minor issuesChristoph Wurst2016-05-118-32/+35
| | |
* | | catch possible SessionNotAvailableExceptionsChristoph Wurst2016-05-111-6/+23
| | |
* | | PHPDoc and other minor fixesChristoph Wurst2016-05-114-22/+51
| | |
* | | pass in $request on OCS apiChristoph Wurst2016-05-112-1/+4
| | |
* | | try apache auth tooChristoph Wurst2016-05-112-8/+24
| | |
* | | Fix existing testsChristoph Wurst2016-05-112-22/+24
| | |
* | | fix setupChristoph Wurst2016-05-114-44/+42
| | |
* | | Add fallback to allow user:token basic authChristoph Wurst2016-05-111-0/+7
| | |
* | | Add token auth for OCS APIsChristoph Wurst2016-05-116-41/+66
| | |
* | | Add index on 'last_activity'Christoph Wurst2016-05-115-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 tokensChristoph Wurst2016-05-111-1/+1
| | |
* | | Check if session token is valid and log user out if the check failsChristoph Wurst2016-05-115-22/+105
| | | | | | | | | | | | | | | * Update last_activity timestamp of the session token * Check user backend credentials once in 5 minutes
* | | invalidate (delete) session token on logoutChristoph Wurst2016-05-118-8/+130
| | | | | | | | | | | | add 'last_activity' column to session tokens and delete old ones via a background job
* | | token based authChristoph Wurst2016-05-1111-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_psr4Thomas Müller2016-05-112-0/+0
|\ \ | | | | | | Move \OCP\Command to PSR-4
| * | Move \OCP\Command to PSR-4Roeland Jago Douma2016-05-102-0/+0
| | |
* | | Merge pull request #24433 from owncloud/user_psr4Thomas Müller2016-05-1111-53/+98
|\ \ \ | | | | | | | | lib/private/user to PSR-4
| * | | Add \OC\User\BackendRoeland Jago Douma2016-05-105-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\DatabaseRoeland Jago Douma2016-05-103-17/+19
| | | |
| * | | Move \OC\User to PSR-4Roeland Jago Douma2016-05-105-0/+0
| | | |
| * | | Move OC_User_XX to legacy folderRoeland Jago Douma2016-05-103-0/+0
| |/ /
* | | Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-112-10/+0
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-112-2/+2
| | |
* | | Merge pull request #24379 from owncloud/remove-unneeded-codeLukas Reschke2016-05-102-35/+2
|\ \ \ | |/ / |/| | Remove unneeded private wrapper methods
| * | Remove unneeded private wrapper methodsMorris Jobke2016-05-022-35/+2
| | |
* | | Fix phpdocRoeland Jago Douma2016-05-101-2/+1
| | |
* | | Merge pull request #24434 from owncloud/permalinksLukas Reschke2016-05-101-20/+2
|\ \ \ | | | | | | | | Permalinks
| * | | Send permalink in internal share notification emailsVincent Petry2016-05-061-20/+2
| | | |
* | | | Make update server URL configurableLukas Reschke2016-05-091-6/+2
| | | | | | | | | | | | | | | | Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
* | | | Merge pull request #24419 from owncloud/allow-di-for-migration-stepsThomas Müller2016-05-091-7/+12
|\ \ \ \ | | | | | | | | | | Allow migration steps to use automatic DI
| * | | | Allow migration steps to use automatic DIJoas Schilling2016-05-031-7/+12
| | | | |
* | | | | Merge pull request #24457 from JetUni/patch-1Thomas Müller2016-05-091-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Set higher timeout limit
| * | | | | Set higher timeout limitJarrett2016-05-051-4/+4
| | | | | | | | | | | | | | | | | | Set the timeout limit to be 20 instead of 5 for machines that take longer to load the apps from apps.owncloud.org so that it doesn't show up blank.
* | | | | | Merge pull request #24490 from owncloud/capability_psr4Thomas Müller2016-05-091-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move \OCP\Capabilities to PSR-4