summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-2814-22/+34
|
* Merge pull request #4521 from nextcloud/custom-mount-typesRoeland Jago Douma2017-04-288-7/+68
|\ | | | | allow apps to set custom mount types
| * Make sure mountType is actually definedRoeland Jago Douma2017-04-281-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * allow apps to set custom mount typesRobin Appelman2017-04-288-7/+68
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4574 from nextcloud/rename-extension-pointLukas Reschke2017-04-281-1/+1
|\ \ | | | | | | Rename extension point
| * | Rename extension pointLukas Reschke2017-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | To align with upstream. Fixes https://github.com/nextcloud/guests/issues/3 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4575 from nextcloud/add-sharing-types-for-guestRoeland Jago Douma2017-04-282-0/+2
|\ \ \ | | | | | | | | Add sharing types for guests
| * | | Add sharing types for guestsLukas Reschke2017-04-282-0/+2
| |/ / | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/guests/issues/4 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4576 from ↵Joas Schilling2017-04-281-1/+0
|\ \ \ | |/ / |/| | | | | | | | nextcloud/disable-oc-migration-until-we-found-a-path Disable OC Migration until we found a path to do it
| * | Disable OC Migration until we found a path to do itJoas Schilling2017-04-281-1/+0
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4562 from nextcloud/contactmenu-second-tooltipJoas Schilling2017-04-281-1/+3
|\ \ | |/ |/| Show tooltip for second action in contacts menu
| * Show tooltip for second action.Ivan Sein2017-04-271-1/+3
| | | | | | | | Signed-off-by: Ivan Sein <ivan@nextcloud.com>
* | Merge pull request #4524 from nextcloud/downstream-27508Roeland Jago Douma2017-04-2816-287/+670
|\ \ | | | | | | Keep file id on move
| * | Fix class namesJoas Schilling2017-04-271-4/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix last unit testsJoas Schilling2017-04-272-200/+32
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Don't end the abstract class name with Test.phpJoas Schilling2017-04-274-4/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add commentVincent Petry2017-04-271-0/+2
| | |
| * | Properly handle missing READ permissionVincent Petry2017-04-277-11/+100
| | |
| * | Fix duplicate name of classJoas Schilling2017-04-272-6/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix forbidden backslash DAV integration testsVincent Petry2017-04-261-12/+12
| | |
| * | Fix FutureFile MOVE to keep destination nodeVincent Petry2017-04-263-4/+112
| | | | | | | | | | | | | | | | | | Sabre usually deletes the target node on MOVE before proceeding with the actual move operation. This fix prevents this to happen in case the source node is a FutureFile.
| * | Accept moving FutureFile into a DirectoryVincent Petry2017-04-261-0/+6
| | |
| * | Moved unit tests from ObjectTree::move to DirectoryVincent Petry2017-04-263-10/+256
| | |
| * | Remove ObjectTree::move and let is use the IMoveTarget approach insteadVincent Petry2017-04-261-98/+0
| | | | | | | | | | | | This removes the duplicated code
| * | Ported ObjectTree::move to IMoveTarget in new DAV endpointVincent Petry2017-04-261-4/+110
| | |
| * | Added test cases from core 16825Sergio Bertolin2017-04-261-0/+41
| | |
| * | Simplified new endpoint move testVincent Petry2017-04-261-9/+4
| | |
| * | Added case when final chunk move must not change file idVincent Petry2017-04-261-0/+13
| | |
| * | Added test about checking file id after a moveSergio Bertolin2017-04-262-2/+45
| | |
* | | Merge pull request #4569 from nextcloud/fix-iconsRoeland Jago Douma2017-04-287-6/+18
|\ \ \ | | | | | | | | Fix icons in sidebar on personal page
| * | | Fix icons in sidebar on personal pageMorris Jobke2017-04-277-6/+18
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4570 from ↵Lukas Reschke2017-04-281-7/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/do-not-disable-3rdparty-apps-on-cli-upgrade Do not disable 3rdparty apps on occ upgrade
| * | | | Do not disable 3rdparty apps on occ upgradeMorris Jobke2017-04-271-7/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / [tx-robot] updated from transifexNextcloud bot2017-04-28242-202/+812
|/ / /
* | | Merge pull request #4522 from nextcloud/downstream-27596Morris Jobke2017-04-273-25/+57
|\ \ \ | | | | | | | | Allow to create a user for a specific backend
| * | | Use the new method in the old one to remove duplicate codeJoas Schilling2017-04-273-36/+41
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow to create a user for a specific backendJoas Schilling2017-04-262-0/+27
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4565 from nextcloud/fix-typoMorris Jobke2017-04-271-1/+1
|\ \ \ | | | | | | | | Fix typo in HTML tags
| * | | Fix typo in HTML tagsMorris Jobke2017-04-271-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4561 from nextcloud/text-for-federatedMorris Jobke2017-04-270-0/+0
|\ \ \ | |/ / |/| | Add hint for federated sharing
| * | Add hint for federated sharingMorris Jobke2017-04-271-0/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4540 from nextcloud/settings-helpMorris Jobke2017-04-276-6/+11
|\ \ \ | |/ / |/| | Add more hints to settings
| * | Add more hints to settingsJan-Christoph Borchardt2017-04-266-6/+11
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #3770 from nextcloud/faster-search-in-contactsMorris Jobke2017-04-271-7/+6
|\ \ \ | | | | | | | | Factorize query for searching contacts
| * | | Add back the name query partRoeland Jago Douma2017-04-211-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Factorize query for searching contactsThomas Citharel2017-04-211-7/+4
| | | |
* | | | Merge pull request #4501 from nextcloud/downstream-27144Morris Jobke2017-04-266-18/+59
|\ \ \ \ | | | | | | | | | | Add duration of last job execution to the table
| * | | | Add duration of last job execution to the tableNoveen Sachdeva2017-04-257-19/+60
| | | | |
* | | | | Merge pull request #4519 from nextcloud/downstream-27703Morris Jobke2017-04-262-0/+14
|\ \ \ \ \ | | | | | | | | | | | | Reload file list when leaving hidden state
| * | | | | Reload file list when leaving hidden stateVincent Petry2017-04-262-0/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a file list is already initialized and was hidden when switching to another file list in the navigation bar, if the user comes back to this list it gets redisplayed. At this point the list needs to be refreshed to be able to reflect any potential file changes done from the other lists.