summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Adjust PHPDoc as suggestedThomas Müller2015-11-203-3/+3
* Fix failing unit test :skull:Thomas Müller2015-11-192-16/+2
* Use mocks when testing isSharingDisabledForUserThomas Müller2015-11-196-41/+60
* Merge pull request #20570 from owncloud/integration-fix-docsThomas Müller2015-11-191-34/+42
|\
| * Delete when it is a directory...Joas Schilling2015-11-181-1/+1
| * Fix doc blocksJoas Schilling2015-11-181-34/+42
* | Merge pull request #20537 from owncloud/add-internal-locking-to-new-webdav-en...Thomas Müller2015-11-193-15/+10
|\ \
| * | Add internal locking plugin - fixes #20502Thomas Müller2015-11-163-15/+10
* | | Merge pull request #20533 from owncloud/log-levelThomas Müller2015-11-191-9/+10
|\ \ \
| * | | clarify log level setting design, fix #20514Jan-Christoph Borchardt2015-11-181-9/+10
| | |/ | |/|
* | | Merge pull request #20594 from owncloud/use-proper-variableThomas Müller2015-11-191-1/+1
|\ \ \
| * | | Use proper variableLukas Reschke2015-11-181-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1910-4/+34
|/ / /
* | | Merge pull request #20584 from owncloud/fileinfo-owner-external-shareRobin Appelman2015-11-182-6/+26
|\ \ \
| * | | Handle non existing users as owner in the viewRobin Appelman2015-11-181-5/+20
| * | | Implement getOwner for external share storageRobin Appelman2015-11-181-1/+6
* | | | Merge pull request #20585 from owncloud/fix-htaccess-davThomas Müller2015-11-181-2/+2
|\ \ \ \
| * | | | Update .well-known redirects to the new dav endpointThomas Müller2015-11-181-2/+2
|/ / / /
* | | | Revert "Update .well-known redirects to the new dav endpoint"Thomas Müller2015-11-181-2/+2
* | | | Update .well-known redirects to the new dav endpointThomas Müller2015-11-181-2/+2
* | | | Merge pull request #20371 from owncloud/add-caldav-2Thomas Müller2015-11-188-7/+1988
|\ \ \ \ | |/ / / |/| | |
| * | | Use uri as displaynameThomas Müller2015-11-162-20/+13
| * | | components was not written to the databaseThomas Müller2015-11-162-0/+5
| * | | Add occ command to create a new calendarThomas Müller2015-11-162-0/+54
| * | | Add scheduling backendThomas Müller2015-11-162-4/+68
| * | | Fix OracleThomas Müller2015-11-161-1/+1
| * | | Introducing CalDAV into coreThomas Müller2015-11-166-7/+1872
* | | | Merge pull request #20567 from owncloud/dav-internalfileidpropThomas Müller2015-11-183-3/+22
|\ \ \ \
| * | | | Add internal fileid to webdav responseVincent Petry2015-11-183-3/+22
| | |/ / | |/| |
* | | | Merge pull request #20438 from owncloud/memcache-key-length-fixThomas Müller2015-11-181-8/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Handle errors on memcached level - fixes #17397Thomas Müller2015-11-101-8/+30
* | | | Merge pull request #20540 from owncloud/fix-format-call-in-loggerThomas Müller2015-11-181-2/+5
|\ \ \ \
| * | | | fixes #20538Thomas Müller2015-11-161-2/+5
| | |_|/ | |/| |
* | | | Merge pull request #20494 from owncloud/storage-forbidden-exceptionThomas Müller2015-11-1812-5/+270
|\ \ \ \
| * | | | Allow storage wrappers to through a forbidden exception with retry informationJoas Schilling2015-11-1712-5/+270
* | | | | Merge pull request #20546 from owncloud/provision_api_fixThomas Müller2015-11-182-10/+3
|\ \ \ \ \
| * | | | | Return empty list if group does not have subadminsRoeland Jago Douma2015-11-162-10/+3
* | | | | | Merge pull request #20551 from owncloud/notification-fix-testsThomas Müller2015-11-184-21/+62
|\ \ \ \ \ \
| * | | | | | Add tests for the "return $this" and fix it on the new methodJoas Schilling2015-11-174-21/+62
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-186-0/+8
* | | | | | Merge pull request #20188 from owncloud/webdav-exposeshareownerThomas Müller2015-11-175-0/+82
|\ \ \ \ \ \
| * | | | | | Add "owner-id" and "owner-display-name" Webdav propertiesVincent Petry2015-11-163-0/+68
| * | | | | | Add getOwner() method to FileInfo and Node APIVincent Petry2015-11-132-0/+14
* | | | | | | Merge pull request #20544 from owncloud/move-index-to-appframeworkThomas Müller2015-11-178-177/+511
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Move index.php from files to AppFrameworkLukas Reschke2015-11-168-177/+511
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #20539 from owncloud/notification-api-adjustmentThomas Müller2015-11-176-141/+97
|\ \ \ \ \ \
| * | | | | | Remove the icon for nowJoas Schilling2015-11-166-141/+0
| * | | | | | Add "is primary action" to actionsJoas Schilling2015-11-164-0/+97
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-172-0/+4
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #20292 from owncloud/provisioning_api_group_unittestThomas Müller2015-11-163-137/+277
|\ \ \ \ \ \