summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* dont needlessly triger the propgator in the scannerRobin Appelman2016-05-231-2/+4
|
* Merge pull request #24766 from owncloud/mmccarn-patch-2Vincent Petry2016-05-231-10/+13
|\ | | | | Update imagePath to prefer theme, then app, then core images
| * Update imagePath to prefer theme, then app, then core imagesmmccarn2016-05-231-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imagePath updated so that image searches follow this priority: 1) /themes/$theme/apps/$app/img 2) /themes/$theme/$app/img 3) /themes/$theme/core/img 4) $appPath/img 5) /$app/img 6) /core/img For each folder: - if the specified file exists, use it. - otherwise, if $basename.svg does NOT exist, try $basename.png (This might better be "if filename was an svg, try the png"...)
* | Merge pull request #24603 from owncloud/federated_reshareVincent Petry2016-05-234-9/+28
|\ \ | | | | | | flat federated re-share
| * | use share initiator as fall back to access the fileBjörn Schießle2016-05-204-9/+28
| | | | | | | | | | | | | | | in case of federated re-shares the owner can be a remote user. Therefore we can't always use to owner to access the local file
* | | Merge pull request #24356 from owncloud/scanner-recursion-memoryVincent Petry2016-05-231-22/+25
|\ \ \ | |_|/ |/| | Free up folder content from memory before recursing in the file scanner
| * | Free up folder content from memory before recursing in the file scannerRobin Appelman2016-04-291-22/+25
| | |
* | | Merge pull request #24696 from owncloud/lock-jobs-while-executingVincent Petry2016-05-217-36/+149
|\ \ \ | | | | | | | | Lock jobs while executing them, to allow multiple executors to run in…
| * | | Lock jobs while executing them, to allow multiple executors to run in parallelJoas Schilling2016-05-212-34/+58
| | | |
| * | | Add a method to lock a tableJoas Schilling2016-05-215-2/+91
| | |/ | |/|
* | | Some tweaks for systemtagmanagerVincent Petry2016-05-201-4/+1
| | |
* | | Act on effective system tag canAssign permissionVincent Petry2016-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever the server returns true for the can-assign Webdav property of a system tag, it means the current user is allowed to assign, regardless of the value of user-assignable. This commit brings the proper logic to the web UI to make it possible for users to assign when they have the permission.
* | | Add system tag assignability check with groupsVincent Petry2016-05-201-0/+13
| | | | | | | | | | | | | | | | | | Whenever a user is not an admin, a tag is visible but not user-assignable, check whether the user is a member of the allowed groups.
* | | Add systemtag_group table and get/set methodsVincent Petry2016-05-201-0/+55
| | | | | | | | | | | | | | | Added systemtag to group mapping table. Added methods in ISystemTagManager to get/set the group mappings.
* | | Updated canUser* functions in SystemTagManager to accept objectsVincent Petry2016-05-202-33/+6
| | |
* | | Add interface methods for permission checkVincent Petry2016-05-202-1/+75
|/ / | | | | | | | | | | Instead of checking for admin perm, use interface method canUserAssignTag and canUserSeeTag to check for permissions. Allows for more flexible implementation.
* | Merge pull request #24721 from owncloud/public_psr4Vincent Petry2016-05-191-3/+3
|\ \ | | | | | | Move \OCP to PSR-4
| * | Fix broken exception namingRoeland Jago Douma2016-05-191-3/+3
| | |
* | | Merge pull request #24725 from owncloud/ocs-provider-psr4Vincent Petry2016-05-191-0/+96
|\ \ \ | | | | | | | | Move OCS Provider to PSR-4 namespace
| * | | Move OCS Provider to PSR-4 namespaceJoas Schilling2016-05-191-0/+96
| | | |
* | | | Merge pull request #24660 from owncloud/no-token-login-for-disabled-usersVincent Petry2016-05-191-0/+4
|\ \ \ \ | | | | | | | | | | don't allow token login for disabled users
| * | | | don't allow token login for disabled usersChristoph Wurst2016-05-181-0/+4
| |/ / /
* / / / add method to query all user auth tokensChristoph Wurst2016-05-183-0/+54
|/ / /
* | | Merge pull request #24691 from owncloud/fixchunkttlVincent Petry2016-05-181-1/+3
|\ \ \ | |/ / |/| | Allow chunk GC mtime tolerance for unfinished part chunks
| * | Allow chunk GC mtime tolerance for unfinished part chunksVincent Petry2016-05-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever part chunks are written, every fwrite in the write loop will reset the mtime to the current mtime. Only at the end will the touch() operation set the mtime to now + ttl, in the future. However the GC code is expecting that every chunk with mtime < now are old and must be deleted. This causes the GC to sometimes delete part chunks in which the write loop is slow. To fix this, a tolerance value is added in the GC code to allow for more time before a part chunk gets deleted.
* | | a single token provider sufficesChristoph Wurst2016-05-186-58/+85
|/ /
* | use mount providers to setup home storages (#24567)Robin Appelman2016-05-175-33/+167
| |
* | Group fixup (#24621)Roeland Douma2016-05-177-431/+502
| | | | | | | | | | | | | | | | * Move used OC_Group_xx to \OC\Group * Add (deprecated) legacy wrapper in legacy, OC_Group_xx * Replace deprecated use of OC_Group_xx with \OC\Group\xx
* | Merge pull request #24370 from owncloud/iclientservice-dicontainerJörn Friedrich Dreyer2016-05-171-0/+4
|\ \ | | | | | | add IClientService to DI container
| * | add IClientService to DI containerChristoph Wurst2016-05-011-0/+4
| | |
* | | Merge pull request #24083 from owncloud/fix-race-conditionJörn Friedrich Dreyer2016-05-171-2/+3
|\ \ \ | | | | | | | | Read only once
| * | | Read only onceLukas Reschke2016-05-021-2/+3
| | | | | | | | | | | | | | | | This can lead to race conditions otherwise. Also depracted hasKey
* | | | Merge pull request #24600 from owncloud/http-client-lazy-configVincent Petry2016-05-131-6/+23
|\ \ \ \ | | | | | | | | | | only configure the http client once we start using it
| * | | | only configure the http client once we start using itRobin Appelman2016-05-121-6/+23
| | | | |
* | | | | Merge pull request #24614 from owncloud/token-validation-logVincent Petry2016-05-131-3/+1
|\ \ \ \ \ | | | | | | | | | | | | don't spam the log file with failed token validation entries
| * | | | | don't spam the log file with failed token validation entriesChristoph Wurst2016-05-131-3/+1
| |/ / / /
* | | | | 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!
* | | | 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
| | | | |
* | | | | 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.
* | | | | 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
| | | | | |