Commit Graph

11851 Commits

Author SHA1 Message Date
Thomas Müller ff7d1eb931 Merge pull request #20707 from owncloud/files_external_table_status
Fix status icon styling for external storages
2015-11-26 12:01:53 +01:00
Thomas Müller 5a33390a69 Merge pull request #20731 from owncloud/per-storage-updater
Make Cache\Updater per storage
2015-11-26 12:01:44 +01:00
Jenkins for ownCloud dd18ea611b [tx-robot] updated from transifex 2015-11-26 01:55:22 -05:00
Thomas Müller b799e42b4e Introduce \OCP\IUser::getEMailAddress() 2015-11-25 22:23:34 +01:00
Thomas Müller c25a7cc4da Users are available under it's own principal resource named 'principals/users' this will allow us to introduce e.g. groups as principals (one day) and system specific principals (needed for federation) 2015-11-25 22:23:34 +01:00
Thomas Müller b02dea29e6 CardDavBackEnd requires principalBackend on ctor 2015-11-25 21:14:16 +01:00
Thomas Müller 06c85dd1eb Output owncloud.log to the console 2015-11-25 21:14:15 +01:00
Thomas Müller d28390a649 Adding sync support - including dav tests 2015-11-25 21:14:15 +01:00
Thomas Müller 6b5460f755 Merge pull request #20733 from owncloud/scan-eventsource-no-paths
Dont output paths in scan.php
2015-11-25 20:01:52 +01:00
Vincent Petry 42091cecf9 Fix public link getDownloadUrl to return Webdav public link
This is for apps that use getDownloadUrl() to access the Webdav endpoint
for example for streaming.
Also happens when clicking on the download action of a file.

