]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoFix getting group '0' from database backend
Joas Schilling [Mon, 4 Aug 2014 11:46:53 +0000 (13:46 +0200)]
Fix getting group '0' from database backend

Fix #9972

10 years agoadd optional countUsersInGroup method to group backends
Arthur Schiwon [Fri, 4 Apr 2014 16:56:14 +0000 (18:56 +0200)]
add optional countUsersInGroup method to group backends

Conflicts:
lib/private/group/backend.php
lib/private/group/database.php
lib/private/group/dummy.php

10 years agoremove unneeded ; in comment
Robin Appelman [Thu, 12 Dec 2013 12:59:00 +0000 (13:59 +0100)]
remove unneeded ; in comment

10 years agouser Group->users as assosiative array
Robin Appelman [Wed, 11 Dec 2013 15:25:41 +0000 (16:25 +0100)]
user Group->users as assosiative array

10 years agocache the result from inGroup
Robin Appelman [Wed, 11 Dec 2013 14:47:36 +0000 (15:47 +0100)]
cache the result from inGroup

10 years agoFix test cases for group manager
Robin Appelman [Fri, 14 Feb 2014 14:07:08 +0000 (15:07 +0100)]
Fix test cases for group manager

10 years agoremove duplicate call to groupExists
Robin Appelman [Fri, 14 Feb 2014 13:25:45 +0000 (14:25 +0100)]
remove duplicate call to groupExists

10 years agoBackport of #9225
voxsim [Thu, 26 Jun 2014 10:38:33 +0000 (12:38 +0200)]
Backport of #9225

fix in displayNamesInGroup: when specified limit N, we did complex search only in the first N users

change logic in displayNamesInGroup and add some unit tests

add more logic in displayNamesInGroup for big user bases

1. remove sizeof($filteredUsers) > 0 as condition
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;

Conflicts:
tests/lib/group/manager.php

10 years agoRevert "Reword the description"
Lukas Reschke [Tue, 16 Sep 2014 14:03:30 +0000 (16:03 +0200)]
Revert "Reword the description"

This reverts commit 16c5925155bfd6c7cc35745b233b0739fb513f51.

10 years agoReword the description
Lukas Reschke [Tue, 16 Sep 2014 13:51:48 +0000 (15:51 +0200)]
Reword the description

The old one was just horrible wrong.
Conflicts:
config/config.sample.php

10 years agoMerge pull request #11025 from owncloud/nojavascript
Thomas Müller [Fri, 12 Sep 2014 09:30:33 +0000 (11:30 +0200)]
Merge pull request #11025 from owncloud/nojavascript

introduce no-javascript message, manual backport of #6202 and #10944

10 years agointroduce no-javascript message, manual backport of #6202 and #10944, fix #10841
Jan-Christoph Borchardt [Thu, 11 Sep 2014 14:09:36 +0000 (16:09 +0200)]
introduce no-javascript message, manual backport of #6202 and #10944, fix #10841

10 years agoAdd displayname for admins
tomneedham [Tue, 18 Feb 2014 09:50:46 +0000 (09:50 +0000)]
Add displayname for admins

10 years agoMerge pull request #10250 from owncloud/block-folder-upload-stable6
Vincent Petry [Wed, 3 Sep 2014 15:15:59 +0000 (17:15 +0200)]
Merge pull request #10250 from owncloud/block-folder-upload-stable6

Prevent folder upload causing unexpected behavior

10 years agoMerge pull request #10645 from owncloud/backport_7728
Thomas Müller [Wed, 3 Sep 2014 10:46:12 +0000 (12:46 +0200)]
Merge pull request #10645 from owncloud/backport_7728

Backport 7728

10 years agoMerge pull request #10774 from owncloud/backport-getUserFolder
Thomas Müller [Wed, 3 Sep 2014 09:06:02 +0000 (11:06 +0200)]
Merge pull request #10774 from owncloud/backport-getUserFolder

Add optional user ID parameter for getUseFolder

10 years agoAdd optional user ID parameter for getUseFolder
Morris Jobke [Sun, 31 Aug 2014 07:49:19 +0000 (09:49 +0200)]
Add optional user ID parameter for getUseFolder

Conflicts:
lib/private/server.php

