summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15597 from oparoz/another-fallback-for-findbinarypathThomas Müller2015-04-151-1/+6
|\ | | | | Adding a final fallback for findBinaryPath
| * Adding a final fallback for findBinaryPathOlivier Paroz2015-04-141-1/+6
| |
* | Merge pull request #15592 from owncloud/fix-15590-masterThomas Müller2015-04-151-2/+4
|\ \ | | | | | | Avoid php message "Invalid argument supplied for foreach()"
| * | Avoid php message "Invalid argument supplied for foreach()" - refs #15590Thomas Müller2015-04-141-2/+4
| | |
* | | Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-142-16/+13
|\ \ \ | | | | | | | | Fix file size of encrypted files
| * | | remove calculateUnencryptedSize() - not neededThomas Müller2015-04-141-8/+0
| | | |
| * | | return size from cache in case the cache entry is marked as encryptedThomas Müller2015-04-141-8/+10
| | | |
| * | | preserve filesize on rename after uploadThomas Müller2015-04-141-0/+3
| | |/ | |/|
* | | Merge pull request #13360 from owncloud/cross-storage-moveMorris Jobke2015-04-146-88/+189
|\ \ \ | |/ / |/| | Proper copy/move between multiple local storages
| * | fix rebase issueRobin Appelman2015-04-131-2/+2
| | |
| * | Properly handle copy/move failures in cross storage copy/moveRobin Appelman2015-04-131-3/+10
| | |
| * | Detect storage full when doing cross storage copy/moveRobin Appelman2015-04-131-2/+37
| | |
| * | properly return false if we cant delete the source fileRobin Appelman2015-04-131-2/+2
| | |
| * | Make getSourcePath accessible for storage wrappersRobin Appelman2015-04-131-1/+1
| | |
| * | Improve cross storage copy between local storagesRobin Appelman2015-04-131-0/+36
| | |
| * | Move cross storage copy logic to the storageRobin Appelman2015-04-134-74/+97
| | |
| * | Small cleanup of rename codeRobin Appelman2015-04-131-14/+14
| | |
* | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespaceMorris Jobke2015-04-132-14/+16
|\ \ \ | | | | | | | | Fix namespace duplication and other issues in repairlegacystorages
| * | | Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-132-14/+16
| | | |
* | | | Merge pull request #15360 from owncloud/cross-storage-move-cacheMorris Jobke2015-04-133-33/+59
|\ \ \ \ | |/ / / |/| | | Preserve cache data when doing a cross storage move
| * | | Fix cross storage move with shared storagesRobin Appelman2015-04-131-3/+16
| | | |
| * | | Fix moving mount pointsRobin Appelman2015-04-131-1/+3
| | | |
| * | | reuse cache move logicRobin Appelman2015-04-131-26/+1
| | | |
| * | | preserve cache data when doing a cross storage moveRobin Appelman2015-04-132-21/+57
| |/ /
* | | Merge pull request #15568 from ↵Thomas Müller2015-04-131-2/+11
|\ \ \ | |/ / |/| | | | | | | | owncloud/cache_user_folder_for_file_search_results cach user folder for file search results
| * | cach user folder for file search resultsJörn Friedrich Dreyer2015-04-131-2/+11
| | |
* | | Properly add trailing slash to mount pointVincent Petry2015-04-131-1/+3
|/ / | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name
* | Merge pull request #15563 from ↵Morris Jobke2015-04-131-0/+3
|\ \ | | | | | | | | | | | | owncloud/fix-try-getting-propert-of-non-object-ocsclient Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
| * | Prevent php message: "Trying to get property of non-object at ↵Thomas Müller2015-04-131-0/+3
| |/ | | | | | | /xxx/lib/private/ocsclient.php#282"
* / Properly import used classesThomas Müller2015-04-131-35/+48
|/
* Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-122-60/+122
|\ | | | | Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
| * Add "Reply-To" support to sharing mails and refactor codeLukas Reschke2015-04-101-60/+100
| |
| * Add "Reply-To" support for mailsLukas Reschke2015-04-101-0/+22
| |
* | Merge pull request #15458 from owncloud/web-shell-masterLukas Reschke2015-04-101-0/+77
|\ \ | | | | | | Move console application to it's own class - allows reuse in the web shell
| * | Throw an exception in case checkServer() returns errorsThomas Müller2015-04-091-0/+1
| | |
| * | Introduce own console application classThomas Müller2015-04-091-0/+76
| | |
* | | Merge pull request #15395 from owncloud/fix-imagepathVincent Petry2015-04-101-4/+6
|\ \ \ | | | | | | | | Fix UrlGenerator::imagePath() for app paths
| * | | Fix UrlGenerator::imagePath() for app pathsRobin McCorkell2015-04-031-4/+6
| | | |
* | | | Merge pull request #15489 from owncloud/dont_hide_exceptions_masterThomas Müller2015-04-105-31/+79
|\ \ \ \ | |_|_|/ |/| | | Dont hide exceptions master
| * | | Throw ServerNotAvailableException alwaysMorris Jobke2015-04-101-1/+1
| | | |
| * | | fix cherrypickingJörn Friedrich Dreyer2015-04-101-1/+1
| | | |
| * | | throw exception when backends don't provide a user instead of creating ↵Jörn Friedrich Dreyer2015-04-102-31/+45
| | | | | | | | | | | | | | | | legacy local storages
| * | | throw exception if setup is incompleteMorris Jobke2015-04-102-0/+30
| | | |
| * | | do not disclose information, show generic error on login pageJörn Friedrich Dreyer2015-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/templates/login.php lib/base.php
* | | | Merge pull request #15510 from owncloud/cron-singleuserThomas Müller2015-04-102-14/+27
|\ \ \ \ | | | | | | | | | | block cron when in single user mode
| * | | | Fix singe user mode on public.php - take twoThomas Müller2015-04-101-1/+5
| | | | |
| * | | | Fix single user check in case no user is logged inThomas Müller2015-04-091-13/+19
| | | | |
| * | | | block webdav in single user modeRobin Appelman2015-04-091-0/+3
| | | | |
* | | | | Catch more exceptions when connecting to remote DAV serverVincent Petry2015-04-101-58/+57
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Added InvalidArgumentException to catch HTML parsing errors when XML was expected. Made convertSabreException more generic to be able to handle more exception cases.
* | | | Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_sharesThomas Müller2015-04-091-2/+7
|\ \ \ \ | | | | | | | | | | only create a db entry for the user in case of a name conflict on group share
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 00:31:34 +0000