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
333f4e7913
Fix intendation
2015-01-29 16:57:46 +01:00
4a5f626979
Fix more assertions
2015-01-29 16:54:27 +01:00
9a7dd57bc8
Fix 2 assertions
2015-01-29 16:09:35 +01:00
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
8a091629dc
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:05:39 +01:00
c78e3c4a7f
make sure that we always create a public share key for remote shares
2015-01-29 14:23:14 +01:00
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
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
f60406102f
disallow provisioning api to be enabled for groups only
2015-01-29 10:00:54 +01:00
65871ffea3
[tx-robot] updated from transifex
2015-01-29 01:54:35 -05:00
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
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
55142186de
[tx-robot] updated from transifex
2015-01-28 01:55:53 -05:00
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
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
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
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
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
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
c8f58054b0
[tx-robot] updated from transifex
2015-01-27 01:54:34 -05:00
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
efcd89cb18
Do not disclose share owner in public file list
2015-01-26 19:55:48 +01:00
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
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
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
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
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
d5b61f9afe
Prevent double slash in shareinfo request URL
2015-01-26 16:19:38 +01:00
5376b0b123
Add back exit()
2015-01-26 16:07:28 +01:00
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
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
d6939d67da
Remove duplicated definition of APIController
2015-01-26 10:20:01 +01:00
a698637e91
[tx-robot] updated from transifex
2015-01-25 01:54:38 -05:00
b8e1dd9c87
[tx-robot] updated from transifex
2015-01-24 01:54:51 -05:00
73a058e301
by default send mail for new server-to-server share
2015-01-23 21:59:07 +01:00
a1cc9eea56
Add trashbin storage wrapper unit test for versions
2015-01-23 18:39:21 +01:00
1f39a7aabe
Simplify trash storage unit tests
...
Needed to make it properly init the mount points
2015-01-23 18:08:59 +01:00
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
87a1b2bdc4
Preserve mtime when doing cross storage move
2015-01-23 15:11:27 +01:00
2e8c70327a
Remove storage wrapper for oc_trashbin in unit test
2015-01-23 14:55:38 +01:00
91f3952ac1
Only move files from the current user to the trashbin
2015-01-23 14:19:36 +01:00
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
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
bc93a8f140
[tx-robot] updated from transifex
2015-01-23 01:55:06 -05:00
9c7cd702c3
user fs must be setup up, so that the real user folder is mounted on the username based path
2015-01-22 19:16:28 +01:00
fc1865449d
adding console command to migrate encryption keys - refs #13450
2015-01-22 16:10:45 +01:00
5f3c6a97b2
[tx-robot] updated from transifex
2015-01-22 01:55:09 -05:00
c931eafc1f
Merge pull request #13517 from owncloud/keymanager-storage
...
Bypass the view when storing encryption keys
2015-01-22 00:41:48 +01:00
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
Morris Jobke
Joas Schilling
Thomas Müller
Bjoern Schiessle
Jenkins for ownCloud
Robin Appelman
Vincent Petry
Arthur Schiwon