10 years agoretrieve local users, groups and group members in a sorted way
Arthur Schiwon [Fri, 29 Aug 2014 13:17:37 +0000 (15:17 +0200)]
retrieve local users, groups and group members in a sorted way

10 years agoMerge pull request #10694 from owncloud/allow_empty_hostname_and_dots_in_service_name...
Thomas Müller [Fri, 29 Aug 2014 15:07:21 +0000 (17:07 +0200)]
Merge pull request #10694 from owncloud/allow_empty_hostname_and_dots_in_service_name_for_oracle_autosetup

allow empty hostname and dots in service name for oracle autosetup

10 years agoallow empty hostname and dots in service name for oracle autosetup
Jörn Friedrich Dreyer [Thu, 28 Aug 2014 13:54:28 +0000 (15:54 +0200)]
allow empty hostname and dots in service name for oracle autosetup

10 years agoMerge pull request #10631 from owncloud/fixWizardTest_stable6
blizzz [Thu, 28 Aug 2014 09:33:42 +0000 (11:33 +0200)]
Merge pull request #10631 from owncloud/fixWizardTest_stable6

fix wizard test, adjust to changed parameters of the tested method, intr...

10 years agoEscape error messages
Lukas Reschke [Wed, 27 Aug 2014 15:01:51 +0000 (17:01 +0200)]
Escape error messages

10 years agoMerge pull request #10660 from owncloud/use_notification_to_show_error_on_new_via_web...
Jörn Friedrich Dreyer [Wed, 27 Aug 2014 09:46:08 +0000 (11:46 +0200)]
Merge pull request #10660 from owncloud/use_notification_to_show_error_on_new_via_web_stable6

use notification to show error on new via web

10 years agouse notification to shw error on new via web
Jörn Friedrich Dreyer [Wed, 27 Aug 2014 08:44:10 +0000 (10:44 +0200)]
use notification to shw error on new via web

10 years agounit tests for specific image type output added
Thomas Müller [Mon, 17 Mar 2014 07:40:59 +0000 (08:40 +0100)]
unit tests for specific image type output added

10 years agoexcerpt code changes from 79ba930ef90d3e54c02f62c43f61c190e11fb4ec
Georg Ehrke [Tue, 26 Aug 2014 17:39:30 +0000 (19:39 +0200)]
excerpt code changes from 79ba930ef90d3e54c02f62c43f61c190e11fb4ec

10 years agoOC_Image::_output() - throw exception instead of falling back to png
Georg Ehrke [Fri, 14 Mar 2014 17:19:16 +0000 (18:19 +0100)]
OC_Image::_output() - throw exception instead of falling back to png

10 years agoremove image/pjpeg from OC_Image::_output
Georg Ehrke [Fri, 14 Mar 2014 17:12:33 +0000 (18:12 +0100)]
remove image/pjpeg from OC_Image::_output

10 years agodon't change mimetype of whole image object
Georg Ehrke [Fri, 14 Mar 2014 10:17:20 +0000 (11:17 +0100)]
don't change mimetype of whole image object

10 years agoalways output a png
Georg Ehrke [Fri, 14 Mar 2014 10:14:09 +0000 (11:14 +0100)]
always output a png

10 years agomake it possible to influence output type of \OC_Image
Georg Ehrke [Fri, 14 Mar 2014 10:13:45 +0000 (11:13 +0100)]
make it possible to influence output type of \OC_Image

Conflicts:
lib/private/image.php

10 years ago6.0.5 v6.0.5
Frank Karlitschek [Tue, 26 Aug 2014 10:04:32 +0000 (12:04 +0200)]
6.0.5

10 years agofix wizard test, adjust to changed parameters of the tested method, introduced by...
Arthur Schiwon [Tue, 26 Aug 2014 08:50:00 +0000 (10:50 +0200)]
fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc1f73159f335646ca89be4db72b125e

10 years agoMerge pull request #10448 from owncloud/check_quota_on_new_via_web_stable6
Jörn Friedrich Dreyer [Mon, 25 Aug 2014 13:17:37 +0000 (15:17 +0200)]
Merge pull request #10448 from owncloud/check_quota_on_new_via_web_stable6

check quota when trying to download a file via new -> web

