summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Do not automatically try to enable index.php-less URLs (#24539)Lukas Reschke2016-05-125-37/+100
| | | | | | | | | | | | | | | | | 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.
* Move dav app to PSR-4 (#24527)Joas Schilling2016-05-1294-7/+8
| | | | | | * Move Application to correct namespace and PSR-4 it * Move dav app to PSR-4
* Move Encryption app to PSR-4 (#24524)Joas Schilling2016-05-1239-98/+115
| | | | | | | | * Move Encryption to PSR-4 * Move encryption tests to PSR-4 * Fix the tests
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-12140-458/+502
|
* Make permalinks work for trashed files (#24537)Vincent Petry2016-05-113-30/+139
| | | | Opening a permalink that points to a trashed file will now display the file within the "Deleted Files" section in the files web UI.
* Pass on the error message from the user manager to the UI (#24526)Joas Schilling2016-05-112-2/+6
|
* Use proper URL generation function (#24576)Lukas Reschke2016-05-112-3/+3
| | | Fixes the redirection after login, otherwise `core/files/index` is opened which fails.
* Move Provisioning api to PSR-4 (#24510)Joas Schilling2016-05-118-176/+194
| | | | | | | | * Move app to PSR-4 * Fix setUp method * Fix the tests
* allow configuration of memcached options (#23729)Jörn Friedrich Dreyer2016-05-112-0/+54
| | | | | | | | | | | | | | | | | | * 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 #24568 from owncloud/fix_24566Thomas Müller2016-05-111-1/+2
|\ | | | | Fix etag propegation test race condition
| * Fix test race conditionRoeland Jago Douma2016-05-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E-tag propagation replies on the mtime of the file. Order of events: 1. add file 'foo.txt' with content 'bar' 2. Set mtime to now() - 1 3. Check if etag changed. Now this goes right often when 1 and 2 happen in the same second. However imagine 1. add file 'foo.txt' with content 'bar' (at t=0.999) 2. Set mtime to now() - 1 (at t=1.001) Now the mtime will be set to the same time. Thus not chaning the etag.
* | Merge pull request #24531 from owncloud/psr4-loading-for-install-and-commandsThomas Müller2016-05-114-4/+5
|\ \ | | | | | | Correctly register PSR-4 autoloading before install.php and loading commands
| * | Correctly register autoloading before install.php and loading commandsJoas Schilling2016-05-114-4/+5
| |/
* | Merge pull request #24189 from owncloud/pluggable-authThomas Müller2016-05-1133-426/+2058
|\ \ | |/ |/| Pluggable auth
| * use the UID for creating the session token, not the login nameChristoph Wurst2016-05-115-19/+31
| |
| * create session token for DAV clients (sync clients)Christoph Wurst2016-05-111-0/+1
| |
| * fix login with emailChristoph Wurst2016-05-111-1/+2
| |
| * delete the token in case an exception is thrown when decrypting the passwordChristoph Wurst2016-05-113-6/+50
| |
| * use the query builder instead of raw sql statementsChristoph Wurst2016-05-112-29/+51
| |
| * fix PHPDoc and other minor issuesChristoph Wurst2016-05-1114-68/+77
| |
| * show login errorChristoph Wurst2016-05-111-5/+12
| |
| * catch possible SessionNotAvailableExceptionsChristoph Wurst2016-05-111-6/+23
| |
| * add auth integration testsChristoph Wurst2016-05-113-0/+198
| |
| * PHPDoc and other minor fixesChristoph Wurst2016-05-116-36/+74
| |
| * fix mock builder for old phpunit versionsChristoph Wurst2016-05-113-6/+18
| |
| * add unit tests for all new classesChristoph Wurst2016-05-115-3/+441
| |
| * pass in $request on OCS apiChristoph Wurst2016-05-112-1/+4
| |
| * try apache auth tooChristoph Wurst2016-05-112-8/+24
| |
| * increase token column widthChristoph Wurst2016-05-115-7/+6
| | | | | | | | add some range to time() assertions
| * Fix existing testsChristoph Wurst2016-05-113-119/+139
| |
| * fix LoginController unit testsChristoph Wurst2016-05-112-2/+70
| |
| * fix setupChristoph Wurst2016-05-115-48/+53
| |
| * increase version number to trigger db migrationChristoph Wurst2016-05-111-1/+1
| |
| * Add fallback to allow user:token basic authChristoph Wurst2016-05-111-0/+7
| |
| * Add token auth for OCS APIsChristoph Wurst2016-05-118-44/+73
| |
| * Add index on 'last_activity'Christoph Wurst2016-05-117-8/+42
| | | | | | | | | | | | 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-114-1/+94
| |
| * Check if session token is valid and log user out if the check failsChristoph Wurst2016-05-117-25/+107
| | | | | | | | | | * Update last_activity timestamp of the session token * Check user backend credentials once in 5 minutes
| * invalidate (delete) session token on logoutChristoph Wurst2016-05-119-8/+139
| | | | | | | | add 'last_activity' column to session tokens and delete old ones via a background job
| * token based authChristoph Wurst2016-05-1116-250/+596
|/ | | | | | | | * 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-1119-107/+152
|\ \ | | | | | | lib/private/user to PSR-4
| * | fix usage of legacy class in LDAPMorris Jobke2016-05-101-5/+5
| | |
| * | Add \OC\User\BackendRoeland Jago Douma2016-05-1010-185/+228
| | | | | | | | | | | | | | | 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-106-24/+26
| | |
| * | 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
| |/
* | Merge pull request #24550 from owncloud/kill-en@pirateThomas Müller2016-05-1114-72/+0
|\ \ | | | | | | Yo-ho-oh - Murder all band 'o pirates
| * | Yo-ho-oh - Murder all band 'o piratesThomas Müller2016-05-1114-72/+0
|/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 00:19:16 +0000