Commit Graph

9644 Commits

Author SHA1 Message Date
Jenkins for ownCloud 55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Morris Jobke 87b39e8f03 Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage
Catch storage exception in scanner for remote shares
2015-01-28 00:31:37 +01:00
Vincent Petry acec40fe5a Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix
Call final unlink in trash wrapper's storage
2015-01-27 17:05:38 +01:00
Vincent Petry 3764515365 Allow saving incomplete external storage config
This is needed for Dropbox and others that need a token.
2015-01-27 13:44:05 +01:00
Vincent Petry c4b02176dc 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.
2015-01-27 13:44:05 +01:00
Thomas Müller 1add2f3f58 Merge pull request #13679 from owncloud/public-disablesharejsplugin
Disable JS plugin for sharing in public mode
2015-01-27 09:33:38 +01:00
Thomas Müller 29f49ddc3d Merge pull request #13691 from owncloud/s2s-acceptsinglefile
Only reload file list after remote share accept request returns
2015-01-27 09:32:33 +01:00
Jenkins for ownCloud c8f58054b0 [tx-robot] updated from transifex 2015-01-27 01:54:34 -05:00
Vincent Petry 182b1937bb 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.
2015-01-26 21:22:22 +01:00
Vincent Petry efcd89cb18 Do not disclose share owner in public file list 2015-01-26 19:55:48 +01:00
Vincent Petry 86689ef400 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.
2015-01-26 19:55:48 +01:00
Vincent Petry bd888748bd Merge pull request #13490 from owncloud/fix_reshare_s2s_share
use uid provided by setupfs hook to mount server2server shares
2015-01-26 19:54:14 +01:00
Bjoern Schiessle 5ba19ba7fc certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages 2015-01-26 16:58:52 +01:00
Bjoern Schiessle 67da1f7e5a certificate manager only needs the user-id, no need to pass on the complete user object 2015-01-26 16:58:52 +01:00
Bjoern Schiessle 66f0db30b2 use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares 2015-01-26 16:54:50 +01:00
Vincent Petry d5b61f9afe Prevent double slash in shareinfo request URL 2015-01-26 16:19:38 +01:00
Vincent Petry 5376b0b123 Add back exit() 2015-01-26 16:07:28 +01:00
Vincent Petry f6e644b43f 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.
2015-01-26 13:59:49 +01:00
Vincent Petry 02b9bad81b Fix bogus deletion on copy + unlink through rename
Cross-storage rename would cause copy + unlink. That unlink operation
must not trigger the trashbin.
2015-01-26 12:22:22 +01:00
Joas Schilling d6939d67da Remove duplicated definition of APIController 2015-01-26 10:20:01 +01:00
Jenkins for ownCloud a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Bjoern Schiessle 73a058e301 by default send mail for new server-to-server share 2015-01-23 21:59:07 +01:00
Vincent Petry a1cc9eea56 Add trashbin storage wrapper unit test for versions 2015-01-23 18:39:21 +01:00
Vincent Petry 1f39a7aabe Simplify trash storage unit tests
Needed to make it properly init the mount points
2015-01-23 18:08:59 +01:00
Vincent Petry 1a06edd712 Unregister trashbin storage wrapper at the end of tests
Some more tests that uses the storage wrapper now remove it afterwards
2015-01-23 15:36:09 +01:00
Robin Appelman 87a1b2bdc4 Preserve mtime when doing cross storage move 2015-01-23 15:11:27 +01:00
Vincent Petry 2e8c70327a Remove storage wrapper for oc_trashbin in unit test 2015-01-23 14:55:38 +01:00
Robin Appelman 91f3952ac1 Only move files from the current user to the trashbin 2015-01-23 14:19:36 +01:00
Vincent Petry 67f1534e0f 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))
2015-01-23 12:20:54 +01:00
Joas Schilling 7e6d2c73d2 Ignore favorites that are not available when creating the favorites list
Also correctly return the exception for all cases when adding/removing favos
2015-01-23 10:11:14 +01:00
Jenkins for ownCloud bc93a8f140 [tx-robot] updated from transifex 2015-01-23 01:55:06 -05:00
Jenkins for ownCloud 5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00
Morris Jobke c931eafc1f Merge pull request #13517 from owncloud/keymanager-storage
Bypass the view when storing encryption keys
2015-01-22 00:41:48 +01:00
Morris Jobke 4dac664002 Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins
[ignore] delete all server-to-server shares if a user gets deleted
2015-01-22 00:37:39 +01:00
Lukas Reschke 762949afd9 Make naming of encryption app consistent
Fixes https://github.com/owncloud/core/issues/13580
2015-01-21 23:29:09 +01:00
Bjoern Schiessle 7216983a08 delete all server-to-server shares if a user gets deleted 2015-01-21 17:11:34 +01:00
Thomas Müller 8ba42abbe4 Merge pull request #13432 from owncloud/animate_gifs_public_sharing
show animated gifs on public sharing page
2015-01-21 17:09:46 +01:00
Thomas Müller 9921308c62 Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog
External share dialog must properly read entered password
2015-01-21 16:51:56 +01:00
Vincent Petry c48307027c Fixed external cache test namespace 2015-01-21 15:52:56 +01:00
Vincent Petry 9fbdd1072e Fix webdav mkdir for remote shares 2015-01-21 15:14:57 +01:00
Vincent Petry f3d696599a Add unit test for external share JS dialog
Moved external share JS code into a small plugin to make it testable.

Added unit test for the external share dialog logic + ajax calls.
2015-01-21 11:26:54 +01:00
Vincent Petry 23ea45760f External share dialog must properly read entered password 2015-01-21 11:26:36 +01:00
Jenkins for ownCloud b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Lukas Reschke 2ed2a7c7a8 Merge pull request #13520 from owncloud/fix-comparison-op
this must be larger then (>), since buggy behaviour occurs when the para...
2015-01-20 20:15:04 +01:00
Arthur Schiwon 9cb1ef5675 this must be larger then (>), since buggy behaviour occurs when the parameter is a small number 2015-01-20 17:50:53 +01:00
Robin Appelman 750cff0e3e Bypass the view when storing encryption keys 2015-01-20 16:20:49 +01:00
Thomas Müller 87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00
Jenkins for ownCloud 2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Morris Jobke 870bc429b2 Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth
Prioritise Basic Auth header over Cookie
2015-01-19 22:23:02 +01:00