10 years ago6.0.5 RC1 v6.0.5RC1
Frank Karlitschek [Thu, 21 Aug 2014 03:37:53 +0000 (05:37 +0200)]
6.0.5 RC1

10 years agoAlso encode > and '
Lukas Reschke [Sun, 13 Apr 2014 13:24:35 +0000 (15:24 +0200)]
Also encode > and '

10 years agoproperly encode groups as json, not ',' separated
Jörn Friedrich Dreyer [Tue, 19 Aug 2014 09:29:09 +0000 (11:29 +0200)]
properly encode groups as json, not ',' separated

10 years agoset incognitoMode to true, getUser should always return false during public upload
Bjoern Schiessle [Mon, 18 Aug 2014 14:39:25 +0000 (16:39 +0200)]
set incognitoMode to true, getUser should always return false during public upload

10 years agoMerge pull request #10146 from owncloud/fix-8578-stable6
Lukas Reschke [Sun, 17 Aug 2014 17:11:10 +0000 (19:11 +0200)]
Merge pull request #10146 from owncloud/fix-8578-stable6

Update 3rdparty to replace fpassthru() in Sabre.

10 years agocheck quota when trying to download a file via new -> web
Jörn Friedrich Dreyer [Fri, 8 Aug 2014 12:35:33 +0000 (14:35 +0200)]
check quota when trying to download a file via new -> web

10 years agoMerge pull request #10440 from owncloud/enforce-debug
Clark Tomlinson [Fri, 15 Aug 2014 13:03:29 +0000 (09:03 -0400)]
Merge pull request #10440 from owncloud/enforce-debug

Remove ability to trigger DEBUG mode via cookie

10 years agoMerge pull request #10034 from owncloud/remove-es_MX-from-stable6
Lukas Reschke [Fri, 15 Aug 2014 12:07:52 +0000 (14:07 +0200)]
Merge pull request #10034 from owncloud/remove-es_MX-from-stable6

Remove es mx from stable6

10 years agowe need the recipient as a additional parameter to know for which share the notificat...
Bjoern Schiessle [Thu, 14 Aug 2014 15:51:16 +0000 (17:51 +0200)]
we need the recipient as a additional parameter to know for which share the notification was send

10 years agoFix Upload button does not disappear
Vincent Petry [Thu, 14 Aug 2014 11:56:27 +0000 (13:56 +0200)]
Fix Upload button does not disappear

Tipsy tooltip must be hidden when the upload starts. Otherwise it covers
the progress bar and stays in DOM.

Backport of fa28c089fa3ffb72e97ca0f89cbfade3d0a8a8a5 and
90839b784f748b18a2a5fae4cc3f80bd1df7b355 from master

10 years agoMinor changes in config.sample
Volkan Gezer [Sat, 3 May 2014 12:41:36 +0000 (14:41 +0200)]
Minor changes in config.sample

* appcodechecker accepts boolean.
* using different ports in trusted domains

Partially fixes #330

10 years agofix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser
Bjoern Schiessle [Tue, 12 Aug 2014 13:16:16 +0000 (15:16 +0200)]
fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser

10 years agoadd unit tests
Bjoern Schiessle [Tue, 5 Aug 2014 13:55:28 +0000 (15:55 +0200)]
add unit tests

10 years agofix detection of system wide mount points
Bjoern Schiessle [Tue, 5 Aug 2014 13:25:52 +0000 (15:25 +0200)]
fix detection of system wide mount points

10 years agoMerge pull request #10344 from owncloud/backport-10096-stable6
Lukas Reschke [Mon, 11 Aug 2014 19:31:53 +0000 (21:31 +0200)]
Merge pull request #10344 from owncloud/backport-10096-stable6

 in case $_POST['itemSourceName'] does not exist we simply default it to...

10 years ago in case $_POST['itemSourceName'] does not exist we simply default it to null
Thomas Müller [Mon, 11 Aug 2014 15:56:36 +0000 (17:56 +0200)]
 in case $_POST['itemSourceName'] does not exist we simply default it to null

10 years agobackport of #9848
Jean-Louis Dupond [Thu, 24 Jul 2014 12:18:41 +0000 (14:18 +0200)]
backport of #9848

Fix memberOf detection. Fixes: #9835

Conflicts:
apps/user_ldap/lib/wizard.php

