]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
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 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

10 years agoRemove etag warning in trashbin
Vincent Petry [Thu, 26 Jun 2014 08:50:59 +0000 (10:50 +0200)]
Remove etag warning in trashbin

When previews are available, the etag attribute is used for the icon.
But when none is set, a warning is shown.

This fix uses the timestamp as a dummy etag.

10 years agoMerge pull request #9197 from owncloud/fix_dir_seperator_oc6
Morris Jobke [Wed, 25 Jun 2014 09:03:29 +0000 (11:03 +0200)]
Merge pull request #9197 from owncloud/fix_dir_seperator_oc6

always use '/' as dir seperator

10 years agoalways use '/' as dir seperator
Bjoern Schiessle [Tue, 24 Jun 2014 16:45:22 +0000 (18:45 +0200)]
always use '/' as dir seperator

10 years ago6.0.4 v6.0.4
Frank Karlitschek [Tue, 24 Jun 2014 13:44:53 +0000 (09:44 -0400)]
6.0.4

10 years agoalways use a \OC\Files\View
Bjoern Schiessle [Mon, 23 Jun 2014 15:13:56 +0000 (17:13 +0200)]
always use a \OC\Files\View

10 years agoalways use oc filesystem for rename operation
Bjoern Schiessle [Mon, 23 Jun 2014 15:28:57 +0000 (17:28 +0200)]
always use oc filesystem for rename operation

10 years agoMerge pull request #9075 from owncloud/autosetup-trusteddomains
Frank Karlitschek [Fri, 20 Jun 2014 20:56:37 +0000 (16:56 -0400)]
Merge pull request #9075 from owncloud/autosetup-trusteddomains

trusted domains shall not be ignored on autosetup

10 years agoBackport subset of #4179, re-established Oracle compatibility for LDAP
Arthur Schiwon [Fri, 20 Jun 2014 18:47:51 +0000 (20:47 +0200)]
Backport subset of #4179, re-established Oracle compatibility for LDAP

10 years agoFix merging of external storage configurations
Vincent Petry [Wed, 26 Mar 2014 11:10:17 +0000 (12:10 +0100)]
Fix merging of external storage configurations

Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.

Fixed merging logic to make sure that class, mount point and options are
the same before merging them.

Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.

Backport of e002b72 from master

10 years agotrusted domains shall not be ignored on autosetup
Arthur Schiwon [Tue, 17 Jun 2014 20:58:08 +0000 (22:58 +0200)]
trusted domains shall not be ignored on autosetup

10 years agoMerge pull request #9002 from owncloud/ldap_wizard_pagedsearch
blizzz [Tue, 17 Jun 2014 08:04:57 +0000 (10:04 +0200)]
Merge pull request #9002 from owncloud/ldap_wizard_pagedsearch

LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups

10 years ago6.0.4 beta 1 v6.0.4beta1
Frank Karlitschek [Tue, 17 Jun 2014 06:48:46 +0000 (08:48 +0200)]
6.0.4 beta 1

10 years agoremove unused vars; increase scrutinizer happiness
Arthur Schiwon [Thu, 12 Jun 2014 11:21:25 +0000 (13:21 +0200)]
remove unused vars; increase scrutinizer happiness

10 years agosimplify two methods a bit, because they are not used for group search anymore
Arthur Schiwon [Thu, 12 Jun 2014 09:48:29 +0000 (11:48 +0200)]
simplify two methods a bit, because they are not used for group search anymore

10 years agomake all this work in an early configuration state in the wizard by marking the...
Arthur Schiwon [Wed, 11 Jun 2014 20:36:40 +0000 (22:36 +0200)]
make all this work in an early configuration state in the wizard by marking  the config active and ignoring the validation state.

10 years agoWizard: get really all groups from LDAP by power of Paged Search
Arthur Schiwon [Wed, 11 Jun 2014 19:38:16 +0000 (21:38 +0200)]
Wizard: get really all groups from LDAP by power of Paged Search

10 years agofix PHPdoc
Arthur Schiwon [Wed, 11 Jun 2014 19:37:23 +0000 (21:37 +0200)]
fix PHPdoc

10 years agoconsolidate requirement check
Arthur Schiwon [Wed, 11 Jun 2014 12:51:40 +0000 (14:51 +0200)]
consolidate requirement check

