Commit graph

2568 commits

Author SHA1 Message Date
Roeland Jago Douma
aeae73b364 [Sharing 2.0] Removed unused DI stuff
The share manager etc should not care about filtering stuff. They should
return what is asked for them.
2015-11-24 10:26:36 +01:00
Jenkins for ownCloud
cb69e6c201 [tx-robot] updated from transifex 2015-11-24 01:56:32 -05:00
Thomas Müller
79bbda994b Merge pull request #16902 from owncloud/jsocclient
Web UI uses Webdav instead of ajax/* calls
2015-11-23 09:38:01 +01:00
Thomas Müller
57c9aa3ca7 Merge pull request #20558 from owncloud/remove-path-from-shared-with
Unset `path` for shared with me
2015-11-23 09:04:52 +01:00
Vincent Petry
ec3166742b Properly join path sections
This prevents double slashes that can mess up path comparisons in some
cases.
2015-11-22 16:05:51 +01:00
Thomas Müller
ab1d786d87 Fix port issue - options.host already has the port attached 2015-11-22 16:05:51 +01:00
Vincent Petry
21da6271a8 Parse share owner from Webdav to display in UI 2015-11-22 16:05:50 +01:00
Vincent Petry
f20232d4bd Make public link share page work with Webdav and add operations
The public page now uses the public.php/webdav endpoint.

Also enabled more file operations like rename, move, delete and create
folder from the public page, which are now all possible thanks to the
public.php/webdav endpoint.
2015-11-22 16:05:50 +01:00
Vincent Petry
fa2be0750c Make files app use Webdav for most operations 2015-11-22 16:05:50 +01:00
Robin Appelman
a95d4c2b22 update tests 2015-11-19 13:32:04 +01:00
Robin Appelman
888df3933d take the etag of child mounts into account for the folder etag
this replaces shared etag propagation
2015-11-19 13:32:00 +01:00
blizzz
5d2e1268cd Avoid double slashes in URL when trying to add an remote share
When being on a link share and clicking "Add to your ownCloud" a double slash might be inserted in the URL if the entered ownCloud host ended with a slash. Results in a server error.
2015-11-18 22:48:35 +01:00
Lukas Reschke
048ad25416 Use proper variable
`$shares` is not defined. Introduced with c3e7d324c5 and thus also in stable8.2
2015-11-18 22:28:48 +01:00
Robin Appelman
1d82d93baa Implement getOwner for external share storage 2015-11-18 17:08:02 +01:00
Robin Appelman
ee87f12c09 Fix hidpi previews on public page 2015-11-18 16:45:19 +01:00
Lukas Reschke
cbd94ce355 Unset path for shared with me
The original path is not required for a share recipient.
2015-11-17 14:09:29 +01:00
Roeland Jago Douma
1e9fc33212 [Share2.0] OCS Share API getShare uses new code 2015-11-16 13:32:28 +01:00
Jenkins for ownCloud
5dd59b4bd2 [tx-robot] updated from transifex 2015-11-11 01:55:47 -05:00
Robin Appelman
20cad09f7f Add tests for FileInfo owner 2015-11-10 11:06:48 +01:00
Roeland Jago Douma
0c566698a1 Use the old code for remote shares for now 2015-11-05 15:59:09 +01:00
Roeland Jago Douma
6624fa212a The new sharing code now handles deletion
OCS -> ShareManager -> DefaultShareProvider
2015-11-05 15:59:09 +01:00
Roeland Jago Douma
8b5179459a Prepare OCS Share endpoint 2015-11-05 15:59:09 +01:00
Jenkins for ownCloud
2f4fa5b49c [tx-robot] updated from transifex 2015-11-05 01:55:14 -05:00
Thomas Müller
ba02a3771b Merge pull request #20053 from owncloud/getfileinfo-locking
Don't lock if we're only reading cache metadata
2015-11-04 22:40:17 +01:00
Jenkins for ownCloud
7fe047425f [tx-robot] updated from transifex 2015-11-04 01:55:44 -05:00
Robin Appelman
0397871f7e Split checkUpdate 2015-11-03 18:23:22 +01:00
Jenkins for ownCloud
2374a0df5d [tx-robot] updated from transifex 2015-11-01 01:54:58 -04:00
Thomas Müller
6911d8f0a4 Merge pull request #20175 from owncloud/login-arrow
remove unneeded icons from input fields to not distract from submit button, fix #18940
2015-10-30 15:56:13 +01:00
Thomas Müller
27db39bd03 Merge pull request #20160 from owncloud/share-allowdeleteinshareoverview
Bring back delete permission in share overview
2015-10-30 15:30:05 +01:00
Jan-Christoph Borchardt
a05ea0fb1e remove unneeded icons from input fields to not distract from submit button, fix #18940 2015-10-30 11:11:37 +01:00
Jenkins for ownCloud
91b2cdc62b [tx-robot] updated from transifex 2015-10-30 01:55:52 -04:00
Vincent Petry
dcfaf3afdc Bring back delete permission in share overview 2015-10-29 17:56:54 +01:00
Thomas Müller
774d069ff0 Merge pull request #20122 from owncloud/files-consolidateiconupdate
Fix icon update to be more consistent
2015-10-29 15:40:15 +01:00
Vincent Petry
9c9158e6b7 Fix icon update to be more consistent
Makes the details bar show the same icon as in the list.
2015-10-29 12:59:51 +01:00
Thomas Müller
5bf476efd0 Merge pull request #20079 from owncloud/filelist-invalidpath
Fix file list reload callback result
2015-10-29 09:21:30 +01:00
Jenkins for ownCloud
527ef76dd6 [tx-robot] updated from transifex 2015-10-29 01:55:45 -04:00
Vincent Petry
f24386c491 Fix file list reload callback result
All reloadCallback must return either true for success or false in case
of failure / non-existing folder.

Some file lists only have a root folder (favorite, shares), so restrict
the path to that to avoid having a wrong path in the breadcrumbs.
2015-10-27 11:51:54 +01:00
Jenkins for ownCloud
0875a4a18f [tx-robot] updated from transifex 2015-10-27 01:55:44 -04:00
Lukas Reschke
8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Lukas Reschke
13e817e901 Throw exception on getPath if file does not exist
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.

This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.

While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.

I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
2015-10-25 17:58:21 +01:00
Jenkins for ownCloud
ba010a5aa4 [tx-robot] updated from transifex 2015-10-24 01:55:42 -04:00
Jenkins for ownCloud
a341e786dd [tx-robot] updated from transifex 2015-10-23 01:55:06 -04:00
Morris Jobke
db25f41da8 handle NoUserException in sharing code
* setup LDAP users
* share from an LDAP user
* delete that LDAP user
* log in as share recipient
* before: unhandled NoUserException
* after: NoUserEception is logged and share is not shown anymore
2015-10-22 17:04:36 +02:00
Jenkins for ownCloud
74f41349b7 [tx-robot] updated from transifex 2015-10-21 01:56:16 -04:00
Hendrik Leppelsack
480a005b47 fix pagination on public file list 2015-10-20 16:11:10 +02:00
Thomas Müller
474f34eb6b Merge pull request #19636 from owncloud/share_expire_backgroun
Add backgroundjob to expire link shares
2015-10-20 14:27:15 +02:00
Morris Jobke
e1c47d6823 use correct class name 2015-10-20 08:18:53 +02:00
Roeland Jago Douma
ec296b0b7d Add backgroundjob to expire link shares
Simple background job to expire the link shares.

* added unit tests
2015-10-20 08:18:53 +02:00
Jenkins for ownCloud
dfd44942c6 [tx-robot] updated from transifex 2015-10-20 01:55:03 -04:00
Jörn Friedrich Dreyer
2895c91291 Merge pull request #17641 from owncloud/fix_objectstore_rename
don't move files in cache twice, fixes renaming for objectstores
2015-10-19 17:18:57 +02:00
Jenkins for ownCloud
8d25528c49 [tx-robot] updated from transifex 2015-10-18 01:55:07 -04:00
Joas Schilling
0d3d75b3b3 Increase the 2nd digit of shipped apps 2015-10-17 08:47:11 +02:00
Jenkins for ownCloud
c378456137 [tx-robot] updated from transifex 2015-10-17 01:55:34 -04:00
Robin Appelman
8efd037eb8 Make shared folder size propagation test work with object home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
e7f75484f8 Fix shared storage tests for non local home storage 2015-10-16 21:41:51 +02:00
Robin Appelman
0cdd46de60 fix sabre connector tests when using a non local home storage 2015-10-16 21:41:51 +02:00
Thomas Müller
9d910deef0 Merge pull request #19836 from owncloud/share-fix-spinner-position
Fix spinner positions in share tab
2015-10-16 17:17:01 +02:00
Vincent Petry
90e34e26bd Fix spinner positions in share tab
Also fix missing spinner when removing link share
2015-10-16 15:54:27 +02:00
Thomas Müller
f2889dc6e4 Consolidate webdav code - move all to one app 2015-10-16 13:17:12 +02:00
Jenkins for ownCloud
7224e99ccd [tx-robot] updated from transifex 2015-10-16 01:55:03 -04:00
Thomas Müller
757f320531 Merge pull request #19580 from owncloud/issue-19399-remote-shares-case-sensitivity
Make sure that remote shares use the correct uid casing
2015-10-14 12:39:57 +02:00
Thomas Müller
01cc38018a Merge pull request #19733 from owncloud/remove-controls-whennotneeded
Remove controls for file lists that don't need it
2015-10-14 12:37:55 +02:00
Hendrik Leppelsack
bf722d93df apply new checkbox style to admin settings 2015-10-14 12:14:49 +02:00
Jenkins for ownCloud
f9dd750ed7 [tx-robot] updated from transifex 2015-10-14 01:55:36 -04:00
Vincent Petry
ecb10db039 Remove controls for file lists that don't need it
Remove controls from sharing overview and favorite file lists which
don't display paths.
2015-10-13 11:36:24 +02:00
Jenkins for ownCloud
1f146d678c [tx-robot] updated from transifex 2015-10-13 01:55:06 -04:00
Jenkins for ownCloud
e16ac12f5a [tx-robot] updated from transifex 2015-10-12 01:54:59 -04:00
Jenkins for ownCloud
188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00
Thomas Müller
8cbf76755e Merge pull request #19643 from owncloud/public-download-spinner
Set download cookie on public download
2015-10-09 14:10:29 +02:00
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
Vincent Petry
ececa90709 Set download cookie on public download 2015-10-08 12:50:56 +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
Joas Schilling
13dd62f7b0 Make sure that remote shares use the correct uid casing 2015-10-06 15:16:19 +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
Lukas Reschke
22e724e829 Only intercept exceptions of type "NotFoundException" instead of any Exception
The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened.

Helps to debug cases such as https://github.com/owncloud/core/issues/19465
2015-09-30 13:32:20 +02:00
Morris Jobke
1051a3c6f5 Change small thumbnails to 32 px
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
2015-09-30 10:49:48 +02:00
Thomas Müller
580a961020 Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled
Allow ajax requests on public webdav interface
2015-09-29 13:21:50 +02:00
Jenkins for ownCloud
aa3596a410 [tx-robot] updated from transifex 2015-09-29 01:55:02 -04:00
Vincent Petry
d47d240a35 Still show share link when recipient but no share permission
This makes it possible for the recipient to still trigger the sidebar
and share tab to see information about the share.

In the case where the file is not shared and no permissions exists, no
action icon will be displayed.
2015-09-28 16:23:33 +02:00
Thomas Müller
72024ad201 Merge pull request #19404 from owncloud/files-sidebar-sorttabs
Fix tabs order in files sidebar
2015-09-28 12:55:38 +02:00
Thomas Müller
d007c32907 Merge pull request #19402 from owncloud/public-recognizeauthsession
Allow public webdav auth to recognize sesssion
2015-09-28 12:53:33 +02:00
Vincent Petry
5e4a52d3c2 Fix tabs order in files sidebar 2015-09-28 12:30:12 +02:00
Vincent Petry
b4998e7d29 Allow public auth to recognize sesssion
When a public link password has been input, its auth is stored in the
session.
This fix makes it possible to recognize the session when using public
webdav from the files UI.
2015-09-28 11:52:04 +02:00
Jenkins for ownCloud
60f123193b [tx-robot] updated from transifex 2015-09-28 05:07:18 -04:00
Thomas Müller
9a010cc8ce Merge pull request #19379 from owncloud/remove-auth-button-border
remove border around button of password protected link confirmation
2015-09-28 10:13:05 +02:00
Jan-Christoph Borchardt
c7f7747b48 remove border around button of password protected link confirmation 2015-09-28 09:30:09 +02:00
Olivier Paroz
46475b8114 Switch from Math.floor() to Math.ceil() when sending the dimension to Preview
Fixes #18203
2015-09-27 12:46:25 +02:00
Hendrik Leppelsack
0ae931ed57 fix sidebar spinner 2015-09-25 20:48:47 +02:00
Roeland Jago Douma
db02173627 Reflect enabled shareAPI in capabilities
If the shareAPI is disabled we not return the other sharing
capabilities.

This allows clients to properly check if sharing is even available.
2015-09-25 20:12:41 +02:00
Thomas Müller
2c37d5f7d8 Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email
Publish an activity when sending a share link via email
2015-09-25 13:48:33 +02:00
Thomas Müller
846b826867 Merge pull request #18517 from owncloud/17753_to_master
Fix preview of old file on public upload conflicts
2015-09-24 15:20:00 +02:00
Thomas Müller
30377e958f Merge pull request #18834 from owncloud/delay-listen-owner-changes
Delay listening to owner changes untill we use a share for that owner
2015-09-24 15:06:27 +02:00
Robin Appelman
7d53427ee6 only initialize once 2015-09-23 16:22:53 +02:00
Robin Appelman
88f03192ba Delay listening to owner changes untill we use a share for that owner 2015-09-23 16:22:53 +02:00
Joas Schilling
19e7a08cbf Do not allow user enumeration if the config is disabled 2015-09-23 15:11:02 +02:00
Roeland Jago Douma
4dba046712 Respect disabled sharing API settings
If the sharing API setting is disabled that sharing check middle ware
should block the request. Thus making link shares unavailable.
Fixes #18970

* Unit test added
* Unit tests updated
2015-09-22 15:12:16 +02:00
Joas Schilling
2e1cfe03e9 Publish an activity when sending a share link via email 2015-09-22 13:09:21 +02:00
Vincent Petry
c8a6fea1b4 Allow ajax requests on public webdav interface
Whenever outgoing shares are disabled, still allow ajax requests to make
it possible to use the Webdav interface in the public link page.

Please note that disabling outgoing shares isn't strong anyway as
someone could abuse the ajax endpoints to access files anyway. To
properly disable remote sharing, public link sharing must be disabled
too.
2015-09-22 12:19:56 +02:00
Lukas Reschke
36ce254ffd Move dummy backend to Tests namespace 2015-09-22 11:01:11 +02:00
Jenkins for ownCloud
7b483dfcbe [tx-robot] updated from transifex 2015-09-21 01:54:41 -04:00
Olivier Paroz
04b14df35c Fix preview of old file on public upload conflicts 2015-09-20 12:38:21 +02:00
Jenkins for ownCloud
bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Thomas Müller
75425b28df Merge pull request #18679 from owncloud/add-reshare-activities
Add reshare activities for the parent sharee and the original file owner
2015-09-18 11:59:30 +02:00