]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoMerge pull request #13667 from owncloud/rename-always-update-cache
Robin Appelman [Wed, 28 Jan 2015 16:15:11 +0000 (17:15 +0100)]
Merge pull request #13667 from owncloud/rename-always-update-cache

Update the cache when renaming even if we dont emit hooks

9 years agoFix trash error when deleting files with the same name at the same time (happens...
Robin Appelman [Wed, 28 Jan 2015 14:16:55 +0000 (15:16 +0100)]
Fix trash error when deleting files with the same name at the same time (happens in unit tests)

9 years agoMerge pull request #13730 from owncloud/fix-htaccess
Morris Jobke [Wed, 28 Jan 2015 14:07:49 +0000 (15:07 +0100)]
Merge pull request #13730 from owncloud/fix-htaccess

Reference module with `.c`

9 years agoAdd unit test
Robin Appelman [Mon, 26 Jan 2015 13:51:27 +0000 (14:51 +0100)]
Add unit test

9 years agoUpdate the cache when renaming even if we dont emit hooks
Robin Appelman [Mon, 26 Jan 2015 13:34:40 +0000 (14:34 +0100)]
Update the cache when renaming even if we dont emit hooks

9 years agoReference module with `.c`
Lukas Reschke [Wed, 28 Jan 2015 11:42:15 +0000 (12:42 +0100)]
Reference module with `.c`

Fixes https://github.com/owncloud/core/issues/13657

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 28 Jan 2015 06:55:53 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13700 from owncloud/dav-objecttree-required-a-collection
Morris Jobke [Wed, 28 Jan 2015 00:14:47 +0000 (01:14 +0100)]
Merge pull request #13700 from owncloud/dav-objecttree-required-a-collection

let init() take a ICollection or an INode - fixes PHP message

9 years agoMerge pull request #13704 from owncloud/issue/13571-indicate-remote-sharee-in-filelist
Morris Jobke [Wed, 28 Jan 2015 00:06:32 +0000 (01:06 +0100)]
Merge pull request #13704 from owncloud/issue/13571-indicate-remote-sharee-in-filelist

Indicate that the share owner is remote in the filelist

9 years agoMerge pull request #13717 from owncloud/storage-donotwrapnullstorage
Morris Jobke [Wed, 28 Jan 2015 00:00:20 +0000 (01:00 +0100)]
Merge pull request #13717 from owncloud/storage-donotwrapnullstorage

Prevent wrapping null storage

9 years agoMerge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
Morris Jobke [Tue, 27 Jan 2015 23:31:37 +0000 (00:31 +0100)]
Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage

Catch storage exception in scanner for remote shares

9 years agoPrevent wrapping null storage
Vincent Petry [Tue, 27 Jan 2015 15:55:59 +0000 (16:55 +0100)]
Prevent wrapping null storage

Can happen when trying to instantiate external storages that have
incomplete config, where the constructor throws an exception (the
exception is caught in createStorage())

9 years agoMerge pull request #13718 from owncloud/use-proper-namespace
Bernhard Posselt [Tue, 27 Jan 2015 16:39:35 +0000 (17:39 +0100)]
Merge pull request #13718 from owncloud/use-proper-namespace

Use proper namespace

9 years agoUse proper namespace
Lukas Reschke [Tue, 27 Jan 2015 16:34:25 +0000 (17:34 +0100)]
Use proper namespace

IAppManager lives in OCP\App and not in OCP.

Fixes https://github.com/owncloud/core/issues/13710

9 years agoMerge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix
Vincent Petry [Tue, 27 Jan 2015 16:05:38 +0000 (17:05 +0100)]
Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix

Call final unlink in trash wrapper's storage

9 years agoFix return type of addStorageWrapper in PHPDoc
Vincent Petry [Tue, 27 Jan 2015 15:41:43 +0000 (16:41 +0100)]
Fix return type of addStorageWrapper in PHPDoc

9 years agoMerge pull request #13707 from owncloud/extstorage-fixincompletestorageconfig
Vincent Petry [Tue, 27 Jan 2015 15:31:59 +0000 (16:31 +0100)]
Merge pull request #13707 from owncloud/extstorage-fixincompletestorageconfig

Allow saving incomplete external storage config

9 years agoMerge pull request #13699 from owncloud/check-if-file-exists
Morris Jobke [Tue, 27 Jan 2015 13:16:40 +0000 (14:16 +0100)]
Merge pull request #13699 from owncloud/check-if-file-exists

Use `file_exists` to verify that config file exists

9 years agoMerge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not-possible
Lukas Reschke [Tue, 27 Jan 2015 13:12:05 +0000 (14:12 +0100)]
Merge pull request #13636 from owncloud/add-warning-if-restore-of-data-is-not-possible

Add value if restore of data is possible for a user

9 years agoAllow saving incomplete external storage config
Vincent Petry [Tue, 27 Jan 2015 12:35:31 +0000 (13:35 +0100)]
Allow saving incomplete external storage config

This is needed for Dropbox and others that need a token.

9 years agoFix mount config unit test failures
Vincent Petry [Tue, 27 Jan 2015 12:42:39 +0000 (13:42 +0100)]
Fix mount config unit test failures

Because setStorageId now instantiates storages, they might throw
exceptions if arguments are missing.

This fixes the unit test to not throw exceptions and have their default
config arguments set.

9 years agoAdd value if restore of data is possible for a user
Morris Jobke [Fri, 23 Jan 2015 16:45:45 +0000 (17:45 +0100)]
Add value if restore of data is possible for a user

* reason: nice to know before password change in user management
* restore is possible:
* encryption is disabled
* encryption is enabled, admin and user has checked the
  restore option
* if not possible:
* highlight users row in red once the admin wants to change the password
* show also a little tipsy

9 years agoIndicate that the share owner is remote in the filelist
Joas Schilling [Tue, 27 Jan 2015 10:06:18 +0000 (11:06 +0100)]
Indicate that the share owner is remote in the filelist

9 years agoMerge pull request #13701 from owncloud/disable-appcode-checker
Lukas Reschke [Tue, 27 Jan 2015 10:53:03 +0000 (11:53 +0100)]
Merge pull request #13701 from owncloud/disable-appcode-checker

disable the app code checker - some previous shipped apps cannot be inst...

9 years agolet init() take an INode - fixes PHP message
Thomas Müller [Tue, 27 Jan 2015 08:22:52 +0000 (09:22 +0100)]
let init() take an INode - fixes PHP message

9 years agoMerge pull request #13676 from owncloud/fix-node-iface
Thomas Müller [Tue, 27 Jan 2015 08:34:59 +0000 (09:34 +0100)]
Merge pull request #13676 from owncloud/fix-node-iface

Fix node interface

9 years agoMerge pull request #13679 from owncloud/public-disablesharejsplugin
Thomas Müller [Tue, 27 Jan 2015 08:33:38 +0000 (09:33 +0100)]
Merge pull request #13679 from owncloud/public-disablesharejsplugin

Disable JS plugin for sharing in public mode

9 years agoMerge pull request #13691 from owncloud/s2s-acceptsinglefile
Thomas Müller [Tue, 27 Jan 2015 08:32:33 +0000 (09:32 +0100)]
Merge pull request #13691 from owncloud/s2s-acceptsinglefile

Only reload file list after remote share accept request returns

9 years agodisable the app code checker - some previous shipped apps cannot be installed from...
Thomas Müller [Tue, 27 Jan 2015 08:27:38 +0000 (09:27 +0100)]
disable the app code checker - some previous shipped apps cannot be installed from the appstore now :facepunch:

9 years agoMerge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-error
Thomas Müller [Tue, 27 Jan 2015 08:15:57 +0000 (09:15 +0100)]
Merge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-error

Make error more descriptive

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 27 Jan 2015 06:54:34 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoUse `file_exists` to verify that config file exists
Lukas Reschke [Mon, 26 Jan 2015 23:45:37 +0000 (00:45 +0100)]
Use `file_exists` to verify that config file exists

There might be the case that `fopen($file, 'r')` returns false and thus ownCloud might believe that the config file is empty and thus potentially leading to an overwrite of the config file.

This changeset introduces `file_exists` again which was used in ownCloud 5 where no such problems where reported and should not be affected by such problems.

Ref https://github.com/owncloud/core/issues/12785#issuecomment-71548720

9 years agoMake error more descriptive
Lukas Reschke [Mon, 26 Jan 2015 21:59:12 +0000 (22:59 +0100)]
Make error more descriptive

Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767

9 years agoOnly reload file list after remote share accept request returns
Vincent Petry [Mon, 26 Jan 2015 20:22:22 +0000 (21:22 +0100)]
Only reload file list after remote share accept request returns

When accepting a remote share, an ajax request is sent to the server.
Only once this request returns should the file list be reloaded.

9 years agoDo not disclose share owner in public file list
Vincent Petry [Mon, 26 Jan 2015 16:10:58 +0000 (17:10 +0100)]
Do not disclose share owner in public file list

9 years agoDisable JS plugin for sharing in public mode
Vincent Petry [Mon, 26 Jan 2015 16:06:07 +0000 (17:06 +0100)]
Disable JS plugin for sharing in public mode

This removes the logic that registers the share action and modifies the
rows. Share actions aren't needed in the public file list.

9 years agoMerge pull request #13490 from owncloud/fix_reshare_s2s_share
Vincent Petry [Mon, 26 Jan 2015 18:54:14 +0000 (19:54 +0100)]
Merge pull request #13490 from owncloud/fix_reshare_s2s_share

use uid provided by setupfs hook to mount server2server shares

9 years agoMerge pull request #13677 from owncloud/s2s-doubleslashrequest
Vincent Petry [Mon, 26 Jan 2015 16:17:04 +0000 (17:17 +0100)]
Merge pull request #13677 from owncloud/s2s-doubleslashrequest

Prevent double slash in shareinfo request URL

9 years agocertificate manager should always use a \OC\Files\View otherwise we will get problems...
Bjoern Schiessle [Tue, 20 Jan 2015 19:34:34 +0000 (20:34 +0100)]
certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages

9 years agocertificate manager only needs the user-id, no need to pass on the complete user...
Bjoern Schiessle [Tue, 20 Jan 2015 16:00:29 +0000 (17:00 +0100)]
certificate manager only needs the user-id, no need to pass on the complete user object

9 years agouse uid provided by setupfs hook to mount server2server shares, otherwise mount will...
Bjoern Schiessle [Mon, 19 Jan 2015 23:35:47 +0000 (00:35 +0100)]
use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares

9 years agoPrevent double slash in shareinfo request URL
Vincent Petry [Mon, 26 Jan 2015 15:19:38 +0000 (16:19 +0100)]
Prevent double slash in shareinfo request URL

9 years agoAdd back exit()
Vincent Petry [Mon, 26 Jan 2015 15:07:28 +0000 (16:07 +0100)]
Add back exit()

9 years agofix node interface
Bernhard Posselt [Mon, 26 Jan 2015 14:58:41 +0000 (15:58 +0100)]
fix node interface

9 years agoReplace OC_Log::ERROR with OCP\Util::ERROR
Vincent Petry [Mon, 26 Jan 2015 14:51:31 +0000 (15:51 +0100)]
Replace OC_Log::ERROR with OCP\Util::ERROR

9 years agoMerge pull request #13660 from owncloud/remove-duplicate-service-definition
Thomas Müller [Mon, 26 Jan 2015 14:48:41 +0000 (15:48 +0100)]
Merge pull request #13660 from owncloud/remove-duplicate-service-definition

Remove duplicated definition of APIController

9 years agoCatch storage exception in scanner for remote shares
Vincent Petry [Tue, 20 Jan 2015 18:45:32 +0000 (19:45 +0100)]
Catch storage exception in scanner for remote shares

Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.

Also, getDirectoryContent() will now skip unavailable storages.

9 years agoMerge pull request #13621 from owncloud/system-config-multiset
Thomas Müller [Mon, 26 Jan 2015 12:36:22 +0000 (13:36 +0100)]
Merge pull request #13621 from owncloud/system-config-multiset

Add a method to set/unset multiple config values with one write

9 years agonaming fixes while reviewing
Thomas Müller [Mon, 26 Jan 2015 11:59:25 +0000 (12:59 +0100)]
naming fixes while reviewing

9 years agoFix bogus deletion on copy + unlink through rename
Vincent Petry [Mon, 26 Jan 2015 11:22:22 +0000 (12:22 +0100)]
Fix bogus deletion on copy + unlink through rename

Cross-storage rename would cause copy + unlink. That unlink operation
must not trigger the trashbin.

9 years agoRemove duplicated definition of APIController
Joas Schilling [Mon, 26 Jan 2015 09:20:01 +0000 (10:20 +0100)]
Remove duplicated definition of APIController

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 26 Jan 2015 06:54:29 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years ago8.0 beta 2 v8.0.0beta2
Frank Karlitschek [Mon, 26 Jan 2015 03:41:37 +0000 (04:41 +0100)]
8.0 beta 2

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 25 Jan 2015 06:54:38 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 24 Jan 2015 06:54:51 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13637 from owncloud/s2s_notification_new_defaults
Björn Schießle [Fri, 23 Jan 2015 21:38:07 +0000 (22:38 +0100)]
Merge pull request #13637 from owncloud/s2s_notification_new_defaults

by default send mail for new server-to-server share

9 years agoby default send mail for new server-to-server share
Bjoern Schiessle [Fri, 23 Jan 2015 19:37:16 +0000 (20:37 +0100)]
by default send mail for new server-to-server share

9 years agoAdd trashbin storage wrapper unit test for versions
Vincent Petry [Fri, 23 Jan 2015 17:39:21 +0000 (18:39 +0100)]
Add trashbin storage wrapper unit test for versions

9 years agoSimplify trash storage unit tests
Vincent Petry [Fri, 23 Jan 2015 17:08:59 +0000 (18:08 +0100)]
Simplify trash storage unit tests

Needed to make it properly init the mount points

9 years agoMerge pull request #13626 from owncloud/check-for-hhvm
Clark Tomlinson [Fri, 23 Jan 2015 15:28:47 +0000 (10:28 -0500)]
Merge pull request #13626 from owncloud/check-for-hhvm

Don't check for `always_populate_raw_post_data` on HHVM

9 years agoMerge pull request #13463 from owncloud/share-getitemsharedwithuser-emptygroup
Lukas Reschke [Fri, 23 Jan 2015 14:58:13 +0000 (15:58 +0100)]
Merge pull request #13463 from owncloud/share-getitemsharedwithuser-emptygroup

Do not retrieve shares through group if user has no group

9 years agoUnregister trashbin storage wrapper at the end of tests
Vincent Petry [Fri, 23 Jan 2015 14:22:06 +0000 (15:22 +0100)]
Unregister trashbin storage wrapper at the end of tests

Some more tests that uses the storage wrapper now remove it afterwards

9 years agoPreserve mtime when doing cross storage move
Robin Appelman [Fri, 23 Jan 2015 14:11:27 +0000 (15:11 +0100)]
Preserve mtime when doing cross storage move

9 years agoDo not retrieve shares through group if user has no group
Vincent Petry [Mon, 19 Jan 2015 13:39:00 +0000 (14:39 +0100)]
Do not retrieve shares through group if user has no group

9 years agoRemove storage wrapper for oc_trashbin in unit test
Vincent Petry [Fri, 23 Jan 2015 13:55:38 +0000 (14:55 +0100)]
Remove storage wrapper for oc_trashbin in unit test

9 years agoUse setConfigs() instead of calling setConfig() multiple times
Joas Schilling [Fri, 23 Jan 2015 10:13:47 +0000 (11:13 +0100)]
Use setConfigs() instead of calling setConfig() multiple times

9 years agoOnly move files from the current user to the trashbin
Robin Appelman [Fri, 23 Jan 2015 13:19:36 +0000 (14:19 +0100)]
Only move files from the current user to the trashbin

9 years agoDon't check for `always_populate_raw_post_data` on HHVM
Lukas Reschke [Fri, 23 Jan 2015 12:52:42 +0000 (13:52 +0100)]
Don't check for `always_populate_raw_post_data` on HHVM

HHVM seems to have problems with this at the moment (even setting those values in the php.ini of HHVM doesn't have helped much) and thus the unit test execution failed.

So it's better if we disable this check for now for HHVM.

9 years agoApply wrappers to existing mounts before registering it
Robin Appelman [Fri, 23 Jan 2015 12:48:35 +0000 (13:48 +0100)]
Apply wrappers to existing mounts before registering it

9 years agoCall final unlink in trash wrapper's storage
Vincent Petry [Wed, 21 Jan 2015 15:29:52 +0000 (16:29 +0100)]
Call final unlink in trash wrapper's storage

In the case of cross-storage delete, the files are copied to the trash,
then deleted. The final delete on the source storage would still reach
the trash wrapper.

This fix makes forwards that second call to the wrapped storage to make
the final delete work.

It fixes the issue with remote shares, local shares and external
storage.

Also, it uses a new function "renameRecursive" that renames the files
and preserves the mtimes (like "copy_recursive" did in the past))

9 years agoremoveStorageWrapper to unregister a storage wrapper
Vincent Petry [Wed, 21 Jan 2015 20:54:43 +0000 (21:54 +0100)]
removeStorageWrapper to unregister a storage wrapper

9 years agoMerge pull request #13479 from owncloud/issue/13475-favorites-and-unavailable-externa...
Lukas Reschke [Fri, 23 Jan 2015 10:44:54 +0000 (11:44 +0100)]
Merge pull request #13479 from owncloud/issue/13475-favorites-and-unavailable-external-storages

Ignore favorites that are not available when creating the favorites list

9 years agoMerge pull request #13590 from owncloud/sabredav-1.8.12
Morris Jobke [Fri, 23 Jan 2015 10:12:53 +0000 (11:12 +0100)]
Merge pull request #13590 from owncloud/sabredav-1.8.12

Update SabreDAV to 1.8.12

9 years agoUpdate SabreDAV to 1.8.12
Thomas Müller [Thu, 22 Jan 2015 12:10:32 +0000 (13:10 +0100)]
Update SabreDAV to 1.8.12

9 years agoAdd a method to set/unset multiple config values in one call
Joas Schilling [Fri, 23 Jan 2015 09:50:25 +0000 (10:50 +0100)]
Add a method to set/unset multiple config values in one call

This reduces the number of file writes we do for config.php and therefor
hopefully helps lowering the chances for empty config.php files

9 years agoIgnore favorites that are not available when creating the favorites list
Joas Schilling [Mon, 19 Jan 2015 16:05:43 +0000 (17:05 +0100)]
Ignore favorites that are not available when creating the favorites list

Also correctly return the exception for all cases when adding/removing favos

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 23 Jan 2015 06:55:06 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13593 from owncloud/add-check-for-raw-post-data
Morris Jobke [Thu, 22 Jan 2015 22:59:52 +0000 (23:59 +0100)]
Merge pull request #13593 from owncloud/add-check-for-raw-post-data

Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6

9 years agoMerge pull request #13314 from owncloud/login-hook-logout
Morris Jobke [Thu, 22 Jan 2015 22:34:19 +0000 (23:34 +0100)]
Merge pull request #13314 from owncloud/login-hook-logout

Return false if the login is canceled in a hook

9 years agoadd always_populate_raw_post_data to .user.ini
Morris Jobke [Thu, 22 Jan 2015 22:18:16 +0000 (23:18 +0100)]
add always_populate_raw_post_data to .user.ini

9 years agoMerge pull request #13449 from owncloud/image_preview_limit
Thomas Müller [Thu, 22 Jan 2015 22:02:38 +0000 (23:02 +0100)]
Merge pull request #13449 from owncloud/image_preview_limit

add config-option for an image's maximum filesize when generating previews

9 years agoMerge pull request #13614 from owncloud/oc_image_log_fix
Thomas Müller [Thu, 22 Jan 2015 20:16:32 +0000 (21:16 +0100)]
Merge pull request #13614 from owncloud/oc_image_log_fix

remove insane debug-log from OC_Image

9 years agoadd config-option for an image's maximum filesize when generating previews
Georg Ehrke [Sun, 18 Jan 2015 23:22:55 +0000 (00:22 +0100)]
add config-option for an image's maximum filesize when generating previews

9 years agoremove insane debug-log from OC_Image
Georg Ehrke [Thu, 22 Jan 2015 19:17:25 +0000 (20:17 +0100)]
remove insane debug-log from OC_Image

9 years agoMerge pull request #13598 from owncloud/fix-undefined-offset
Thomas Müller [Thu, 22 Jan 2015 16:16:23 +0000 (17:16 +0100)]
Merge pull request #13598 from owncloud/fix-undefined-offset

Fix undefined offset 1 for wrong user mail address

9 years agoDo not call wrapStorage if storate with same name added twice
Vincent Petry [Wed, 21 Jan 2015 21:27:59 +0000 (22:27 +0100)]
Do not call wrapStorage if storate with same name added twice

9 years agoFix undefined offset 1 for wrong user mail address
Morris Jobke [Thu, 22 Jan 2015 14:17:29 +0000 (15:17 +0100)]
Fix undefined offset 1 for wrong user mail address

* fixes Undefined offset: 1 at lib/private/mail.php#143

9 years agoMerge pull request #13600 from owncloud/server-warning
Thomas Müller [Thu, 22 Jan 2015 15:03:54 +0000 (16:03 +0100)]
Merge pull request #13600 from owncloud/server-warning

Get rid of log warning when using servercontainer

9 years agoget rid of log warning when using servercontainer
Bernhard Posselt [Thu, 22 Jan 2015 14:33:09 +0000 (15:33 +0100)]
get rid of log warning when using servercontainer

9 years agotranslate error messages
Morris Jobke [Thu, 22 Jan 2015 13:52:47 +0000 (14:52 +0100)]
translate error messages

9 years agoThrow an exception when login is canceled by an app
Robin Appelman [Thu, 22 Jan 2015 13:13:17 +0000 (14:13 +0100)]
Throw an exception when login is canceled by an app

9 years agoAllow custom error messages for the login page
Robin Appelman [Thu, 22 Jan 2015 13:13:02 +0000 (14:13 +0100)]
Allow custom error messages for the login page

9 years agoAdd check for `HTTP_RAW_POST_DATA` setting for >= 5.6
Lukas Reschke [Thu, 22 Jan 2015 12:46:40 +0000 (13:46 +0100)]
Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6

PHP 5.6 otherwise throws notices for perfectly valid code which results in broken endpoints.

Fixes https://github.com/owncloud/core/issues/13592

9 years agoMerge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroup
Morris Jobke [Thu, 22 Jan 2015 09:40:29 +0000 (10:40 +0100)]
Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroup

Fix reshare permission change to not impair other deletion code

9 years agoFix reshare permission change to not impair other deletion code
Vincent Petry [Tue, 20 Jan 2015 12:09:39 +0000 (13:09 +0100)]
Fix reshare permission change to not impair other deletion code

A recent change that prevents reshare permission changes to delete group
share children had the side-effect of also preventing group share
children deletion when it needed to be done.

This fix adds an extra flag to isolate the "reshare permission change"
deletion case and keep the other ones as they were before, not only to
fix the regression but also fix other potential regressions in code that
uses this method.

Also updated the comment because now Helper::delete() is no longer
limited to reshares but also applies to group share children.

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 22 Jan 2015 06:55:09 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #13517 from owncloud/keymanager-storage
Morris Jobke [Wed, 21 Jan 2015 23:41:48 +0000 (00:41 +0100)]
Merge pull request #13517 from owncloud/keymanager-storage

Bypass the view when storing encryption keys

9 years agoMerge pull request #13568 from owncloud/s2s_delete_shares_jenkins
Morris Jobke [Wed, 21 Jan 2015 23:37:39 +0000 (00:37 +0100)]
Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins

[ignore] delete all server-to-server shares if a user gets deleted

9 years agoMerge pull request #13581 from owncloud/make-naming-consistent
Morris Jobke [Wed, 21 Jan 2015 23:29:50 +0000 (00:29 +0100)]
Merge pull request #13581 from owncloud/make-naming-consistent

Make naming of encryption app consistent

9 years agoMake naming of encryption app consistent
Lukas Reschke [Wed, 21 Jan 2015 22:27:45 +0000 (23:27 +0100)]
Make naming of encryption app consistent

Fixes https://github.com/owncloud/core/issues/13580