10 years agoLDAP Wizard: count users and groups with the power of paged search
Arthur Schiwon [Wed, 11 Jun 2014 12:37:23 +0000 (14:37 +0200)]
LDAP Wizard: count users and groups with the power of paged search

10 years agoadd method to count groups on LDAP
Arthur Schiwon [Wed, 11 Jun 2014 12:33:11 +0000 (14:33 +0200)]
add method to count groups on LDAP

10 years agofix PHPdoc
Arthur Schiwon [Wed, 11 Jun 2014 11:35:35 +0000 (13:35 +0200)]
fix PHPdoc

10 years agoMerge pull request #8623 from owncloud/fix-8457
blizzz [Mon, 16 Jun 2014 15:42:46 +0000 (17:42 +0200)]
Merge pull request #8623 from owncloud/fix-8457

LDAP: fix possible infinite loop, that causes hanging wizard, fixes #8457

10 years agoMerge pull request #9033 from owncloud/validate-dire
Lukas Reschke [Mon, 16 Jun 2014 14:20:21 +0000 (16:20 +0200)]
Merge pull request #9033 from owncloud/validate-dire

Add deprecation notice to load* functions

10 years agoMerge pull request #9008 from owncloud/repair-parent-stable6
Vincent Petry [Mon, 16 Jun 2014 13:00:22 +0000 (15:00 +0200)]
Merge pull request #9008 from owncloud/repair-parent-stable6

Repair broken parent link in the scanner - stable6

10 years agoFix unit test
Robin Appelman [Mon, 16 Jun 2014 11:37:08 +0000 (13:37 +0200)]
Fix unit test

10 years agoAdd deprecation notice to load* functions
Lukas Reschke [Sat, 14 Jun 2014 09:05:12 +0000 (11:05 +0200)]
Add deprecation notice to load* functions

This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.

Please review @karlitschek and others. Backport to stable5 and master requested.

10 years agoMerge pull request #9015 from owncloud/stable6-downloadwithdisabledzip
Morris Jobke [Fri, 13 Jun 2014 11:09:41 +0000 (13:09 +0200)]
Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzip

[stable6] Fix public download link when zip download is disabled

10 years agoMerge pull request #8988 from owncloud/stable6_fix_encryption
Vincent Petry [Fri, 13 Jun 2014 08:31:18 +0000 (10:31 +0200)]
Merge pull request #8988 from owncloud/stable6_fix_encryption

Stable6 fix encryption

10 years agoMerge pull request #9016 from owncloud/stable6-maxheartbeatinterval
Morris Jobke [Thu, 12 Jun 2014 22:19:36 +0000 (00:19 +0200)]
Merge pull request #9016 from owncloud/stable6-maxheartbeatinterval

[stable6] Added max heartbeat interval to prevent integer overflow

10 years agoAdded max heartbeat interval to prevent integer overflow
Vincent Petry [Thu, 12 Jun 2014 16:26:08 +0000 (18:26 +0200)]
Added max heartbeat interval to prevent integer overflow

When using big session timeout values, the interval value might overflow
and cause the setInterval() call to ping the server in a loop without
any delay.

This fix adds a maximum ping interval of 24 hours.

10 years agoFix public download link when zip download is disabled
Vincent Petry [Thu, 12 Jun 2014 15:29:55 +0000 (17:29 +0200)]
Fix public download link when zip download is disabled

When zip download is disabled, the public download action defined in
public.js is overridden by the one in fileactions.js because of the JS
loading order.

This quick fix prevents the override to happen when a download action is
already defined.

There are additional changes that were required to make the download
action icon work when registered from the public page.

10 years agoremove unused argument
Robin Appelman [Tue, 10 Jun 2014 13:42:37 +0000 (15:42 +0200)]
remove unused argument

10 years agoadd some comments
Robin Appelman [Tue, 10 Jun 2014 13:37:43 +0000 (15:37 +0200)]
add some comments

10 years agoRepair broken parent link in the scanner
Robin Appelman [Tue, 10 Jun 2014 13:26:18 +0000 (15:26 +0200)]
Repair broken parent link in the scanner

10 years agoFix copy conflict dialog translation
Jörn Friedrich Dreyer [Mon, 7 Apr 2014 09:46:47 +0000 (11:46 +0200)]
Fix copy conflict dialog translation

backport of fileexist template translations
with minor fixes

