wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28327 commits 157 branches 562 tags 714 MiB
Commit graph

28327 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
479cee66f4 Merge pull request #20034 from owncloud/icewind_streams_0.3.0 
Bump 3rdparty for icewind/streams-0.3.0
 2015-11-19 17:27:30 +01:00
Thomas Müller
5c796143d5 Merge pull request #20615 from owncloud/systemtag-fix-method-name 
Adjust the method name to reflect it's behaviour
 2015-11-19 17:27:14 +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
Thomas Müller
420f3010bc Merge pull request #20355 from owncloud/add-carddav-sharing 
Add carddav sharing
 2015-11-19 16:53:57 +01:00
Thomas Müller
1b4cd19d2a Merge pull request #20603 from owncloud/joblist--more-robust 
Make the JobList test more robust by sorting the result of getAll bef…
 2015-11-19 16:53:37 +01:00
Joas Schilling
ea2bf49be0 Adjust the method name to reflect it's behaviour 2015-11-19 16:08:21 +01:00
Thomas Müller
30dd610a2a Merge pull request #20563 from owncloud/systemtags-interface 
Core interfaces for system tags and its manager
 2015-11-19 15:47:47 +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
Roeland Jago Douma
ca6bd5cacd Follow the interface again 2015-11-19 14:34:59 +01:00
Roeland Jago Douma
e342973888 Bump 3rdparty for icewind/streams-0.3.0 2015-11-19 14:34:56 +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
Vincent Petry
ea6341df29 Core interfaces for system tags and its manager 2015-11-19 11:31:25 +01:00
Thomas Müller
58eaeb267c Merge pull request #20570 from owncloud/integration-fix-docs 
Integration fix docs
 2015-11-19 11:31:10 +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
4ff34daedb Merge pull request #20533 from owncloud/log-level 
clarify log level setting design, fix #20514
 2015-11-19 10:41:30 +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
Joas Schilling
0b8335ff2f Make the JobList test more robust by sorting the result of getAll before comparison 2015-11-19 09:25:34 +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
Thomas Müller
de30b2173d Merge pull request #20585 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 #20371 from owncloud/add-caldav-2 
Introducing CalDAV into core
 2015-11-18 16:32:19 +01:00
Thomas Müller
90bd53c94e Merge pull request #20567 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 #20438 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 #20514 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 #20540 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 #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
Thomas Müller
8db9c49cda Merge pull request #20551 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 #20188 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 #20544 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 #20539 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 #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