Fix remarks in #9848

Conflicts:
apps/user_ldap/lib/wizard.php

Fix initializing in #9848

do not change var names here

10 years agoMerge pull request #10315 from owncloud/clarify-encryption-descripti
Frank Karlitschek [Sun, 10 Aug 2014 21:11:31 +0000 (17:11 -0400)]
Merge pull request #10315 from owncloud/clarify-encryption-descripti

clearify the use-case of this app

10 years agoclearify the use-case of this app
Lukas Reschke [Sat, 9 Aug 2014 20:59:42 +0000 (22:59 +0200)]
clearify the use-case of this app

Backport of https://github.com/owncloud/core/commit/8a24e1eb9624 to stable7

10 years agoMerge pull request #9675 from owncloud/stable6-9647
Jörn Friedrich Dreyer [Sat, 9 Aug 2014 00:41:33 +0000 (02:41 +0200)]
Merge pull request #9675 from owncloud/stable6-9647

[stable6] Add unit test for multi-user configuration loading

10 years agoAdd unit test for multi-user configuration loading
Robin McCorkell [Tue, 15 Jul 2014 17:39:09 +0000 (18:39 +0100)]
Add unit test for multi-user configuration loading

10 years agoPrevent folder upload causing unexpected behavior
Robin Appelman [Thu, 7 Aug 2014 13:43:38 +0000 (15:43 +0200)]
Prevent folder upload causing unexpected behavior

10 years agoUpdate 3rdparty to replace fpassthru() in Sabre.
Andreas Fischer [Mon, 4 Aug 2014 13:15:55 +0000 (15:15 +0200)]
Update 3rdparty to replace fpassthru() in Sabre.

10 years agodon't preload videos on public sharing, fixes #10042
Georg Ehrke [Wed, 30 Jul 2014 15:06:41 +0000 (17:06 +0200)]
don't preload videos on public sharing, fixes #10042

10 years agoFix template rendering for 'blank' templates
Morris Jobke [Fri, 25 Jul 2014 22:04:49 +0000 (00:04 +0200)]
Fix template rendering for 'blank' templates

10 years agoremove l10n folder - sync script and transifex config are no longer required on a...
Thomas Müller [Tue, 29 Jul 2014 20:51:14 +0000 (22:51 +0200)]
remove l10n folder - sync script and transifex config are no longer required on a stable branch

10 years agoremove language es_MX
Thomas Müller [Tue, 29 Jul 2014 20:48:21 +0000 (22:48 +0200)]
remove language es_MX

10 years agoMerge pull request #9575 from owncloud/fix-7038
Vincent Petry [Tue, 22 Jul 2014 16:25:45 +0000 (18:25 +0200)]
Merge pull request #9575 from owncloud/fix-7038

Hack to avoid Agent DN + Password being overwritten by some ugly browser...

10 years agoMerge pull request #9776 from owncloud/backport-9738-stable6
Thomas Müller [Tue, 22 Jul 2014 14:42:31 +0000 (16:42 +0200)]
Merge pull request #9776 from owncloud/backport-9738-stable6

Backport 9738 stable6

10 years agoRemove uneeded `strip_tags`
Lukas Reschke [Sat, 19 Jul 2014 08:17:24 +0000 (10:17 +0200)]
Remove uneeded `strip_tags`

This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)

Needs https://github.com/owncloud/core/pull/9735 to be merged first.

10 years agoExtract Auth Header logic into new function handleAuthHeaders().
Andreas Fischer [Sat, 19 Jul 2014 00:16:28 +0000 (02:16 +0200)]
Extract Auth Header logic into new function handleAuthHeaders().

Conflicts:
lib/base.php

10 years agoDeduplicate user/password extraction from alternative HTTP headers.
Andreas Fischer [Sat, 19 Jul 2014 00:06:37 +0000 (02:06 +0200)]
Deduplicate user/password extraction from alternative HTTP headers.

10 years agoMerge pull request #9109 from owncloud/stable6-extstorage-multiplemountpointconfig
Vincent Petry [Tue, 22 Jul 2014 13:28:00 +0000 (15:28 +0200)]
Merge pull request #9109 from owncloud/stable6-extstorage-multiplemountpointconfig

[6.0.5] Fix merging of external storage configurations

