Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | 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 | 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 | 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 | Roeland Jago Douma | 2016-03-30 | 2 | -1/+24 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | 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 | 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 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 owncloud/finally-fix-23328-now-for-addressbook... | Thomas Müller | 2016-03-29 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | 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 | Vincent Petry | 2016-03-24 | 4 | -2/+8 | |
| | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | 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 | 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 | 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 | 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 | Jörn Friedrich Dreyer | 2016-03-24 | 1 | -0/+4 | |
* | | | | | | | | | | | | Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-c... | Thomas Müller | 2016-03-24 | 10 | -88/+212 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | 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 owncloud/catch-empty-app-path-oh-we-really-sho... | Thomas Müller | 2016-03-24 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | getAppPath can return false | Lukas Reschke | 2016-03-24 | 1 | -3/+6 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | 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 | Lukas Reschke | 2016-03-24 | 3 | -36/+242 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | [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 | 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 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 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 | 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 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | 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 | |
| * | | | | | | | | | improve reuse in getUserFolder | Robin Appelman | 2016-03-21 | 1 | -6/+6 | |
| * | | | | | | | | | pass the fileinfo to the node if available | Robin Appelman | 2016-03-21 | 3 | -17/+10 | |
| * | | | | | | | | | Query the cache when checking if a node exists | Robin Appelman | 2016-03-21 | 1 | -2/+3 |