Commit Graph

11714 Commits

Author SHA1 Message Date
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
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
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
Thomas Müller 20c251a575 Merge pull request #20188 from owncloud/webdav-exposeshareowner
Expose share owner id and display name via files webdav
2015-11-17 13:40:25 +01:00
Joas Schilling e2cfcd992c Allow storage wrappers to through a forbidden exception with retry information 2015-11-17 10:39:52 +01:00
Roeland Jago Douma 6dcaac7e2c Return empty list if group does not have subadmins
Instead of throwing an error just return an empty list. Since that is
actually what it is.

Fixes #19789
2015-11-16 22:24:53 +01:00
Lukas Reschke daa388ce8d Move index.php from files to AppFramework
1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.
2015-11-16 21:10:11 +01:00
Thomas Müller e4568234a5 Use uri as displayname 2015-11-16 21:01:27 +01:00
Thomas Müller 5ec64c4fd7 Merge pull request #20292 from owncloud/provisioning_api_group_unittest
Moved grouptest over to pure unit tests
2015-11-16 18:00:03 +01:00
Thomas Müller a0b649442c components was not written to the database 2015-11-16 17:57:39 +01:00
Thomas Müller fc296aad5d Add occ command to create a new calendar 2015-11-16 16:29:01 +01:00
Robin Appelman cfc2d0b8fe Merge pull request #20534 from owncloud/sftp-parse-host
Fix parsing of sftp hosts when using ipv6
2015-11-16 16:14:06 +01:00
Thomas Müller 5fc414abfd Add internal locking plugin - fixes #20502 2015-11-16 16:09:04 +01:00
Thomas Müller 867fd94dc6 Add scheduling backend 2015-11-16 15:49:46 +01:00
Vincent Petry d62f410f92 Add "owner-id" and "owner-display-name" Webdav properties 2015-11-16 15:31:41 +01:00
Thomas Müller 23e7a62717 Fix Oracle 2015-11-16 15:28:34 +01:00
Thomas Müller 28ed2d8072 Merge pull request #20447 from owncloud/heading-styles
standardize sizes for headings
2015-11-16 15:01:00 +01:00
Thomas Müller 2cb94cd4eb Merge pull request #20356 from owncloud/share2.0_getShare
[Share2.0] OCS Share API getShare uses new code
2015-11-16 15:00:30 +01:00
Thomas Müller 10d2b68f8f Merge pull request #18605 from owncloud/api-adduser-for-subadmins
enable api addUser for subadmins
2015-11-16 14:57:27 +01:00
Robin Appelman 67710e62fa Fix parsing of sftp hosts when using ipv6 2015-11-16 14:56:03 +01:00
Jan-Christoph Borchardt 5b72d9026f standardize sizes for headings 2015-11-16 14:42:10 +01:00
Roeland Jago Douma 61425b7621 Moved grouptest over to pure unit tests 2015-11-16 14:40:01 +01:00
Roeland Jago Douma 1e9fc33212 [Share2.0] OCS Share API getShare uses new code 2015-11-16 13:32:28 +01:00
Thomas Müller 2b13c5db0f Introducing CalDAV into core 2015-11-16 13:24:50 +01:00
Thomas Müller 5e3d29b661 Merge pull request #20505 from owncloud/fakelocking-for-mac
Add fake locker plugin for WebDAVFS
2015-11-16 13:15:40 +01:00
Jenkins for ownCloud ae58409f22 [tx-robot] updated from transifex 2015-11-16 01:54:50 -05:00
Jenkins for ownCloud 19d0884b56 [tx-robot] updated from transifex 2015-11-15 01:55:08 -05:00
Jenkins for ownCloud 1b409228ab [tx-robot] updated from transifex 2015-11-14 01:55:13 -05:00
Lukas Reschke a3fc40921b Add fake locker plugin for WebDAVFS
WebDAVFS as used by Finder requires a Class 2 compatible WebDAV server. This change introduces a fake locking provider which will simply advertise Locking support when a request originates from WebDAVFS. It will also return successful LOCK and UNLOCK responses.
2015-11-13 23:31:08 +01:00
Jenkins for ownCloud 1e9203cdef [tx-robot] updated from transifex 2015-11-13 01:57:12 -05:00
Roeland Jago Douma fc1f0233ff Added unit test for new functionality 2015-11-12 22:31:17 +01:00