10 years agoMerge pull request #9717 from owncloud/backport_9668
Vincent Petry [Fri, 18 Jul 2014 13:03:17 +0000 (15:03 +0200)]
Merge pull request #9717 from owncloud/backport_9668

[encryption] update keys recursively if a folder was moved (oc6 backport)

10 years agologin() must be called after getServerPublicHostKey().
Andreas Fischer [Sat, 12 Jul 2014 18:41:35 +0000 (20:41 +0200)]
login() must be called after getServerPublicHostKey().

10 years agomake sure that we don't connect hooks multiple times
Bjoern Schiessle [Fri, 18 Jul 2014 10:12:32 +0000 (12:12 +0200)]
make sure that we don't connect hooks multiple times

10 years agocheck that the file proxies are enabled after each test
Bjoern Schiessle [Fri, 18 Jul 2014 08:51:22 +0000 (10:51 +0200)]
check that the file proxies are enabled after each test

10 years agoupdate keys recursively if a folder was moved
Bjoern Schiessle [Thu, 17 Jul 2014 12:28:52 +0000 (14:28 +0200)]
update keys recursively if a folder was moved

10 years agoHack to avoid Agent DN + Password being overwritten by some ugly browsers with stored...
Arthur Schiwon [Thu, 10 Jul 2014 17:33:53 +0000 (19:33 +0200)]
Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials

10 years agoMerge pull request #9511 from owncloud/stable6-download-button-public-folder
Vincent Petry [Tue, 15 Jul 2014 15:36:45 +0000 (17:36 +0200)]
Merge pull request #9511 from owncloud/stable6-download-button-public-folder

[stable6] Bring back the download button public folder

10 years agoMerge pull request #9635 from owncloud/stable6-files_external_fix_readData
Vincent Petry [Tue, 15 Jul 2014 15:11:49 +0000 (17:11 +0200)]
Merge pull request #9635 from owncloud/stable6-files_external_fix_readData

[stable6 backport] Permit personal mount points to be used for sharing

10 years agoPermit personal mount points to be used for sharing
Robin McCorkell [Mon, 21 Apr 2014 20:41:45 +0000 (21:41 +0100)]
Permit personal mount points to be used for sharing

An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.

