Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | GDrive stream download with RetryWrapper | Vincent Petry | 2016-03-30 | 1 | -4/+5 |
| | |||||
* | Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-again | Thomas Müller | 2016-03-30 | 1 | -0/+1 |
|\ | | | | | Use the shipped cacerts.pem instead of the global one | ||||
| * | Use the shipped cacerts.pem instead of the global one | Lukas Reschke | 2016-03-30 | 1 | -0/+1 |
| | | | | | | | | 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. | ||||
* | | Merge pull request #23628 from owncloud/avatar-remove | Thomas Müller | 2016-03-30 | 2 | -3/+2 |
|\ \ | | | | | | | only remove avatars from the folder we store them in | ||||
| * | | only remove avatars from the folder we store them in | Robin Appelman | 2016-03-30 | 2 | -3/+2 |
| | | | |||||
* | | | Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails | Thomas Müller | 2016-03-30 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | xcache.var_size with 64M should evaluate to isAvailable | ||||
| * | | | xcache.var_size with 64M should evaluate to isAvailable | Joas Schilling | 2016-03-30 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #23651 from owncloud/fix_23536 | Thomas Müller | 2016-03-30 | 2 | -1/+24 |
|\ \ \ | |/ / |/| | | Non moveable mount points should always be UPDATE+DELETE shareable | ||||
| * | | Non moveable mount points should always be UPDATE+DELETE shareable | Roeland Jago Douma | 2016-03-30 | 2 | -1/+24 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge pull request #23630 from owncloud/upload-white | Thomas Müller | 2016-03-30 | 2 | -3/+1 |
|\ \ | | | | | | | correct form of upload-white icon to be same as upload icon | ||||
| * | | correct form of upload-white icon to be same as upload icon | Jan-Christoph Borchardt | 2016-03-29 | 2 | -3/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-30 | 14 | -2/+42 |
|/ / | |||||
* | | Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-short | Thomas Müller | 2016-03-29 | 2 | -2/+31 |
|\ \ | | | | | | | Fix activity emails always using the short translation | ||||
| * | | Allow the activity app to set the current user when sending emails | Joas Schilling | 2016-03-24 | 2 | -1/+29 |
| | | | |||||
| * | | We are only formatting an object when it's not null | Joas Schilling | 2016-03-24 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #23568 from ↵ | Thomas Müller | 2016-03-29 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | owncloud/finally-fix-23328-now-for-addressbooks-as-well Handle group shares of addressbooks on v1 as well ... now FINALLY .... | ||||
| * | | Handle group shares of addressbooks on v1 as well ... now FINALLY .... | Thomas Müller | 2016-03-24 | 1 | -1/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-29 | 48 | -22/+156 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-28 | 28 | -6/+206 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-27 | 42 | -18/+194 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-26 | 36 | -0/+110 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-25 | 44 | -4/+270 |
| | | | |||||
* | | | Merge pull request #23549 from owncloud/dav-sharetypes-remote | Thomas Müller | 2016-03-24 | 4 | -2/+8 |
|\ \ \ | | | | | | | | | Return remote shares in oc:share-types Webdav property | ||||
| * | | | Return remote shares in oc:share-types Webdav property | Vincent Petry | 2016-03-24 | 4 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | Fixes web UI to properly display the share status icon when an outgoing remote share exists | ||||
* | | | | Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removal | Thomas Müller | 2016-03-24 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Lock the mountpoint while removing | ||||
| * | | | | Lock the mountpoint while removing | Joas Schilling | 2016-03-24 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #23154 from owncloud/avatar-save-failure | Thomas Müller | 2016-03-24 | 4 | -7/+25 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | dont die when we cant save the resized avatar, log instead | ||||
| * | | | | dont die when we cant save the resized avatar, log instead | Robin Appelman | 2016-03-11 | 4 | -7/+25 |
| | | | | | |||||
* | | | | | Merge pull request #23511 from owncloud/sidebar-click | Thomas Müller | 2016-03-24 | 2 | -4/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | sidebar click modification | ||||
| * | | | | | sidebar click modification | Erik Pellikka | 2016-03-24 | 2 | -4/+19 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #23551 from owncloud/objectstoremissingvar | Thomas Müller | 2016-03-24 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | add missing var | ||||
| * | | | | | add missing var | Jörn Friedrich Dreyer | 2016-03-24 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #23342 from ↵ | Thomas Müller | 2016-03-24 | 10 | -88/+212 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | owncloud/fix-group-sharing-for-v1-caldav-and-carddav Fix group shares on v1 caldav and carddav | ||||
| * | | | | | Fix acls for calendar objects and cards - fixes #23273 | Thomas Müller | 2016-03-24 | 9 | -84/+192 |
| | | | | | | |||||
| * | | | | | Return proper current-user-principal on v1 endpoints - fixes #23306 | Thomas Müller | 2016-03-24 | 1 | -0/+15 |
| | | | | | | |||||
| * | | | | | Fix group shares on v1 caldav and carddav - fixes #23328 | Thomas Müller | 2016-03-24 | 3 | -4/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #23542 from ↵ | Thomas Müller | 2016-03-24 | 1 | -3/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future getAppPath can return false | ||||
| * | | | | getAppPath can return false | Lukas Reschke | 2016-03-24 | 1 | -3/+6 |
| |/ / / | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23533 | ||||
* | | | | Merge pull request #23530 from owncloud/fix-shibboleth | Vincent Petry | 2016-03-24 | 3 | -36/+242 |
|\ \ \ \ | |/ / / |/| | | | Check if request is sent from official ownCloud client | ||||
| * | | | Check if request is sent from official ownCloud client | Lukas Reschke | 2016-03-24 | 3 | -36/+242 |
|/ / / | | | | | | | | | | | | | | | | 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. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-24 | 372 | -1018/+420 |
| | | | |||||
* | | | Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translations | Thomas Müller | 2016-03-23 | 1 | -6/+4 |
|\ \ \ | | | | | | | | | Fix the translations of the User menu | ||||
| * | | | Fix the translations of the User menu | Joas Schilling | 2016-03-23 | 1 | -6/+4 |
| | | | | |||||
* | | | | Merge pull request #23507 from owncloud/fix-23496-master | Thomas Müller | 2016-03-23 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | Avoid fatal php error dring cron execution | ||||
| * | | | | fixes #23496 | Thomas Müller | 2016-03-23 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Merge pull request #23509 from owncloud/bump_polyfill | Thomas Müller | 2016-03-23 | 1 | -0/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | [3rdparty] Bump symfony/polyfill packages | ||||
| * | | | | [3rdparty] Bump symfony/polyfill packages | Roeland Jago Douma | 2016-03-23 | 1 | -0/+0 |
|/ / / / | |||||
* | | | | Merge pull request #22506 from owncloud/node-get-from-cache | Thomas Müller | 2016-03-23 | 6 | -66/+131 |
|\ \ \ \ | | | | | | | | | | | Query the cache when checking if a node exists | ||||
| * | | | | properly use fileinfo objects | Robin Appelman | 2016-03-21 | 2 | -34/+75 |
| | | | | | |||||
| * | | | | set watch policy in test | Robin Appelman | 2016-03-21 | 2 | -9/+39 |
| | | | | |