10 years agofix rename of encryption keys
Bjoern Schiessle [Wed, 11 Jun 2014 15:21:08 +0000 (17:21 +0200)]
fix rename of encryption keys

10 years agoMerge pull request #8970 from owncloud/cache-change-propagator-stable6
Vincent Petry [Tue, 10 Jun 2014 15:17:35 +0000 (17:17 +0200)]
Merge pull request #8970 from owncloud/cache-change-propagator-stable6

Cache change propagator stable6

10 years agoFix unit tests
Robin Appelman [Wed, 4 Jun 2014 08:01:50 +0000 (10:01 +0200)]
Fix unit tests

10 years agoFix size calculation during recursive scan
Robin Appelman [Tue, 3 Jun 2014 09:55:35 +0000 (11:55 +0200)]
Fix size calculation during recursive scan

10 years agoFix unit tests
Robin Appelman [Tue, 3 Jun 2014 09:34:48 +0000 (11:34 +0200)]
Fix unit tests

10 years agoFix recursive scanning
Robin Appelman [Mon, 2 Jun 2014 19:04:36 +0000 (21:04 +0200)]
Fix recursive scanning

10 years agopropagate changes in the scanner
Robin Appelman [Mon, 2 Jun 2014 13:17:00 +0000 (15:17 +0200)]
propagate changes in the scanner

10 years agoSplit of cache writes in the scanner to their own methods
Robin Appelman [Mon, 2 Jun 2014 12:52:21 +0000 (14:52 +0200)]
Split of cache writes in the scanner to their own methods

10 years agoAdd a change propagator class to handle propagating etag and mtime changes
Robin Appelman [Fri, 30 May 2014 13:55:17 +0000 (15:55 +0200)]
Add a change propagator class to handle propagating etag and mtime changes

10 years agoMerge pull request #8885 from owncloud/flock-stable6
Thomas Müller [Fri, 6 Jun 2014 15:58:08 +0000 (17:58 +0200)]
Merge pull request #8885 from owncloud/flock-stable6

[stable6][WIP] Move Flock basics into stable6

10 years agofix failing unit test
Thomas Müller [Fri, 6 Jun 2014 13:48:02 +0000 (15:48 +0200)]
fix failing unit test

10 years agokeep long file names in one line to not overflow download button on mobile
Jan-Christoph Borchardt [Thu, 17 Apr 2014 14:58:57 +0000 (16:58 +0200)]
keep long file names in one line to not overflow download button on mobile

10 years agoadd max-width to directLink input to prevent overflow
Jan-Christoph Borchardt [Wed, 16 Apr 2014 14:43:35 +0000 (16:43 +0200)]
add max-width to directLink input to prevent overflow

10 years agoDont backport unit tests for code that isn't backported
Robin Appelman [Thu, 5 Jun 2014 08:18:26 +0000 (10:18 +0200)]
Dont backport unit tests for code that isn't backported

10 years agoadded missing LockNotAcquiredException
Thomas Müller [Wed, 4 Jun 2014 18:53:39 +0000 (20:53 +0200)]
added missing LockNotAcquiredException

10 years agoContinued flock work.
ringmaster [Fri, 23 May 2014 14:29:37 +0000 (10:29 -0400)]
Continued flock work.

add actual locking and log changes necessary for debugging.

Simpler log unique id.

Respect locked files, surface correct exception.

Conflicts:
lib/private/connector/sabre/file.php

Remove unused methods.

Conflicts:
lib/private/files/storage/local.php

Fix typo

Fix typo

Removed unused vars/declarations, update PHPDoc.

Don't error out on console.

Move Lock to private namespace, add interface. Update PHPDoc.

Restore the reference to this used exception class.

make sure to close the stream at the end of each test

Normalize lock exception messages.

don't ask for fileInfo if we already have one

Conflicts:
apps/files_encryption/lib/proxy.php

name the storage wrapper to make sure that we don't apply the wrapper multiple times

Conflicts:
lib/private/util.php

fix unit test after adding the additional parameter to addStorageWrapper()

only lock if unlink is called for a file

Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.

Conflicts:
tests/lib/files/filesystem.php

Use ->instanceOfStorage() not instanceof for Storage instances.

Conflicts:
lib/private/helper.php

get the storage from the view

Conflicts:
apps/files_encryption/tests/webdav.php