`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.

Backport of abfd7ec from master

10 years agoMerge pull request #9618 from owncloud/fix_8345
Vincent Petry [Tue, 15 Jul 2014 10:15:25 +0000 (12:15 +0200)]
Merge pull request #9618 from owncloud/fix_8345

throw exception if file is to large for trash bin

10 years agoappend file extension to the temporary file which contains the downloaded archive...
Thomas Müller [Fri, 11 Jul 2014 14:51:59 +0000 (16:51 +0200)]
append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable

10 years agothrow exception if file is to large for trash bin
Bjoern Schiessle [Mon, 14 Jul 2014 15:03:36 +0000 (17:03 +0200)]
throw exception if file is to large for trash bin

10 years agoMerge pull request #9581 from owncloud/backport-9500
blizzz [Fri, 11 Jul 2014 11:30:22 +0000 (13:30 +0200)]
Merge pull request #9581 from owncloud/backport-9500

Backport of #9500 to stable6

10 years agodo not write to appconfig or preference tables if the value is unchanged
Arthur Schiwon [Thu, 10 Jul 2014 22:13:52 +0000 (00:13 +0200)]
do not write to appconfig or preference tables if the value is unchanged

10 years agodon't trigger update from checkPassword, it is already called by userExists, this...
Arthur Schiwon [Thu, 10 Jul 2014 21:48:38 +0000 (23:48 +0200)]
don't trigger update from checkPassword, it is already called by userExists, this is enough.

10 years agoMerge pull request #9523 from owncloud/stable6-fix-9302-master
Vincent Petry [Wed, 9 Jul 2014 15:58:54 +0000 (17:58 +0200)]
Merge pull request #9523 from owncloud/stable6-fix-9302-master

[stable6] Upload abortion is now detected within the  OC_Connector_Sabre_File::put...

10 years agoUpload abortion is now detected within the OC_Connector_Sabre_File::put()
Thomas Müller [Tue, 8 Jul 2014 07:44:46 +0000 (09:44 +0200)]
Upload abortion is now detected within the  OC_Connector_Sabre_File::put()

OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()

Backport of ea269f0 from master

10 years agoFix Signiture Does Not Match when mounting Amazon S3 external storage
Christopher T. Johnson [Mon, 14 Apr 2014 13:49:43 +0000 (09:49 -0400)]
Fix Signiture Does Not Match when mounting Amazon S3 external storage

For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.

When we are at the top of a S3 bucket there is a need(?) to have a directory
name.  Per standard Unix the name picked was '.' (dot or period).  This
choice exercises the aws-sdk bug.

This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'.  We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable.  Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().

An example where we don't process through clean key would be
'Key' => $path.'/',

Use correct relationship operator

Per feed back use === instead of ==

use '/' instead of '<root>'

10 years agodisable download button if zip download is disabled
Thomas Müller [Fri, 2 May 2014 13:51:41 +0000 (15:51 +0200)]
disable download button if zip download is disabled

Backport of 6e75b37

10 years agofix position and look of public download button
Jan-Christoph Borchardt [Fri, 2 May 2014 13:24:23 +0000 (15:24 +0200)]
fix position and look of public download button

Backport of 899c7c0 from master

10 years agoremove unneeded header-right details styles
Jan-Christoph Borchardt [Fri, 2 May 2014 13:14:41 +0000 (15:14 +0200)]
remove unneeded header-right details styles

Backport a280a69

10 years agoremove file name from upper right button
Thomas Müller [Tue, 29 Apr 2014 15:16:14 +0000 (17:16 +0200)]
remove file name from upper right button

Backport of 003049e from master

10 years agoreintroduce download button on public shares
Thomas Müller [Tue, 29 Apr 2014 13:28:35 +0000 (15:28 +0200)]
reintroduce download button on public shares

Backport of df32254 from master

10 years agoBackport of #9156
Arthur Schiwon [Fri, 4 Jul 2014 13:15:45 +0000 (15:15 +0200)]
Backport of #9156

10 years agoMerge pull request #9250 from owncloud/enc_check_if_file_exists_oc6
Björn Schießle [Tue, 1 Jul 2014 09:15:21 +0000 (11:15 +0200)]
Merge pull request #9250 from owncloud/enc_check_if_file_exists_oc6

[encryption] check if file exists (OC6)

10 years agoimproved error message
Bjoern Schiessle [Mon, 30 Jun 2014 14:28:40 +0000 (16:28 +0200)]
improved error message

10 years agounit tests
Bjoern Schiessle [Thu, 26 Jun 2014 15:38:06 +0000 (17:38 +0200)]
unit tests

10 years agocheck if file exists before deleting keys, and add debug output for every
Bjoern Schiessle [Wed, 25 Jun 2014 17:21:55 +0000 (19:21 +0200)]
check if file exists before deleting keys, and add debug output for every
delete operation

10 years agoMerge pull request #9251 from owncloud/enc_always_find_mount_point
Vincent Petry [Fri, 27 Jun 2014 14:49:01 +0000 (16:49 +0200)]
Merge pull request #9251 from owncloud/enc_always_find_mount_point

[encryption] make sure that we always detect the system wide mount point

10 years agonormalize path before comparison to make sure that we always find the mount point
Bjoern Schiessle [Fri, 27 Jun 2014 10:20:29 +0000 (12:20 +0200)]
normalize path before comparison to make sure that we always find the mount point

10 years agoMerge pull request #9173 from owncloud/enc_always_use_oc_filesview_oc6
Björn Schießle [Thu, 26 Jun 2014 13:11:55 +0000 (15:11 +0200)]
Merge pull request #9173 from owncloud/enc_always_use_oc_filesview_oc6

[encryption] always use oc filesview, backport for OC6

10 years agoMerge pull request #9219 from owncloud/stable6-trashwarning
Morris Jobke [Thu, 26 Jun 2014 11:40:33 +0000 (13:40 +0200)]
Merge pull request #9219 from owncloud/stable6-trashwarning

[stable6] Fix trashbin warnings in logs

10 years agoDo not retrieve storage stats for trash bin
Vincent Petry [Tue, 25 Mar 2014 10:00:01 +0000 (11:00 +0100)]
Do not retrieve storage stats for trash bin