summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove slow fade animation for tipsy tooltipJan-Christoph Borchardt2015-04-152-11/+11
|
* Merge pull request #15612 from owncloud/fix-transifex-masterVincent Petry2015-04-141-2/+2
|\ | | | | files_encryption -> encryption
| * files_encryption -> encryptionThomas Müller2015-04-141-2/+2
| |
* | Merge pull request #15598 from owncloud/fix-enc-file-size-masterBjörn Schießle2015-04-147-51/+16
|\ \ | |/ |/| Fix file size of encrypted files
| * remove calculateUnencryptedSize() - not neededThomas Müller2015-04-145-42/+2
| |
| * 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
| |
| * fix reading of private keyThomas Müller2015-04-141-1/+1
| |
* | Merge pull request #13360 from owncloud/cross-storage-moveMorris Jobke2015-04-1410-105/+373
|\ \ | |/ |/| Proper copy/move between multiple local storages
| * a bit more phpdocRobin Appelman2015-04-141-0/+6
| |
| * fix rebase issueRobin Appelman2015-04-131-2/+2
| |
| * add missing return for sharedRobin Appelman2015-04-131-2/+2
| |
| * Properly handle copy/move failures in cross storage copy/moveRobin Appelman2015-04-132-8/+24
| |
| * 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-132-6/+7
| |
| * Make getSourcePath accessible for storage wrappersRobin Appelman2015-04-131-1/+1
| |
| * Fix testRobin Appelman2015-04-131-2/+8
| |
| * Implement move/copyFromStorage for shared storageRobin Appelman2015-04-132-6/+86
| |
| * Improve cross storage copy between local storagesRobin Appelman2015-04-132-2/+103
| |
| * 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 #15566 from owncloud/fix-filepickerThomas Müller2015-04-143-5/+28
|\ \ | | | | | | fix filepicker
| * | fix filepickerMorris Jobke2015-04-133-5/+28
| | | | | | | | | | | | | | | | | | * add ability to filter for mimetype * fixes #15526 * fixes #11563
* | | Merge pull request #15585 from owncloud/fix-user-listLukas Reschke2015-04-132-3/+8
|\ \ \ | | | | | | | | Fix user list
| * | | Fix user listMorris Jobke2015-04-132-3/+8
| | | | | | | | | | | | | | | | | | | | * the name cell was changed from td to th because of accessibility issues - this adjusts the CSS and JS to behave like before
* | | | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespaceMorris Jobke2015-04-133-27/+77
|\ \ \ \ | | | | | | | | | | Fix namespace duplication and other issues in repairlegacystorages
| * | | | Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-133-27/+77
| |/ / /
* | | | Merge pull request #15360 from owncloud/cross-storage-move-cacheMorris Jobke2015-04-137-52/+151
|\ \ \ \ | |/ / / |/| | | Preserve cache data when doing a cross storage move
| * | | Fix cross storage move with shared storagesRobin Appelman2015-04-133-14/+27
| | | |
| * | | upda testsRobin Appelman2015-04-131-6/+1
| | | |
| * | | Fix moving mount pointsRobin Appelman2015-04-131-1/+3
| | | |
| * | | check that we know the parentRobin Appelman2015-04-131-3/+5
| | | |
| * | | check for source cacheRobin 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-133-21/+131
| | |/ | |/|
* | | 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
| | |
* | | Merge pull request #15570 from owncloud/shares-properlyformatmountpointMorris Jobke2015-04-133-4/+16
|\ \ \ | | | | | | | | Properly add trailing slash to mount point
| * | | Properly add trailing slash to mount pointVincent Petry2015-04-133-4/+16
| |/ / | | | | | | | | | | | | Fixes resolving mount points when shared mount point's target name has the same prefix as the source name
* | | Merge pull request #15564 from rullzer/fix_13709Vincent Petry2015-04-132-0/+29
|\ \ \ | |/ / |/| | Do not try to make user subadmin of group twice
| * | Do not try to make user subadmin of group twiceRoeland Jago Douma2015-04-132-0/+29
| |/ | | | | | | | | | | | | If the provisioning api is used to make a user subadmin of a group that user is already a subadmin just return success. Added unit test to ensure things keep working.
* | Merge pull request #15563 from ↵Morris Jobke2015-04-132-0/+48
|\ \ | |/ |/| | | | | 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-132-0/+48
| | | | | | | | /xxx/lib/private/ocsclient.php#282"
* | Merge pull request #15562 from owncloud/fix-15560Joas Schilling2015-04-131-35/+48
|\ \ | |/ |/| Properly import used classes
| * Properly import used classesThomas Müller2015-04-131-35/+48
|/
* Merge pull request #15555 from rullzer/fix_15494Morris Jobke2015-04-121-1/+1
|\ | | | | Initial fix for #15494
| * Initial fix for #15494Roeland Jago Douma2015-04-121-1/+1
| |
* | Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-125-62/+392
|\ \ | | | | | | 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-104-62/+370
| | |
| * | Add "Reply-To" support for mailsLukas Reschke2015-04-101-0/+22
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 22:47:39 +0000