summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6130 from nextcloud/cleanup-unused-methodsMorris Jobke2017-08-168-77/+20
|\ | | | | Cleanup unused methods
| * Cleanup unused methodsMorris Jobke2017-08-158-77/+20
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-08-1680-218/+354
| |
* | Merge pull request #6128 from nextcloud/primary-font-color-in-capabilitiesMorris Jobke2017-08-152-9/+22
|\ \ | | | | | | Add the primary font color to the capabilities as well
| * | Add the primary font color to the capabilities as wellJoas Schilling2017-08-152-9/+22
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #6132 from nextcloud/do-not-log-maintenance-modeMorris Jobke2017-08-152-3/+10
|\ \ \ | | | | | | | | Do not log WebDAV maintenance mode exception
| * | | Do not log WebDAV maintenance mode exceptionMorris Jobke2017-08-152-3/+10
| | |/ | |/| | | | | | | | | | | | | Log the maintenance mode exception only in debug level. Fixes #6124 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #6101 from cbartz/patch-1Lukas Reschke2017-08-151-6/+1
|\ \ \ | | | | | | | | Missing array assignment in Swift.php
| * | | Remove tmpFiles Array in Swift.phpChristopher Bartz2017-08-141-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | tmpFiles Array is unnecessary and there has been a reference without an assignment which lead to a bug making swift external storage unuseable.
* | | | Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-errorLukas Reschke2017-08-152-5/+22
|\ \ \ \ | |_|/ / |/| | | Catch exceptions on error of cloud id resolution
| * | | Document that it throwsJoas Schilling2017-08-141-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Catch exceptions on error of cloud id resolutionJoas Schilling2017-08-141-5/+21
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #6123 from nextcloud/cleanup-shareItemMorris Jobke2017-08-159-51/+33
|\ \ \ \ | | | | | | | | | | Cleanup usage of shareItem in internal code base
| * | | | Cleanup usage of shareItem in internal code baseMorris Jobke2017-08-159-51/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6121 from nextcloud/cleanup-registerBackendMorris Jobke2017-08-157-21/+8
|\ \ \ \ \ | | | | | | | | | | | | Use proper methods for registerBackend
| * | | | | Use proper methods for registerBackendMorris Jobke2017-08-157-21/+8
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #6118 from nextcloud/cleanup-checkPasswordProtectedShareMorris Jobke2017-08-153-13/+2
|\ \ \ \ \ | |/ / / / |/| | | | Use proper methods for checkPasswordProtectedShare
| * | | | Use proper methods for checkPasswordProtectedShareMorris Jobke2017-08-153-13/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6116 from nextcloud/cleanup-unused-methodsMorris Jobke2017-08-155-1781/+3
|\ \ \ \ | | | | | | | | | | Cleanup unused methods
| * | | | Cleanup unused methodsMorris Jobke2017-08-155-1781/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / [tx-robot] updated from transifexNextcloud bot2017-08-1560-114/+132
|/ / /
* | | Merge pull request #6098 from nextcloud/fix-federation-scopeRoeland Jago Douma2017-08-141-1/+1
|\ \ \ | | | | | | | | Fix federation scope dropdown
| * | | Fix federation scope dropdownMorris Jobke2017-08-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6080 from nextcloud/header-bottom-borderMorris Jobke2017-08-142-0/+25
|\ \ \ \ | | | | | | | | | | Add buttom border for header
| * | | | Add buttom border for headerMorris Jobke2017-08-142-0/+25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * allows to distinct the header from the rest of the UI for bright colors * ref #5654 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #5872 from nextcloud/swift-filter-dotRobin Appelman2017-08-141-1/+1
|\ \ \ \ | |_|/ / |/| | | Filter magic dot object when swift directory
| * | | Filter magic dot object when swift directoryRobin Appelman2017-08-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #6091 from nextcloud/authpage-designMorris Jobke2017-08-141-1/+5
|\ \ \ \ | |_|_|/ |/| | | Add heading to account access page
| * | | Remove quotes around device nameMorris Jobke2017-08-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Highlight client identifier in auth grant pageMorris Jobke2017-08-141-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add heading to account access pageJan-Christoph Borchardt2017-08-121-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #6097 from nextcloud/issue-6078-accounts-table-missingMorris Jobke2017-08-144-3/+102
|\ \ \ \ | | | | | | | | | | Make sure the accounts table exists
| * | | | Update autoloaderMorris Jobke2017-08-142-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Fix headersJoas Schilling2017-08-142-6/+44
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Make sure the accounts table existsJoas Schilling2017-08-142-1/+60
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #6090 from nextcloud/federationscope-title-boldMorris Jobke2017-08-141-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Bold federation scope title in dropdown menu, as intended
| * | | | Bold federation scope title in dropdown menu, as intendedJan-Christoph Borchardt2017-08-121-0/+4
| | |/ / | |/| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1416-4/+98
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1316-24/+82
|/ / /
* | | Merge pull request #6084 from nextcloud/brand-itRoeland Jago Douma2017-08-121-3/+3
|\ \ \ | | | | | | | | Brand it 🙈
| * | | Brand it :see_no_evil:Lukas Reschke2017-08-111-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-1222-14/+150
|/ / /
* | | Merge pull request #5861 from nextcloud/shareinfoLukas Reschke2017-08-117-118/+646
|\ \ \ | | | | | | | | Move shareinfo over to proper controller
| * | | Add unit testsRoeland Jago Douma2017-08-104-16/+437
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Remove old code + add MiddlewareRoeland Jago Douma2017-08-105-125/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add proper middleware for shareinfo * Remove old shareinfo routes Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Move shareinfo over to proper controllerRoeland Jago Douma2017-08-102-1/+137
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-08-116-18/+580
| | |
* | | Merge pull request #6004 from ↵Roeland Jago Douma2017-08-106-4/+66
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/forward-5902-repair-drop-account-terms-on-oc-migration [13] Repair step: drop account terms on oc migration
| * | | Use the existing array of OC versionsJoas Schilling2017-08-071-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Add a repair step to drop the account_terms table on oc migrationJoas Schilling2017-08-075-1/+65
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>