Vincent Petry
837365fff2
Merge pull request #14210 from owncloud/activity/225-sharing-extension-jenkins
...
Activity/225 sharing extension
2015-02-18 14:46:58 +01:00
Joas Schilling
0833a6e332
Correctly create activities for public downloads
2015-02-17 17:26:03 +01:00
Jenkins for ownCloud
31c0cce092
[tx-robot] updated from transifex
2015-02-15 01:54:31 -05:00
Jenkins for ownCloud
2f851ff8bb
[tx-robot] updated from transifex
2015-02-14 01:54:42 -05:00
Joas Schilling
b768a70616
Use filterNotificationTypes to filter the types and group the methods
2015-02-13 11:30:36 +01:00
Joas Schilling
9ccfbc14f6
Copy sharing related activity code to Files_Sharing activity extension
2015-02-13 11:16:43 +01:00
Jenkins for ownCloud
e929d43bb6
[tx-robot] updated from transifex
2015-02-12 01:54:41 -05:00
Jenkins for ownCloud
124e48aec0
[tx-robot] updated from transifex
2015-02-10 01:55:06 -05:00
Morris Jobke
1bb6de7c1b
Merge pull request #13425 from owncloud/phpdoc_cleanup
...
Cleanup of PHPDoc return types
2015-02-10 01:14:00 +01:00
Jenkins for ownCloud
e2d4b3c123
[tx-robot] updated from transifex
2015-02-09 01:54:53 -05:00
Jenkins for ownCloud
60e771685e
[tx-robot] updated from transifex
2015-02-08 01:54:53 -05:00
Jenkins for ownCloud
4bf7b2c130
[tx-robot] updated from transifex
2015-02-07 01:54:35 -05:00
Lukas Reschke
a67627140c
Revert "Add OCS sharing info to capabilities"
2015-02-07 00:12:26 +01:00
Frank Karlitschek
0b421e821b
Merge pull request #13692 from rullzer/capabilities
...
Add OCS sharing info to capabilities
2015-02-06 16:46:47 -05:00
Jenkins for ownCloud
988027fdca
[tx-robot] updated from transifex
2015-02-06 15:26:04 -05:00
Roeland Jago Douma
fe2aca5aa8
Updated unit tests
2015-02-06 12:13:53 +01:00
Roeland Jago Douma
3be3e20c0f
Bit better formatting when using json output
2015-02-06 10:55:33 +01:00
Roeland Jago Douma
d4e361db44
Updated sharing capabilities
...
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
2015-02-06 10:33:08 +01:00
Jenkins for ownCloud
bd60abbefc
[tx-robot] updated from transifex
2015-02-06 01:57:07 -05:00
Jenkins for ownCloud
9adff77040
[tx-robot] updated from transifex
2015-02-05 01:54:49 -05:00
Roeland Jago Douma
bcae79a85a
Split up unit tests
2015-02-04 15:49:20 +01:00
Roeland Jago Douma
083ebca812
Added unit test to test getCapabilities for files_sharing
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
0452fde212
Converted getCapabilities to non static function
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
4801d9c02a
Use single quotes
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
ea1f726b7d
Only return capabilities if they are set
2015-02-04 14:56:31 +01:00
Roeland Jago Douma
b3ea849a87
Added capabilities whether a server allows public links
...
This fixes #13673 .
It now lists link sharing, passwords enforced, and if public uploads are
allowed.
2015-02-04 14:56:31 +01:00
Jenkins for ownCloud
77e9c212ed
[tx-robot] updated from transifex
2015-02-04 01:55:49 -05:00
Thomas Müller
a24d73aa0c
Merge pull request #13837 from owncloud/endless-redirect
...
Add callCheck to testremote.php
2015-02-03 11:28:15 +01:00
Jenkins for ownCloud
6aef13fb07
[tx-robot] updated from transifex
2015-02-03 01:54:50 -05:00
Lukas Reschke
4270188252
Add callCheck to testremote.php
...
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
2015-02-02 19:39:41 +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
Jenkins for ownCloud
c877fbdac8
[tx-robot] updated from transifex
2015-01-31 01:54:39 -05:00
Jenkins for ownCloud
f4d20dc1f3
[tx-robot] updated from transifex
2015-01-30 01:55:06 -05: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
Bjoern Schiessle
8a091629dc
rename 'server-to-server sharing' to 'federated cloud'
2015-01-29 15:05:39 +01:00
Jenkins for ownCloud
65871ffea3
[tx-robot] updated from transifex
2015-01-29 01:54:35 -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
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
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
