aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Flows that are managing themselves do not necessarily set the entityArthur Schiwon2019-12-181-8/+10
| | | | | | | for instance files_automatedtagging, which works on a lower level. Fixes a Call to a member function isLegitimatedForUserId() on null. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #18456 from nextcloud/fix/office/previewsRoeland Jago Douma2019-12-181-1/+1
|\ | | | | Fix Office preview generation
| * Fix Office preview generationRoeland Jago Douma2019-12-181-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-12-18228-784/+272
|/
* Merge pull request #18448 from nextcloud/fix/noid/wrong-paths-for-fileidsRoeland Jago Douma2019-12-171-1/+1
|\ | | | | pass the proper storage-internal path
| * pass the proper storage-internal pathArthur Schiwon2019-12-171-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #18446 from nextcloud/fix/personal-settings-fixRoeland Jago Douma2019-12-173-3/+3
|\ \ | |/ |/| Don't overwrite the settings from files
| * Don't overwrite the settings from filesRoeland Jago Douma2019-12-173-3/+3
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #18443 from nextcloud/fix/noid/update-xsdRoeland Jago Douma2019-12-172-0/+3
|\ | | | | update app info schema files
| * update app info schema filesArthur Schiwon2019-12-172-0/+3
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #18429 from nextcloud/locale-fallbackRoeland Jago Douma2019-12-171-0/+7
|\ \ | |/ |/| add a fallback locale for personal settings page
| * add a fallback locale for personal settings pageRobin Appelman2019-12-161-0/+7
| | | | | | | | | | | | | | otherwise if the locale is set to an invalid or no longer existing locale the rendering of the setting page will throw an exception Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #18422 from nextcloud/design/recommended-appsRoeland Jago Douma2019-12-173-18/+33
|\ \ | | | | | | Design fixes for recommended apps
| * | Design fixes for recommended appsJan-Christoph Borchardt2019-12-163-18/+33
| | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #18385 from ↵Roeland Jago Douma2019-12-1724-55/+410
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix/18255/user_setting_to_always_accept_share Allow users to accept (internal) shares by default
| * | | Allow users to specify to accept (internal) shares by defaultRoeland Jago Douma2019-12-1724-55/+410
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18255 A new user setting allows a user to always accept (internal) shares. For example if they don't like accepting shares manually ;) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #18270 from nextcloud/wiswedel/transferOwnership/polishingRoeland Jago Douma2019-12-177-81/+95
|\ \ \ \ | |/ / / |/| | | Transfer ownership function polishing
| * | | added line breaks to incoming transfer notificationSascha Wiswedel2019-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | wrapped notifications into double quotes to make line breaks possible Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | Clean up publishingGary Kim2019-12-175-54/+62
| | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
| * | | Show path and uid on transfer buttonGary Kim2019-12-173-3/+9
| | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
| * | | rephrase "Target user" to "new owner"Sascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | added patience note for shareeSascha Wiswedel2019-12-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note about incoming transfer taken out by background job resolves #18272 Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | transfer ownership dialog word choiceSascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Reject instead of Decline Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | notification polishingSascha Wiswedel2019-12-171-18/+18
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | Transfer ownership function polishingSascha Wiswedel2019-12-172-13/+13
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | Merge pull request #18428 from nextcloud/bugfix/noid/empty-templateRoeland Jago Douma2019-12-172-4/+34
|\ \ \ \ | |/ / / |/| | | Return empty template for default creators
| * | | Return empty template for default creatorsJulius Härtl2019-12-162-4/+34
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #18438 from nextcloud/remove/old_npm_chunksRoeland Jago Douma2019-12-176-10913/+0
|\ \ \ | | | | | | | | Remove no longer generated chunks
| * | | Remove no longer generated chunksRoeland Jago Douma2019-12-176-10913/+0
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2019-12-1744-84/+86
| | |
* | | Merge pull request #18430 from nextcloud/fix/noid/double-flowRoeland Jago Douma2019-12-162-2/+2
|\ \ \ | | | | | | | | Fix/noid/double flow
| * | | lower to debug, since we fire two events, so it is legitimateArthur Schiwon2019-12-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | do not add (user) flows twiceArthur Schiwon2019-12-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #18431 from nextcloud/prov-api-query-applicationRoeland Jago Douma2019-12-161-1/+1
|\ \ \ \ | |_|/ / |/| | | query FederatedFileSharing Application instead of creating it
| * | | query FederatedFileSharing Application instead of creating itRobin Appelman2019-12-161-1/+1
| | |/ | |/| | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Cleanup old log and fix share icon sidebar opening in breadcru… (#18425)John Molakvoæ2019-12-164-6/+5
|\ \ \ | | | | | | | | Cleanup old log and fix share icon sidebar opening in breadcrumbs
| * | | Cleanup old log and fix share icon sidebar opening in breadcrumbsJohn Molakvoæ (skjnldsv)2019-12-164-6/+5
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #18418 from ↵Roeland Jago Douma2019-12-1637-76/+76
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependachristoph/npm_and_yarn/serialize-javascript-v2.1.2 Bump serialize-javascript to v2.1.2
| * | | | Bump serialize-javascript to v2.1.2Christoph Wurst2019-12-1637-76/+76
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #18061 from nextcloud/bugfix/noid/dav-plugin-oldRoeland Jago Douma2019-12-164-5/+27
|\ \ \ \ | | | | | | | | | | Load apps dav plugins on the old webdav route
| * | | | Load apps dav plugins on the old webdav routeJulius Härtl2019-12-044-5/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #17018 from ↵Joas Schilling2019-12-168-42/+83
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/feature/noid/allow-to-force-enable-via-cli Allow to force enable apps via CLI
| * | | | Allow to force enable apps via CLIJoas Schilling2019-12-138-42/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #18417 from nextcloud/fix/transfer-ownership-ui-emailRoeland Jago Douma2019-12-163-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Make it possible to find transfer to user by email
| * | | | Make it possible to find transfer user by emailChristoph Wurst2019-12-163-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Vue Multiselect uses one prop for the local search. Although the API already returned matching users for a given email, the users were filtered out as their displayname doesn't contain the search string – the email address. Disabling the local seach and only using the most recently fetched matches fixes this problem. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #18384 from ↵Roeland Jago Douma2019-12-1611-61/+211
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/18255/global_config_to_always_accept config.php setting to always accept internal shares
| * | | | | config.php setting to always accept internal sharesRoeland Jago Douma2019-12-1611-61/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of #18255 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #18407 from ↵Roeland Jago Douma2019-12-1642-60/+60
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/css-loader-3.3.2 Bump css-loader from 3.2.1 to 3.3.2
| * | | | | Bump css-loader from 3.2.1 to 3.3.2dependabot-preview[bot]2019-12-1642-60/+60
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.1 to 3.3.2. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.2.1...v3.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | Merge pull request #18401 from nextcloud/rakekniven-patch-1Roeland Jago Douma2019-12-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | l10n. Change grammar.