Note that the regular visible download URL is still the same.
2015-11-25 17:39:49 +01:00
Jan-Christoph Borchardt 38abdc1007 add icon for Federation app 2015-11-25 16:06:36 +01:00
Thomas Müller 7c68be6494 Merge pull request #20712 from owncloud/replace-netcat-php
Replace shitty netcat use with dedicated PHP script
2015-11-25 15:29:09 +01:00
Thomas Müller 9ec2f8886e Merge pull request #20691 from owncloud/share2.0_di_fixes
[Sharing 2.0] di fixes
2015-11-25 15:25:50 +01:00
Robin Appelman 10df0780ea Dont output paths in scan.php 2015-11-25 15:21:01 +01:00
Robin Appelman b025f07fb7 Make Cache\Updater per storage 2015-11-25 14:16:00 +01:00
Thomas Müller 50f6817ce9 Merge pull request #20439 from owncloud/etag-propagate-in-storage
Take submount etag into account for folder etags
2015-11-25 12:49:54 +01:00
Jenkins for ownCloud 6e60c0f0c4 [tx-robot] updated from transifex 2015-11-25 01:55:37 -05:00
Robin McCorkell 125b090627 Replace shitty netcat use with dedicated PHP script 2015-11-24 16:05:08 +00:00
Thomas Müller 89b9f5518b Merge pull request #20636 from owncloud/savre-3.0
sabre/dav 3.0 and related
2015-11-24 16:20:48 +01:00
Thomas Müller 4bb346a1e6 Merge pull request #20692 from owncloud/federation_auto_add_servers
auto-add ownClouds to the list of trusted servers
2015-11-24 16:19:39 +01:00
Thomas Müller 9a8bdeb7fb Remove invalid use statement 2015-11-24 16:19:25 +01:00
Thomas Müller 4978a785fa Merge pull request #18294 from esakol/issue17173
Fix RHDS ldap paged search, Issue #17173
2015-11-24 16:04:23 +01:00
Thomas Müller 6ce6e27560 Merge pull request #20595 from owncloud/fix-double-slashes
Avoid double slashes in URL when trying to add an remote share
2015-11-24 16:04:03 +01:00
Thomas Müller 9385eef31a Merge pull request #18999 from owncloud/ext-config-listadmin
Improvements to external storages list rendering
2015-11-24 16:03:35 +01:00
Thomas Müller ae36c01b95 Adjust sabre changes in core 2015-11-24 15:11:54 +01:00
Robin Appelman d316802fcf Fix status icon styling for external storages 2015-11-24 13:57:12 +01:00
Robin Appelman 95f2e15f83 Merge pull request #20574 from owncloud/files_external_list_command
Add files_external:list command to list configured external storages
2015-11-24 13:34:59 +01:00
Björn Schießle 9546b21d7e always store server url without a trailing slash 2015-11-24 13:15:55 +01:00
Björn Schießle 964fa1fce3 use hooks to auto add server to the list of trusted servers once a federated share was created 2015-11-24 11:34:38 +01:00
Roeland Jago Douma 8d309767d7 [Sharing 2.0] Use the rootfolder to get the path of a share
We need to use the rootfolder here since we also other people than the
shareOwner can request a share.
2015-11-24 10:26:36 +01:00
Roeland Jago Douma 85976b7293 [Sharing 2.0] Fix phpdoc etc 2015-11-24 10:26:36 +01:00
Roeland Jago Douma ab02b5c36e [Sharing 2.0] Move authentication to the OCS API 2015-11-24 10:26:36 +01:00
Roeland Jago Douma a2b8483779 [Sharing 2.0] Default share provider only generic DI
No injection of userfolders etc. Only generic DI components
(IRootFolder) etc should be used to make sure we can also run this from
the cli
2015-11-24 10:26:36 +01:00
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 7062e6636d Merge pull request #20684 from owncloud/more-time
webdav docker tests - wait at least 5 seconds after the full startup
2015-11-23 15:35:51 +01:00
Morris Jobke 4608e7134c webdav docker tests - wait at least 5 seconds after the full startup 2015-11-23 14:49:01 +01:00
Thomas Müller 7e9cf00e34 Merge pull request #20609 from owncloud/dav-donotauththroughajax
Do not authenticate over ajax Webdav
2015-11-23 13:33:08 +01:00
Robin Appelman 74dfc604d1 language fixes 2015-11-23 13:08:53 +01:00
Robin Appelman ff72eac927 truncate long values on default 2015-11-23 12:29:20 +01:00
Robin Appelman 0795f7d71b hide passwords and secrets on default 2015-11-23 12:24:24 +01:00
Robin Appelman 909b31ea58 use common --output option 2015-11-23 11:36:20 +01:00
Robin Appelman f5cdd27b22 Add files_external:list command to list configured external storages 2015-11-23 11:31:40 +01:00
Thomas Müller bf672d7e51 Merge pull request #20222 from owncloud/federated_sharing_auto_complete
federated sharing auto-complete, first step
2015-11-23 10:42:14 +01:00
Vincent Petry 055d58bfc3 Do not authenticate over ajax
This makes sure that whenever a Webdav call is done through Ajax, if the
session has expired, it will not send back a challenge but a simple 401
response. Without this fix, the default code would send back a challenge
and trigger the browser's basic auth dialog.
2015-11-23 09:44:30 +01: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
Thomas Müller a32b861f18 Merge pull request #20649 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-11-23 08:35:26 +01:00
Jenkins for ownCloud 56e05a90af [tx-robot] updated from transifex 2015-11-23 01:54:53 -05:00
Robin McCorkell 08839ce77d Defer initialisation of data until after complete construction 2015-11-22 17:25:32 +00:00
Vincent Petry 418fefc93c Update app version for Webdav impl of files GUI
This will make sure the cached JS gets properly updated.
Also, since this is a bigger change it also qualifies for a version
increase :-)
2015-11-22 16:05:52 +01:00
Vincent Petry ce897f80e6 Send download token as cookie to tell the UI that it started
This used to be done in the ajax download code. Now that single file
downloads are going through Webdav, the token handling needs to be done
here too.
2015-11-22 16:05:51 +01:00
Vincent Petry d3383adb71 Fix issue when renaming creates a separate entry 2015-11-22 16:05:51 +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
Thomas Müller 240ae46265 Fix js file load order 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 dc8ce87a26 Query tags/favorite through Webdav in file list 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
Jenkins for ownCloud 2321cc4854 [tx-robot] updated from transifex 2015-11-22 01:54:53 -05:00
Robin McCorkell ee7128b435 Clear highlight on RSA public key generation 2015-11-21 22:54:21 +00:00
Robin McCorkell c5966ed21b Only set value if it exists in the StorageConfig 2015-11-21 22:54:21 +00:00
Robin McCorkell be8afc2c12 Reset mountpoint input field when creating new mount 2015-11-21 22:54:21 +00:00
Robin McCorkell 6a2e7632d1 Fix JS unit tests 2015-11-21 22:54:21 +00:00
Robin McCorkell 8f4b780a90 Fix external storage priority logic 2015-11-21 22:54:21 +00:00
Robin McCorkell 2efffb810d Load applicable users/groups correctly 2015-11-21 22:54:21 +00:00
Robin McCorkell 28876bf463 Display applicable global storages in personal mount list 2015-11-21 22:54:21 +00:00
Robin McCorkell a1704c8623 Render external storages list in JS 2015-11-21 22:54:21 +00:00
Jenkins for ownCloud eb42340fa3 [tx-robot] updated from transifex 2015-11-21 01:54:59 -05:00
Scrutinizer Auto-Fixer 5573029485 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-11-20 15:42:34 +00:00
Björn Schießle a63a1043b6 unit tests 2015-11-20 15:48:20 +01:00
Robin Appelman 90ff4641e7 dont die if the external storage backend doesn't exist 2015-11-20 15:23:09 +01:00
Thomas Müller 308aaf89cd Merge pull request #14077 from owncloud/autotest-external-swift
[files_external] swift tests
2015-11-20 13:57:54 +01:00
Jenkins for ownCloud 764504de19 [tx-robot] updated from transifex 2015-11-20 01:55:32 -05:00
Thomas Müller f6446a64b6 fixing OCI and others 2015-11-19 18:07:39 +01:00
Björn Schießle 6f7aa3392f make sure that both server don't try to exchange the shared secret in parallel 2015-11-19 18:07:33 +01:00
Björn Schießle 2754afc074 add option to auto add servers to the list of trusted servers once a federated share was created and accepted successfully 2015-11-19 18:07:25 +01:00
Björn Schießle 8f55b1a27d add status to server list 2015-11-19 18:07:17 +01:00
Björn Schießle 698100d279 exchange shared secret 2015-11-19 18:06:51 +01:00
Björn Schießle ed039ee5eb added app "federation", allows you to connect ownClouds and exchange user lists 2015-11-19 18:06:38 +01:00
Thomas Müller fd28bda3d9 Merge pull request #20611 from owncloud/files-newmenuremovetextfile
Remove "Text file" entry in the "+" menu
2015-11-19 16:58:27 +01:00
Vincent Petry 8fc0e05564 Remove "Text file" entry in the "+" menu
The text editor app will register this instead.