workaround to get the unit test going

Conflicts:
apps/files_encryption/hooks/hooks.php

Added isLocal() method to storage, used for xsendfile

Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.

Conflicts:
lib/private/files.php

Add ->instanceOfStorage to handle instanceof for storage wrappers

Conflicts:
lib/private/files/storage/common.php
lib/private/files/storage/wrapper/wrapper.php
lib/public/files/storage.php

Use instanceOfStorage instead of instanceof

Conflicts:
lib/private/files.php

Fix storage wrapper being called with null

Pass any methods custom to specific storage implementations to the wrapped storage

remove duplicate declaration of isLocal()

remove file locking - code will continue to live in it's own app

10 years agoMerge pull request #8870 from owncloud/storage-instanceof-stable6
Vincent Petry [Thu, 5 Jun 2014 09:16:08 +0000 (11:16 +0200)]
Merge pull request #8870 from owncloud/storage-instanceof-stable6

Add storage->instanceOfStorage() - stable6

10 years agoPass any methods custom to specific storage implementations to the wrapped storage
Robin Appelman [Thu, 29 May 2014 14:13:05 +0000 (16:13 +0200)]
Pass any methods custom to specific storage implementations to the wrapped storage

10 years agoFix storage wrapper being called with null
Robin Appelman [Thu, 29 May 2014 12:15:48 +0000 (14:15 +0200)]
Fix storage wrapper being called with null

10 years agoUse instanceOfStorage instead of instanceof
Robin Appelman [Thu, 29 May 2014 11:52:58 +0000 (13:52 +0200)]
Use instanceOfStorage instead of instanceof

10 years agoAdd ->instanceOfStorage to handle instanceof for storage wrappers
Robin Appelman [Thu, 29 May 2014 11:45:50 +0000 (13:45 +0200)]
Add ->instanceOfStorage to handle instanceof for storage wrappers

10 years agoMerge pull request #8847 from owncloud/stable6_backport_8557
Thomas Müller [Wed, 4 Jun 2014 08:26:59 +0000 (10:26 +0200)]
Merge pull request #8847 from owncloud/stable6_backport_8557

Stable6 backport of #8557

10 years agoMerge pull request #8850 from owncloud/stable6_backport_8607
Thomas Müller [Wed, 4 Jun 2014 07:34:39 +0000 (09:34 +0200)]
Merge pull request #8850 from owncloud/stable6_backport_8607

[backport] [stable6] Skip filescan but execute hooks

10 years ago[backport] [stable6] Skip filescan but execute hooks
ringmaster [Fri, 16 May 2014 02:38:46 +0000 (22:38 -0400)]
[backport] [stable6] Skip filescan but execute hooks

Backport of #8607

10 years agoAllow apps to create custom session handlers.
ringmaster [Mon, 12 May 2014 15:08:28 +0000 (11:08 -0400)]
Allow apps to create custom session handlers.

10 years agoMerge pull request #8579 from owncloud/ldap_nail_filter_on_upgrade
blizzz [Mon, 2 Jun 2014 10:02:15 +0000 (12:02 +0200)]
Merge pull request #8579 from owncloud/ldap_nail_filter_on_upgrade

LDAP: fix filter can be reset and broken after upgrade from OC 5

10 years agoMerge pull request #8672 from owncloud/stable6-obfuscatepasswords
Frank Karlitschek [Mon, 2 Jun 2014 09:56:36 +0000 (11:56 +0200)]
Merge pull request #8672 from owncloud/stable6-obfuscatepasswords

[backport] [stable6] Added password obfuscation for external storage config

10 years agoMerge pull request #8692 from owncloud/fix_unit_tests_oc6
Thomas Müller [Wed, 28 May 2014 15:44:40 +0000 (17:44 +0200)]
Merge pull request #8692 from owncloud/fix_unit_tests_oc6

fix failing unit tests on OC6

10 years agosimpler and better readable assignment
Arthur Schiwon [Wed, 28 May 2014 15:24:04 +0000 (17:24 +0200)]
simpler and better readable assignment

10 years agoMerge pull request #8683 from owncloud/log-upload-error-stable6
Thomas Müller [Wed, 28 May 2014 11:07:18 +0000 (13:07 +0200)]
Merge pull request #8683 from owncloud/log-upload-error-stable6

Log upload error stable6