Commit graph

28313 commits

Author SHA1 Message Date
Sergio Bertolin
81e0a3ea22 Added test and logic for deleting all group shares 2015-11-19 12:45:13 +00:00
Sergio Bertolin
630ba2fd09 Added test for shared_with_me parameter 2015-11-19 12:45:12 +00:00
Sergio Bertolin
a990e0ac1d Added some requirements for first test case 2015-11-19 12:45:12 +00:00
Thomas Müller
58eaeb267c Merge pull request from owncloud/integration-fix-docs
Integration fix docs
2015-11-19 11:31:10 +01:00
Thomas Müller
3869db1290 Merge pull request from owncloud/add-internal-locking-to-new-webdav-endpoint
Add internal locking plugin
2015-11-19 10:55:07 +01:00
Thomas Müller
4ff34daedb Merge pull request from owncloud/log-level
clarify log level setting design, fix 
2015-11-19 10:41:30 +01:00
Thomas Müller
3cac07bedb Merge pull request 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 from owncloud/fileinfo-owner-external-share
Fix getOwner for external shares
2015-11-18 21:49:10 +01:00
Thomas Müller
de30b2173d Merge pull request from owncloud/fix-htaccess-dav
Update .well-known redirects to the new dav endpoint
2015-11-18 20:16:01 +01:00
Thomas Müller
7451e5bebc Update .well-known redirects to the new dav endpoint
This reverts commit 68321efd29.
2015-11-18 17:41:03 +01:00
Thomas Müller
68321efd29 Revert "Update .well-known redirects to the new dav endpoint"
This reverts commit d831c255ea.
2015-11-18 17:38:46 +01:00
Thomas Müller
d831c255ea Update .well-known redirects to the new dav endpoint 2015-11-18 17:37:07 +01:00
Robin Appelman
71b86c0ed4 Handle non existing users as owner in the view 2015-11-18 17:08:18 +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 from owncloud/add-caldav-2
Introducing CalDAV into core
2015-11-18 16:32:19 +01:00
Thomas Müller
90bd53c94e Merge pull request from owncloud/dav-internalfileidprop
Add internal fileid to webdav response
2015-11-18 14:43:55 +01:00
Thomas Müller
8d74e28af6 Merge pull request from owncloud/memcache-key-length-fix
Handle errors on memcached level
2015-11-18 14:20:57 +01:00
Jan-Christoph Borchardt
9671103121 clarify log level setting design, fix 2015-11-18 14:04:09 +01:00
Joas Schilling
90b020cf88 Delete when it is a directory... 2015-11-18 12:53:36 +01:00
Joas Schilling
fbcdf17089 Fix doc blocks 2015-11-18 12:53:20 +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
6efa72867a Merge pull request from owncloud/fix-format-call-in-logger
Try to fix logging errors we did observe on ci ....
2015-11-18 09:18:54 +01:00
Thomas Müller
aba119951e Merge pull request 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 from owncloud/provision_api_fix
[provisioning api] Return empty list if group does not have subadmins
2015-11-18 09:13:13 +01:00
Thomas Müller
8db9c49cda Merge pull request from owncloud/notification-fix-tests
Notification - Add tests for the "return $this" and fix it on the new method
2015-11-18 09:12:27 +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 from owncloud/webdav-exposeshareowner
Expose share owner id and display name via files webdav
2015-11-17 13:40:25 +01:00
Thomas Müller
74ce6d29e1 Merge pull request from owncloud/move-index-to-appframework
Move index.php from files to AppFramework
2015-11-17 12:49:38 +01:00
Joas Schilling
e2cfcd992c Allow storage wrappers to through a forbidden exception with retry information 2015-11-17 10:39:52 +01:00
Joas Schilling
2fde6a77d7 Add tests for the "return $this" and fix it on the new method 2015-11-17 09:26:13 +01:00
Thomas Müller
705d208a8a Merge pull request from owncloud/notification-api-adjustment
Notification api update
2015-11-17 08:39:06 +01:00
Jenkins for ownCloud
56f44a457c [tx-robot] updated from transifex 2015-11-17 01:55:08 -05: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 
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 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
854f9dbea7 Merge pull request from owncloud/password_policy-is-not-experimantal
password_policy is a shipped app
2015-11-16 16:51:27 +01:00
Thomas Müller
2784907782 password_policy is a shipped app 2015-11-16 16:36:12 +01:00
Thomas Müller
6ffd042a64 fixes 2015-11-16 16:29:21 +01:00
Thomas Müller
fc296aad5d Add occ command to create a new calendar 2015-11-16 16:29:01 +01:00
Joas Schilling
40d5d55124 Remove the icon for now 2015-11-16 16:17:23 +01:00
Joas Schilling
1666af89c2 Add "is primary action" to actions 2015-11-16 16:14:52 +01:00
Robin Appelman
cfc2d0b8fe Merge pull request 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 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
8169e4fdc8 Merge pull request from owncloud/forms.css
Move form styles from styles.css to inputs.css
2015-11-16 15:29:02 +01:00