Also made "fileList" a non-private attribute to make it possible for
plugins to access the attached file list object.
2015-11-19 15:36:21 +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
Thomas Müller bcc486ffdc Adding an existing sharee is idempotent 2015-11-19 11:34:59 +01:00
Thomas Müller 0f434e0b9b Implement CSRF protection 2015-11-19 11:34:59 +01:00
Thomas Müller 4eb15885c9 Addressbook sharing added based on a simplified approach which is based on calendar sharing standard 2015-11-19 11:34:31 +01:00
Thomas Müller 3869db1290 Merge pull request #20537 from owncloud/add-internal-locking-to-new-webdav-endpoint
Add internal locking plugin
2015-11-19 10:55:07 +01:00
Thomas Müller 3cac07bedb Merge pull request #20594 from owncloud/use-proper-variable
Use proper variable
2015-11-19 10:41:14 +01:00
Jenkins for ownCloud c10be07c1b [tx-robot] updated from transifex 2015-11-19 01:55:13 -05: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 da5285dc23 Merge pull request #20584 from owncloud/fileinfo-owner-external-share
Fix getOwner for external shares
2015-11-18 21:49:10 +01:00
Robin Appelman 1d82d93baa Implement getOwner for external share storage 2015-11-18 17:08:02 +01:00
Thomas Müller d8b73fde1a Merge pull request #20371 from owncloud/add-caldav-2
Introducing CalDAV into core
2015-11-18 16:32:19 +01:00
Vincent Petry 978303e03e Add internal fileid to webdav response
Introduce a new property "oc:fileid" to return the internal file id.

This is because the original "oc:id" property is a compound and it is
not possible to extract the real id without knowing the instance id. The
instance id is not available to external clients.
2015-11-18 11:41:04 +01:00
Thomas Müller aba119951e Merge pull request #20494 from owncloud/storage-forbidden-exception
Allow storage wrappers to through a forbidden exception with retry information for clients
2015-11-18 09:13:45 +01:00
Thomas Müller 11f123c7d8 Merge pull request #20546 from owncloud/provision_api_fix
[provisioning api] Return empty list if group does not have subadmins
2015-11-18 09:13:13 +01:00
Jenkins for ownCloud cd4380c322 [tx-robot] updated from transifex 2015-11-18 01:55:08 -05:00