summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch 'master' into dont-add-requestheaders-for-cross-domain-requestsLukas Reschke2015-09-155-8/+19
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Disable automatic evaluation of responsesLukas Reschke2015-09-151-0/+14
| * | | | | | | | | Do not add sensitive request headers for cross domain requestsLukas Reschke2015-09-151-3/+5
* | | | | | | | | | Merge pull request #18979 from owncloud/sidebare-preview-fixesThomas Müller2015-09-164-48/+83
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix filename display in sidebar, fix #18981Jan-Christoph Borchardt2015-09-151-0/+3
| * | | | | | | | | | fix small mimetype iconsRobin Appelman2015-09-151-3/+3
| * | | | | | | | | | recognize eps, psd and illustrator as imageRobin Appelman2015-09-151-1/+7
| * | | | | | | | | | crop to the center for landscape imagesRobin Appelman2015-09-151-1/+5
| * | | | | | | | | | Various thumbnail fixesRobin Appelman2015-09-151-44/+62
| * | | | | | | | | | Fix path for fileinfomodel in subdirectoriesRobin Appelman2015-09-151-1/+1
| * | | | | | | | | | normal margins for portrait previewsRobin Appelman2015-09-151-0/+4
* | | | | | | | | | | Merge pull request #18938 from owncloud/occ_decrypt_all2Thomas Müller2015-09-1615-4/+1482
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | occ script to disable encryption and to decrypt all files againBjoern Schiessle2015-09-1515-4/+1482
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #19052 from owncloud/revert-14856-remote_avatarsThomas Müller2015-09-162-22/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Revert "Allow Remote avatars"Thomas Müller2015-09-152-22/+13
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #18368 from owncloud/version-retentionLukas Reschke2015-09-155-7/+480
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into version-retentionLukas Reschke2015-09-1513-171/+306
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logicRobin Appelman2015-09-153-100/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use the view logic for getFolderContent for the node apiRobin Appelman2015-09-083-100/+18
* | | | | | | | | | | Merge pull request #17811 from owncloud/dav-lock-wideRobin Appelman2015-09-158-68/+287
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | allow hook cancelRobin Appelman2015-09-141-4/+9
| * | | | | | | | | | | fix chunking testsRobin Appelman2015-09-141-0/+2
| * | | | | | | | | | | use the correct path for cache updates when doing chunked assemblyRobin Appelman2015-09-141-7/+13
| * | | | | | | | | | | also verify cache in dav upload testsRobin Appelman2015-09-141-1/+21
| * | | | | | | | | | | work directly on storages when doing a chunked upload assemblyRobin Appelman2015-09-142-57/+87
| * | | | | | | | | | | handle notfound exceptions in lock pluginRobin Appelman2015-09-141-1/+5
| * | | | | | | | | | | adjust tests to handle before/after lockingRobin Appelman2015-09-141-5/+43
| * | | | | | | | | | | wrap the entire put operation in a read lockRobin Appelman2015-09-144-9/+98
| * | | | | | | | | | | expose locking api in sabre connectorRobin Appelman2015-09-141-1/+26
* | | | | | | | | | | | Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-allThomas Müller2015-09-152-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Function does return voidLukas Reschke2015-09-152-3/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | | | * | | | | | | Follow PSRVictor Dubiniuk2015-09-151-0/+0
| | | | * | | | | | | Update options descriptionVictor Dubiniuk2015-09-151-7/+6
| | | | * | | | | | | Add method docblockVictor Dubiniuk2015-09-151-0/+4
| | | | * | | | | | | Namespacing, reusingVictor Dubiniuk2015-09-152-4/+11
| | | | * | | | | | | ImprovementsVictor Dubiniuk2015-09-154-18/+48
| | | | * | | | | | | Add quota status to expiration checkVictor Dubiniuk2015-09-151-10/+10
| | | | * | | | | | | Add versions obligationVictor Dubiniuk2015-09-155-4/+437
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #18273 from owncloud/files-sidebar-toggleFrank Karlitschek2015-09-151-9/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed sidebar toggle entryVincent Petry2015-09-141-18/+26
| * | | | | | | | | | Keep right sidebar open, add Details actionVincent Petry2015-09-141-2/+11
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #19024 from owncloud/remove-get_temp_dirThomas Müller2015-09-152-9/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove get_temp_dir()Robin McCorkell2015-09-152-9/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19041 from owncloud/issue-19007-parameter-nameThomas Müller2015-09-152-10/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Fix parameter name to match the specsJoas Schilling2015-09-152-10/+10
* | | | | | | | | Merge pull request #18964 from owncloud/availability-integerThomas Müller2015-09-153-6/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use integer for availability instead of boolRobin McCorkell2015-09-153-6/+8
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19039 from owncloud/setup-autoloader-earlierThomas Müller2015-09-151-1/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Catch apps which have been removed manuallyLukas Reschke2015-09-151-1/+4
| * | | | | | | | Define allowed app roots earlierLukas Reschke2015-09-151-1/+6
|/ / / / / / / /