Commit graph

2397 commits

Author SHA1 Message Date
Jenkins for ownCloud
5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Thomas Müller
17ffa4a244 Merge pull request #19414 from owncloud/swift_primary_storage_tests
Swift primary storage tests
2015-10-08 14:08:56 +02:00
Thomas Müller
e5bbec79a6 Merge pull request #19611 from owncloud/fix-public-scroll
Fix scrollbars in public template
2015-10-08 13:01:01 +02:00
Jenkins for ownCloud
c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Thomas Müller
b2872ef759 Merge pull request #19589 from owncloud/shares-external-mount-provider
Move the setup of external share mounts to a mountprovider
2015-10-07 17:46:33 +02:00
Hendrik Leppelsack
ccfd052e81 move footer to bottom of public page 2015-10-07 13:03:43 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Hendrik Leppelsack
e7b2da79ec fix public empty message 2015-10-06 23:59:58 +02:00
Robin Appelman
59cf817308 Merge pull request #19511 from owncloud/etag-share-permissions-update
Mark shares as dirty when changing permissions
2015-10-06 18:09:12 +02:00
Hendrik Leppelsack
c1a5e96435 fix scrollbars in public template 2015-10-06 16:52:05 +02:00
Robin Appelman
17756ebf5b fix phpdoc 2015-10-06 16:37:43 +02:00
Robin Appelman
d3c1fcf961 Fix getEtag for roots of shared storages 2015-10-06 16:33:37 +02:00
Jörn Friedrich Dreyer
5646e39248 test objectstore with ceph docker
use default config for swift primary storage test config

allow testsuite to complete

fix timeout, script cleanup, enable debug for now

use btrfs loopback device, requires privileged container and absolute path

throw exception when storage has problems

debug by echo ...

sleep more, more debug
2015-10-06 16:27:25 +02:00
Vincent Petry
d546c5bb59 Propagate shares etag when group membership changed 2015-10-06 15:02:22 +02:00
Robin Appelman
47c71d8e87 use microtime 2015-10-06 13:00:30 +02:00
Robin Appelman
41f9946272 clear hooks for tests 2015-10-06 11:38:41 +02:00
Robin Appelman
0817024e6f Mark shares as dirty when changing permissions 2015-10-06 11:38:41 +02:00
Thomas Müller
0385a62363 Merge pull request #19597 from owncloud/update-license-headers
update licence headers via script
2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Jenkins for ownCloud
3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Robin Appelman
e468b38bd4 sanitize mountpoint 2015-10-05 17:14:39 +02:00
Robin Appelman
52c8b488cb fix test 2015-10-05 16:43:10 +02:00
Robin Appelman
e1c562f66b extract the mount provider from the manager 2015-10-05 16:39:11 +02:00
Robin Appelman
a0c9dc2986 register the external share mount provider 2015-10-05 16:19:13 +02:00
Robin Appelman
76a528e511 Make the external share manager a mount provider 2015-10-05 16:18:14 +02:00
Thomas Müller
710b7dd81c Merge pull request #19487 from owncloud/split_share_middleware
Split files_sharing middelware
2015-10-05 10:57:11 +02:00
Jenkins for ownCloud
bc593f7921 [tx-robot] updated from transifex 2015-10-05 01:54:55 -04:00
Jenkins for ownCloud
2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Roeland Jago Douma
4adc78b78b Fix and extend unit tests 2015-10-02 12:45:52 +02:00
Roeland Jago Douma
40dd2d9dbe More fileinfo 2015-10-02 12:45:52 +02:00
Roeland Jago Douma
eeafccb3a6 Start to show remote shares in shared with you section 2015-10-02 12:45:47 +02:00
Thomas Müller
ccbdcf0ab3 Merge pull request #19522 from owncloud/activity-395-less-sidebar-text
Activity 395 less sidebar text
2015-10-02 12:13:53 +02:00
Thomas Müller
daf9a63d43 Merge pull request #19386 from owncloud/ocs_shareapi_extenstion
OCS endpoint to list remote shares
2015-10-02 12:13:36 +02:00
Roeland Jago Douma
3d2acb5003 sharingcheckmiddleware now handles externalshares as well
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired

By default both are required for all functions in the
externalSharesController.

A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.

Unit tests added and updated
2015-10-02 12:03:53 +02:00
Roeland Jago Douma
dc38e674a5 Split files_sharing middelware
Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.

This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.

TODO: add checks for federated sharing as well
2015-10-02 11:56:11 +02:00
Joas Schilling
e478d925c3 Fix intendation 2015-10-02 10:01:33 +02:00
Joas Schilling
17ab8e6c39 Use shorter text on the sidebar for files_sharing activities 2015-10-02 10:01:33 +02:00
Roeland Jago Douma
c924b6740a Do not return unneeded info 2015-10-02 08:11:50 +02:00
Jenkins for ownCloud
3b4592718a [tx-robot] updated from transifex 2015-10-02 01:54:51 -04:00
Roeland Jago Douma
c3e7d324c5 Extend share info
The data from the share_external is not to much. Thus we enrich this
data with info from the filecache.

This allows endpoints using this to actually show usefull information.

The filecache might not be up to date but that is a sacrifice we need to
make in terms of speed. Else the number of remote PROPFINDS grows
lineary with the number of remote shares wich will make this endpoint
practically unusable.
2015-10-02 07:41:57 +02:00
Roeland Jago Douma
0d3009951f Made routes remote_shares only again
Since we need a unique id to accept/reject shares for now we keep the
pending shares under remote_shares.

* remote_shares/pending lists pending shares
* PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
2015-10-02 07:40:53 +02:00
Roeland Jago Douma
7310c4166a Added '../remote_shares' endpoint
* list incoming remote shares at 'remote_shares'
* get per share info at 'remote_shares/<ID>'
* delete remote share with a DELETE to 'remote_shares/<ID>'
2015-10-02 07:40:04 +02:00
Roeland Jago Douma
4a62021141 Move OCS endpoint ../remote_share to ../pending_shares 2015-10-02 07:39:58 +02:00
Jenkins for ownCloud
50874de1ca [tx-robot] updated from transifex 2015-10-01 01:54:55 -04:00
Thomas Müller
d6e3195b38 Merge pull request #19421 from owncloud/fix_19382
Do noy allow empty urls to be submitted in "add to your owncloud"
2015-09-30 22:17:18 +02:00
Thomas Müller
1d8c10cf63 Merge pull request #19468 from owncloud/fix-36-vs-32-previews
Change small thumbnails to 32 px
2015-09-30 15:47:34 +02:00
Morris Jobke
2d1214d21d adjust style of disabled button 2015-09-30 15:28:28 +02:00
Roeland Jago Douma
08fd4b38f8 Do noy allow empty urls to be submitted in "add to your owncloud"
Fixes #19382
2015-09-30 13:55:13 +02:00