Commit Graph

9673 Commits

Author SHA1 Message Date
Morris Jobke 1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies
encryption requires openssl and user_ldap requires ldap 🙊
2015-02-02 12:49:45 +01:00
Thomas Müller c9543c9e8e encryption requires openssl and user_ldap requires ldap 🙊 2015-02-02 09:20:05 +01:00
Jenkins for ownCloud 800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Jenkins for ownCloud a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Lukas Reschke 012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares
make sure that we get the correct user from the path
2015-01-31 08:52:07 +01:00
Jenkins for ownCloud c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Bjoern Schiessle 9ef96e4dd5 no need to initialize the same view twice 2015-01-30 14:39:31 +01:00
Bjoern Schiessle ed29c6ce86 get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated 2015-01-30 14:39:09 +01:00
Morris Jobke e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache
Dont remove a file from cache if the delete operation failed
2015-01-30 14:08:44 +01:00
Jenkins for ownCloud f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Morris Jobke b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares
make sure that we always create a public share key for remote shares
2015-01-29 17:54:04 +01:00
Joas Schilling 333f4e7913 Fix intendation 2015-01-29 16:57:46 +01:00
Joas Schilling 4a5f626979 Fix more assertions 2015-01-29 16:54:27 +01:00
Joas Schilling 9a7dd57bc8 Fix 2 assertions 2015-01-29 16:09:35 +01:00
Thomas Müller 5c8e5e223d Merge pull request #13728 from owncloud/federated_cloud
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:54:19 +01:00
Robin Appelman ce0aa02aac Dont do a cache rename if we cant delete the source file 2015-01-29 15:52:40 +01:00
Robin Appelman 215388f4e0 Make sure we delete the file when doing a cross storage trashbin move 2015-01-29 15:40:01 +01:00
Robin Appelman d4c4e2a322 Detect failed deletes in the trashbin 2015-01-29 15:39:58 +01:00
Bjoern Schiessle 8a091629dc rename 'server-to-server sharing' to 'federated cloud' 2015-01-29 15:05:39 +01:00
Bjoern Schiessle c78e3c4a7f make sure that we always create a public share key for remote shares 2015-01-29 14:23:14 +01:00
Thomas Müller a25063a8ed Merge pull request #13746 from owncloud/no-groups-provisioning-api
disallow provisioning api to be enabled for groups only
2015-01-29 12:47:54 +01:00
Thomas Müller 099d43b1f9 Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step
adding console command to migrate encryption keys - refs #13450
2015-01-29 10:30:12 +01:00
Thomas Müller f60406102f disallow provisioning api to be enabled for groups only 2015-01-29 10:00:54 +01:00
Jenkins for ownCloud 65871ffea3 [tx-robot] updated from transifex 2015-01-29 01:54:35 -05:00
Thomas Müller 659f958d01 Merge pull request #13401 from is-apps/amazon_s3_checkboxes
Tidy formatting of Amazon S3 checkboxes
2015-01-28 18:50:14 +01:00
Robin Appelman a59612752e Fix trash error when deleting files with the same name at the same time (happens in unit tests) 2015-01-28 15:16:55 +01:00
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