summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-1720-6/+260
* Merge pull request #20882 from owncloud/backbone-webdavRoeland Douma2016-01-165-0/+736
|\
| * Backbone transport for WebdavVincent Petry2016-01-165-0/+736
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-164-0/+36
* Merge pull request #21753 from owncloud/add-question-about-code-signing-statusThomas Müller2016-01-151-0/+8
|\
| * Add question about code signing statusLukas Reschke2016-01-151-0/+8
* | Merge pull request #21739 from owncloud/issue_21110Thomas Müller2016-01-151-25/+1
|\ \
| * | Change icon only on WND and Sharepoint external storagesJesús Macias2016-01-151-25/+1
| * | Fis bug issue 21110Jesús Macias2016-01-151-1/+1
* | | Merge pull request #21705 from owncloud/improve-background-job-messageThomas Müller2016-01-154-6/+20
|\ \ \ | |_|/ |/| |
| * | Add message key to context of logExceptionThomas Müller2016-01-154-6/+15
| * | use logException() to properly log the exceptionMorris Jobke2016-01-142-4/+9
| * | Improved error message for failing background jobMorris Jobke2016-01-142-2/+2
* | | Merge pull request #21730 from owncloud/fix-install-of-shipped-appsThomas Müller2016-01-151-9/+22
|\ \ \
| * | | Fixing CodeChecker usage :see_no_evil:Thomas Müller2016-01-141-1/+4
| * | | - isolate include calls in installer.php which prevents local variables to be...Thomas Müller2016-01-141-8/+18
* | | | Merge pull request #21702 from owncloud/fix_emit_scanFiles_IIThomas Müller2016-01-151-7/+25
|\ \ \ \
| * | | | Fix: emit 'scanFiles' will only fire on files and not on folders (II)Martin2016-01-131-7/+25
* | | | | Merge pull request #21370 from owncloud/system-certs-occThomas Müller2016-01-154-0/+226
|\ \ \ \ \
| * | | | | Add occ commands to manager trusted certificatesRobin Appelman2016-01-134-0/+226
* | | | | | Merge pull request #20927 from owncloud/handle-return-code-on-webdav-putThomas Müller2016-01-151-1/+9
|\ \ \ \ \ \
| * | | | | | Handle return code of streamCopy in WebDAV putMorris Jobke2016-01-111-1/+9
* | | | | | | Merge pull request #21117 from owncloud/owner-file-existsThomas Müller2016-01-154-46/+54
|\ \ \ \ \ \ \
| * | | | | | | removed unused importsRobin Appelman2016-01-111-3/+0
| * | | | | | | improve handling of non existing files in the trashbinRobin Appelman2016-01-111-10/+15
| * | | | | | | handle not found in trash hookRobin Appelman2016-01-111-1/+5
| * | | | | | | Typo in error messageLukas Reschke2016-01-111-3/+3
| * | | | | | | de-deplicate getUidAndFilenameRobin Appelman2016-01-114-33/+29
| * | | | | | | dont return an owner for files that don't existRobin Appelman2016-01-111-2/+7
* | | | | | | | Merge pull request #21543 from owncloud/Larzenegger-masterThomas Müller2016-01-151-5/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | tempnam accepts a directory as its first parameter, not a full path and filen...Lars2016-01-111-5/+6
| |/ / / / / / /
* | | | | | | | Merge pull request #21544 from owncloud/trashbin-permissionsThomas Müller2016-01-151-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | set etag and permission fields for trashbin entriesRobin Appelman2016-01-081-0/+3
* | | | | | | | | Merge pull request #21717 from owncloud/addpublicgroupinterfaceThomas Müller2016-01-153-5/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | allow apps to add an OCP GroupInterface backendJörn Friedrich Dreyer2016-01-143-6/+7
* | | | | | | | | | Merge pull request #21721 from owncloud/capped-memcache-indirect-setThomas Müller2016-01-152-2/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow indirect set in CappedMemoryCacheRobin Appelman2016-01-142-2/+14
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #21723 from owncloud/prevent-group-enable-for-appsThomas Müller2016-01-154-4/+118
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Check whether the app can be enabled for groupsJoas Schilling2016-01-142-0/+114
| * | | | | | | | | | Add a new app type that can not be enabled for groupsJoas Schilling2016-01-142-4/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #21735 from owncloud/files-external-checkbox-settingsThomas Müller2016-01-152-5/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Consolidate user mounting check codeRobin McCorkell2016-01-142-5/+15
* | | | | | | | | | | Merge pull request #20898 from owncloud/cache-interfacesThomas Müller2016-01-1537-142/+1495
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove unneeded public cache methodsRobin Appelman2016-01-141-19/+0
| * | | | | | | | | | | only trigger locking on lockingstoragesRobin Appelman2016-01-143-24/+49
| * | | | | | | | | | | split locking related methods to their own interfaceRobin Appelman2016-01-143-28/+62
| * | | | | | | | | | | Add IStorage interface for consistent namingRobin Appelman2016-01-145-50/+523
| * | | | | | | | | | | fix object store storageRobin Appelman2016-01-141-1/+7
| * | | | | | | | | | | fix quota wrapperRobin Appelman2016-01-142-2/+6
| * | | | | | | | | | | fix testsRobin Appelman2016-01-142-2/+4