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

31284 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
510e8db1ba Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-again 
Use the shipped cacerts.pem instead of the global one
 2016-03-30 18:34:36 +02:00
Thomas Müller
66ee9d56fc Merge pull request #23628 from owncloud/avatar-remove 
only remove avatars from the folder we store them in
 2016-03-30 17:00:09 +02:00
Lukas Reschke
bd93722e12 Use the shipped cacerts.pem instead of the global one 
The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
 2016-03-30 16:58:39 +02:00
Thomas Müller
748a59db11 Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails 
xcache.var_size with 64M should evaluate to isAvailable
 2016-03-30 16:57:02 +02:00
Thomas Müller
7d7a595969 Merge pull request #23651 from owncloud/fix_23536 
Non moveable mount points should always be UPDATE+DELETE shareable
 2016-03-30 16:56:23 +02:00
Joas Schilling
f1c23a92a4 xcache.var_size with 64M should evaluate to isAvailable 2016-03-30 14:54:56 +02:00
Roeland Jago Douma
9ce5e4b01f Non moveable mount points should always be UPDATE+DELETE shareable 
Fixes #23536

The new sharing code is much stricter in checking permissions. However
for non moveable mounts the permissions UPDATE+DELETE are not reported
on the mount point.

This is just a quick fix.

* Updated unit tests
 2016-03-30 13:33:16 +02:00
Robin Appelman
c22697e09e only remove avatars from the folder we store them in 2016-03-30 10:24:43 +02:00
Thomas Müller
0e687993c8 Merge pull request #23630 from owncloud/upload-white 
correct form of upload-white icon to be same as upload icon
 2016-03-30 09:08:49 +02:00
Jenkins for ownCloud
fc708c1e04 [tx-robot] updated from transifex 2016-03-30 01:57:41 -04:00
Jan-Christoph Borchardt
0486fc2aa9 correct form of upload-white icon to be same as upload icon 2016-03-29 19:11:52 +02:00
Thomas Müller
37d32a93d0 Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-short 
Fix activity emails always using the short translation
 2016-03-29 18:44:16 +02:00
Thomas Müller
cd850dc325 Merge pull request #23568 from owncloud/finally-fix-23328-now-for-addressbooks-as-well 
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
 2016-03-29 18:41:40 +02:00
Jenkins for ownCloud
dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
1079554284 [tx-robot] updated from transifex 2016-03-27 01:55:45 -04:00
Jenkins for ownCloud
3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00
Jenkins for ownCloud
ae97b8e1c2 [tx-robot] updated from transifex 2016-03-25 01:55:47 -04:00
Thomas Müller
ab0db65b23 Merge pull request #23549 from owncloud/dav-sharetypes-remote 
Return remote shares in oc:share-types Webdav property
 2016-03-24 22:44:19 +01:00
Thomas Müller
b966fc2233 Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removal 
Lock the mountpoint while removing
 2016-03-24 22:43:46 +01:00
Thomas Müller
b8812c8cba Merge pull request #23154 from owncloud/avatar-save-failure 
dont die when we cant save the resized avatar, log instead
 2016-03-24 22:43:17 +01:00
Thomas Müller
89cd6e228d Handle group shares of addressbooks on v1 as well ... now FINALLY .... 2016-03-24 17:11:07 +01:00
Thomas Müller
a7e7f5e180 Merge pull request #23511 from owncloud/sidebar-click 
sidebar click modification
 2016-03-24 13:30:27 +01:00
Thomas Müller
24b6b8d31f Merge pull request #23551 from owncloud/objectstoremissingvar 
add missing var
 2016-03-24 13:30:08 +01:00
Jörn Friedrich Dreyer
c3508df09a add missing var 2016-03-24 12:49:43 +01:00
Thomas Müller
3d51682440 Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-carddav 
Fix group shares on v1 caldav and carddav
 2016-03-24 12:47:18 +01:00
Vincent Petry
9ee1f506f2 Return remote shares in oc:share-types Webdav property 
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
 2016-03-24 12:16:57 +01:00
Erik Pellikka
50655cbf7f sidebar click modification 2016-03-24 11:57:40 +01:00
Thomas Müller
789df4d630 Merge pull request #23542 from owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future 
getAppPath can return false
 2016-03-24 11:56:43 +01:00
Joas Schilling
3d9863febc Lock the mountpoint while removing 2016-03-24 11:50:17 +01:00
Vincent Petry
a355e3abe3 Merge pull request #23530 from owncloud/fix-shibboleth 
Check if request is sent from official ownCloud client
 2016-03-24 10:58:08 +01:00
Thomas Müller
06e8c70400 Fix acls for calendar objects and cards - fixes #23273 2016-03-24 09:53:36 +01:00
Thomas Müller
8c2b19d2bc Return proper current-user-principal on v1 endpoints - fixes #23306 2016-03-24 09:53:36 +01:00
Thomas Müller
4c738ea9c4 Fix group shares on v1 caldav and carddav - fixes #23328 2016-03-24 09:53:36 +01:00
Joas Schilling
c0858f42aa Allow the activity app to set the current user when sending emails 2016-03-24 09:36:44 +01:00
Joas Schilling
dad98542a5 We are only formatting an object when it's not null 2016-03-24 09:34:19 +01:00
Lukas Reschke
117b3e0a12 getAppPath can return false 
Fixes https://github.com/owncloud/core/issues/23533
 2016-03-24 09:19:43 +01:00
Lukas Reschke
cc8c0b6a90 Check if request is sent from official ownCloud client 
There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check)

While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
 2016-03-24 08:59:56 +01:00
Jenkins for ownCloud
4b3af9dfe7 [tx-robot] updated from transifex 2016-03-24 01:57:28 -04:00
Thomas Müller
6fc92453f3 Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translations 
Fix the translations of the User menu
 2016-03-23 23:20:00 +01:00
Thomas Müller
765cff49fa Merge pull request #23507 from owncloud/fix-23496-master 
Avoid fatal php error dring cron execution
 2016-03-23 17:21:49 +01:00
Thomas Müller
6aa658e21b Merge pull request #23509 from owncloud/bump_polyfill 
[3rdparty] Bump symfony/polyfill packages
 2016-03-23 15:49:44 +01:00
Joas Schilling
6026b67280 Fix the translations of the User menu 2016-03-23 15:34:25 +01:00
Roeland Jago Douma
972f9c08cf [3rdparty] Bump symfony/polyfill packages 2016-03-23 14:04:32 +01:00
Thomas Müller
ea07a428f4 Merge pull request #22506 from owncloud/node-get-from-cache 
Query the cache when checking if a node exists
 2016-03-23 13:08:17 +01:00
Thomas Müller
765c64c73e fixes #23496 2016-03-23 11:37:00 +01:00
Thomas Müller
7800b9dbc8 Merge pull request #23434 from owncloud/symfony-event-dispatcher 
[3rdparty] Bump symfony/event-dispatcher
 2016-03-23 11:22:55 +01:00
Thomas Müller
24331be991 Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2 
Fix display of vcard and calendar object details page in browser plugin
 2016-03-23 11:03:55 +01:00
Thomas Müller
e9d62741e8 Merge pull request #23142 from owncloud/request_properties 
Fix analyzer warnings in request.php
 2016-03-23 11:03:37 +01:00
Thomas Müller
fc18d33ff8 Merge pull request #22895 from owncloud/cleanup_default_share_provider 
Remove support for old shares in the default share provider
 2016-03-23 11:02:28 +01:00