Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adjust PHPDoc as suggested | Thomas Müller | 2015-11-20 | 3 | -3/+3 |
* | Fix failing unit test :skull: | Thomas Müller | 2015-11-19 | 2 | -16/+2 |
* | Use mocks when testing isSharingDisabledForUser | Thomas Müller | 2015-11-19 | 6 | -41/+60 |
* | Merge pull request #20570 from owncloud/integration-fix-docs | Thomas Müller | 2015-11-19 | 1 | -34/+42 |
|\ | |||||
| * | Delete when it is a directory... | Joas Schilling | 2015-11-18 | 1 | -1/+1 |
| * | Fix doc blocks | Joas Schilling | 2015-11-18 | 1 | -34/+42 |
* | | Merge pull request #20537 from owncloud/add-internal-locking-to-new-webdav-en... | Thomas Müller | 2015-11-19 | 3 | -15/+10 |
|\ \ | |||||
| * | | Add internal locking plugin - fixes #20502 | Thomas Müller | 2015-11-16 | 3 | -15/+10 |
* | | | Merge pull request #20533 from owncloud/log-level | Thomas Müller | 2015-11-19 | 1 | -9/+10 |
|\ \ \ | |||||
| * | | | clarify log level setting design, fix #20514 | Jan-Christoph Borchardt | 2015-11-18 | 1 | -9/+10 |
| | |/ | |/| | |||||
* | | | Merge pull request #20594 from owncloud/use-proper-variable | Thomas Müller | 2015-11-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Use proper variable | Lukas Reschke | 2015-11-18 | 1 | -1/+1 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-19 | 10 | -4/+34 |
|/ / / | |||||
* | | | Merge pull request #20584 from owncloud/fileinfo-owner-external-share | Robin Appelman | 2015-11-18 | 2 | -6/+26 |
|\ \ \ | |||||
| * | | | Handle non existing users as owner in the view | Robin Appelman | 2015-11-18 | 1 | -5/+20 |
| * | | | Implement getOwner for external share storage | Robin Appelman | 2015-11-18 | 1 | -1/+6 |
* | | | | Merge pull request #20585 from owncloud/fix-htaccess-dav | Thomas Müller | 2015-11-18 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Update .well-known redirects to the new dav endpoint | Thomas Müller | 2015-11-18 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Revert "Update .well-known redirects to the new dav endpoint" | Thomas Müller | 2015-11-18 | 1 | -2/+2 |
* | | | | Update .well-known redirects to the new dav endpoint | Thomas Müller | 2015-11-18 | 1 | -2/+2 |
* | | | | Merge pull request #20371 from owncloud/add-caldav-2 | Thomas Müller | 2015-11-18 | 8 | -7/+1988 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use uri as displayname | Thomas Müller | 2015-11-16 | 2 | -20/+13 |
| * | | | components was not written to the database | Thomas Müller | 2015-11-16 | 2 | -0/+5 |
| * | | | Add occ command to create a new calendar | Thomas Müller | 2015-11-16 | 2 | -0/+54 |
| * | | | Add scheduling backend | Thomas Müller | 2015-11-16 | 2 | -4/+68 |
| * | | | Fix Oracle | Thomas Müller | 2015-11-16 | 1 | -1/+1 |
| * | | | Introducing CalDAV into core | Thomas Müller | 2015-11-16 | 6 | -7/+1872 |
* | | | | Merge pull request #20567 from owncloud/dav-internalfileidprop | Thomas Müller | 2015-11-18 | 3 | -3/+22 |
|\ \ \ \ | |||||
| * | | | | Add internal fileid to webdav response | Vincent Petry | 2015-11-18 | 3 | -3/+22 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #20438 from owncloud/memcache-key-length-fix | Thomas Müller | 2015-11-18 | 1 | -8/+30 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Handle errors on memcached level - fixes #17397 | Thomas Müller | 2015-11-10 | 1 | -8/+30 |
* | | | | Merge pull request #20540 from owncloud/fix-format-call-in-logger | Thomas Müller | 2015-11-18 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | fixes #20538 | Thomas Müller | 2015-11-16 | 1 | -2/+5 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #20494 from owncloud/storage-forbidden-exception | Thomas Müller | 2015-11-18 | 12 | -5/+270 |
|\ \ \ \ | |||||
| * | | | | Allow storage wrappers to through a forbidden exception with retry information | Joas Schilling | 2015-11-17 | 12 | -5/+270 |
* | | | | | Merge pull request #20546 from owncloud/provision_api_fix | Thomas Müller | 2015-11-18 | 2 | -10/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Return empty list if group does not have subadmins | Roeland Jago Douma | 2015-11-16 | 2 | -10/+3 |
* | | | | | | Merge pull request #20551 from owncloud/notification-fix-tests | Thomas Müller | 2015-11-18 | 4 | -21/+62 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add tests for the "return $this" and fix it on the new method | Joas Schilling | 2015-11-17 | 4 | -21/+62 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-18 | 6 | -0/+8 |
* | | | | | | Merge pull request #20188 from owncloud/webdav-exposeshareowner | Thomas Müller | 2015-11-17 | 5 | -0/+82 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add "owner-id" and "owner-display-name" Webdav properties | Vincent Petry | 2015-11-16 | 3 | -0/+68 |
| * | | | | | | Add getOwner() method to FileInfo and Node API | Vincent Petry | 2015-11-13 | 2 | -0/+14 |
* | | | | | | | Merge pull request #20544 from owncloud/move-index-to-appframework | Thomas Müller | 2015-11-17 | 8 | -177/+511 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Move index.php from files to AppFramework | Lukas Reschke | 2015-11-16 | 8 | -177/+511 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #20539 from owncloud/notification-api-adjustment | Thomas Müller | 2015-11-17 | 6 | -141/+97 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove the icon for now | Joas Schilling | 2015-11-16 | 6 | -141/+0 |
| * | | | | | | Add "is primary action" to actions | Joas Schilling | 2015-11-16 | 4 | -0/+97 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-17 | 2 | -0/+4 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #20292 from owncloud/provisioning_api_group_unittest | Thomas Müller | 2015-11-16 | 3 | -137/+277 |
|\ \ \ \ \ \ |