aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespaceMorris Jobke2015-04-132-261/+1
|\ | | | | Fix namespace duplication and other issues in repairlegacystorages
| * Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-132-261/+1
| |
* | 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-104-31/+75
|\ \ \ \ | |_|_|/ |/| | | 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
| | | |
* | | | Merge pull request #15510 from owncloud/cron-singleuserThomas Müller2015-04-101-0/+3
|\ \ \ \ | | | | | | | | | | block cron when in single user mode
| * | | | 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
| * | | | only create a db entry for the user in case of a name conflict on group shareBjoern Schiessle2015-04-091-2/+7
| | | | |
* | | | | Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSourceMorris Jobke2015-04-091-1/+3
|\ \ \ \ \ | | | | | | | | | | | | fixes #15326
| * | | | | fixes #15326Jörn Friedrich Dreyer2015-04-091-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #14540 from owncloud/windows-setup-checkLukas Reschke2015-04-091-0/+13
|\ \ \ \ \ | |/ / / / |/| | | | Disallow Windows Server in Server Check
| * | | | Disallow Windows Server in Server CheckLukas Reschke2015-04-091-0/+13
| | | | | | | | | | | | | | | | | | | | Will prevent users from use ownCloud on Windows Server :see_no_evil:
* | | | | Merge pull request #13896 from owncloud/share-generatetarget-remove-excludeBjörn Schießle2015-04-091-17/+2
|\ \ \ \ \ | |/ / / / |/| | | | Dont create exclude list for generating the share target
| * | | | Dont create exclude list for generating the share targetRobin Appelman2015-02-041-17/+2
| | | | |
* | | | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deletingThomas Müller2015-04-091-8/+9
|\ \ \ \ \ | |_|/ / / |/| | | | Check if the key exists, before trying to delete it
| * | | | Check if the key exists, before trying to delete itJoas Schilling2015-04-091-8/+9
| | | | |
* | | | | Merge pull request #15314 from owncloud/app-categories-15274Lukas Reschke2015-04-096-164/+244
|\ \ \ \ \ | |/ / / / |/| | | | Add different trust levels to AppStore interface
| * | | | Fix PHPDocLukas Reschke2015-04-071-1/+3
| | | | |
| * | | | Deduplicate codeLukas Reschke2015-04-071-44/+31
| | | | |
| * | | | Make user names clickableLukas Reschke2015-04-031-0/+2
| | | | |
| * | | | Add experimental applications switchLukas Reschke2015-04-036-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-favoritesMorris Jobke2015-04-093-4/+73
|\ \ \ \ \ | | | | | | | | | | | | Limit file activities to favorites
| * | | | | Make scrutinizer happyJoas Schilling2015-04-012-2/+2
| | | | | |
| * | | | | Add logic for getting the user from the rss token to the ManagerJoas Schilling2015-03-302-2/+71
| | | | | |
* | | | | | Merge pull request #15490 from owncloud/remove-debug-loggingMorris Jobke2015-04-081-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove unessesary logging of methods instantiation
| * | | | | | remove unessesary logging of methods instantiationClark Tomlinson2015-04-081-2/+0
| | | | | | |
* | | | | | | Merge pull request #14120 from owncloud/dav-statcacheMorris Jobke2015-04-081-27/+143
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Stat cache for DAV storage, improves s2s performance a little bit