Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace | Morris Jobke | 2015-04-13 | 2 | -261/+1 |
|\ | | | | | Fix namespace duplication and other issues in repairlegacystorages | ||||
| * | Fix namespace duplication and other issues in repairlegacystorages | Joas Schilling | 2015-04-13 | 2 | -261/+1 |
| | | |||||
* | | Merge pull request #15360 from owncloud/cross-storage-move-cache | Morris Jobke | 2015-04-13 | 3 | -33/+59 |
|\ \ | |/ |/| | Preserve cache data when doing a cross storage move | ||||
| * | Fix cross storage move with shared storages | Robin Appelman | 2015-04-13 | 1 | -3/+16 |
| | | |||||
| * | Fix moving mount points | Robin Appelman | 2015-04-13 | 1 | -1/+3 |
| | | |||||
| * | reuse cache move logic | Robin Appelman | 2015-04-13 | 1 | -26/+1 |
| | | |||||
| * | preserve cache data when doing a cross storage move | Robin Appelman | 2015-04-13 | 2 | -21/+57 |
| | | |||||
* | | Merge pull request #15568 from ↵ | Thomas Müller | 2015-04-13 | 1 | -2/+11 |
|\ \ | |/ |/| | | | | | owncloud/cache_user_folder_for_file_search_results cach user folder for file search results | ||||
| * | cach user folder for file search results | Jörn Friedrich Dreyer | 2015-04-13 | 1 | -2/+11 |
| | | |||||
* | | Properly add trailing slash to mount point | Vincent Petry | 2015-04-13 | 1 | -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 Jobke | 2015-04-13 | 1 | -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üller | 2015-04-13 | 1 | -0/+3 |
| | | | | | | | | /xxx/lib/private/ocsclient.php#282" | ||||
* | | Properly import used classes | Thomas Müller | 2015-04-13 | 1 | -35/+48 |
|/ | |||||
* | Merge pull request #15541 from owncloud/add-reply-to-support | Lukas Reschke | 2015-04-12 | 2 | -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 code | Lukas Reschke | 2015-04-10 | 1 | -60/+100 |
| | | |||||
| * | Add "Reply-To" support for mails | Lukas Reschke | 2015-04-10 | 1 | -0/+22 |
| | | |||||
* | | Merge pull request #15458 from owncloud/web-shell-master | Lukas Reschke | 2015-04-10 | 1 | -0/+77 |
|\ \ | | | | | | | Move console application to it's own class - allows reuse in the web shell | ||||
| * | | Throw an exception in case checkServer() returns errors | Thomas Müller | 2015-04-09 | 1 | -0/+1 |
| | | | |||||
| * | | Introduce own console application class | Thomas Müller | 2015-04-09 | 1 | -0/+76 |
| | | | |||||
* | | | Merge pull request #15395 from owncloud/fix-imagepath | Vincent Petry | 2015-04-10 | 1 | -4/+6 |
|\ \ \ | | | | | | | | | Fix UrlGenerator::imagePath() for app paths | ||||
| * | | | Fix UrlGenerator::imagePath() for app paths | Robin McCorkell | 2015-04-03 | 1 | -4/+6 |
| | | | | |||||
* | | | | Merge pull request #15489 from owncloud/dont_hide_exceptions_master | Thomas Müller | 2015-04-10 | 4 | -31/+75 |
|\ \ \ \ | |_|_|/ |/| | | | Dont hide exceptions master | ||||
| * | | | Throw ServerNotAvailableException always | Morris Jobke | 2015-04-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix cherrypicking | Jörn Friedrich Dreyer | 2015-04-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | throw exception when backends don't provide a user instead of creating ↵ | Jörn Friedrich Dreyer | 2015-04-10 | 2 | -31/+45 |
| | | | | | | | | | | | | | | | | legacy local storages | ||||
| * | | | throw exception if setup is incomplete | Morris Jobke | 2015-04-10 | 2 | -0/+30 |
| | | | | |||||
* | | | | Merge pull request #15510 from owncloud/cron-singleuser | Thomas Müller | 2015-04-10 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | block cron when in single user mode | ||||
| * | | | | block webdav in single user mode | Robin Appelman | 2015-04-09 | 1 | -0/+3 |
| | | | | | |||||
* | | | | | Catch more exceptions when connecting to remote DAV server | Vincent Petry | 2015-04-10 | 1 | -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_shares | Thomas Müller | 2015-04-09 | 1 | -2/+7 |
|\ \ \ \ | | | | | | | | | | | only create a db entry for the user in case of a name conflict on group share | ||||
| * | | | | only create a db entry for the user in case of a name conflict on group share | Bjoern Schiessle | 2015-04-09 | 1 | -2/+7 |
| | | | | | |||||
* | | | | | Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource | Morris Jobke | 2015-04-09 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | fixes #15326 | ||||
| * | | | | | fixes #15326 | Jörn Friedrich Dreyer | 2015-04-09 | 1 | -1/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #14540 from owncloud/windows-setup-check | Lukas Reschke | 2015-04-09 | 1 | -0/+13 |
|\ \ \ \ \ | |/ / / / |/| | | | | Disallow Windows Server in Server Check | ||||
| * | | | | Disallow Windows Server in Server Check | Lukas Reschke | 2015-04-09 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | Will prevent users from use ownCloud on Windows Server :see_no_evil: | ||||
* | | | | | Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude | Björn Schießle | 2015-04-09 | 1 | -17/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Dont create exclude list for generating the share target | ||||
| * | | | | Dont create exclude list for generating the share target | Robin Appelman | 2015-02-04 | 1 | -17/+2 |
| | | | | | |||||
* | | | | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting | Thomas Müller | 2015-04-09 | 1 | -8/+9 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Check if the key exists, before trying to delete it | ||||
| * | | | | Check if the key exists, before trying to delete it | Joas Schilling | 2015-04-09 | 1 | -8/+9 |
| | | | | | |||||
* | | | | | Merge pull request #15314 from owncloud/app-categories-15274 | Lukas Reschke | 2015-04-09 | 6 | -164/+244 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add different trust levels to AppStore interface | ||||
| * | | | | Fix PHPDoc | Lukas Reschke | 2015-04-07 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Deduplicate code | Lukas Reschke | 2015-04-07 | 1 | -44/+31 |
| | | | | | |||||
| * | | | | Make user names clickable | Lukas Reschke | 2015-04-03 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Add experimental applications switch | Lukas Reschke | 2015-04-03 | 6 | -161/+250 |
| | | | | | | | | | | | | | | | | | | | | Allows administrators to disable or enabled experimental applications as well as show the trust level. | ||||
* | | | | | Merge pull request #15196 from owncloud/limit-file-activities-to-favorites | Morris Jobke | 2015-04-09 | 3 | -4/+73 |
|\ \ \ \ \ | | | | | | | | | | | | | Limit file activities to favorites | ||||
| * | | | | | Make scrutinizer happy | Joas Schilling | 2015-04-01 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add logic for getting the user from the rss token to the Manager | Joas Schilling | 2015-03-30 | 2 | -2/+71 |
| | | | | | | |||||
* | | | | | | Merge pull request #15490 from owncloud/remove-debug-logging | Morris Jobke | 2015-04-08 | 1 | -2/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove unessesary logging of methods instantiation | ||||
| * | | | | | | remove unessesary logging of methods instantiation | Clark Tomlinson | 2015-04-08 | 1 | -2/+0 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #14120 from owncloud/dav-statcache | Morris Jobke | 2015-04-08 | 1 | -27/+143 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Stat cache for DAV storage, improves s2s performance a little bit |