summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #18448 from nextcloud/fix/noid/wrong-paths-for-fileidsRoeland Jago Douma2019-12-171-1/+1
|\
| * pass the proper storage-internal pathArthur Schiwon2019-12-171-1/+1
* | Merge pull request #18446 from nextcloud/fix/personal-settings-fixRoeland Jago Douma2019-12-173-3/+3
|\ \ | |/ |/|
| * Don't overwrite the settings from filesRoeland Jago Douma2019-12-173-3/+3
|/
* Merge pull request #18443 from nextcloud/fix/noid/update-xsdRoeland Jago Douma2019-12-172-0/+3
|\
| * update app info schema filesArthur Schiwon2019-12-172-0/+3
* | Merge pull request #18429 from nextcloud/locale-fallbackRoeland Jago Douma2019-12-171-0/+7
|\ \ | |/ |/|
| * add a fallback locale for personal settings pageRobin Appelman2019-12-161-0/+7
* | Merge pull request #18422 from nextcloud/design/recommended-appsRoeland Jago Douma2019-12-173-18/+33
|\ \
| * | Design fixes for recommended appsJan-Christoph Borchardt2019-12-163-18/+33
* | | Merge pull request #18385 from nextcloud/fix/18255/user_setting_to_always_acc...Roeland Jago Douma2019-12-1724-55/+410
|\ \ \
| * | | Allow users to specify to accept (internal) shares by defaultRoeland Jago Douma2019-12-1724-55/+410
* | | | Merge pull request #18270 from nextcloud/wiswedel/transferOwnership/polishingRoeland Jago Douma2019-12-177-81/+95
|\ \ \ \ | |/ / / |/| | |
| * | | added line breaks to incoming transfer notificationSascha Wiswedel2019-12-171-2/+2
| * | | Clean up publishingGary Kim2019-12-175-54/+62
| * | | Show path and uid on transfer buttonGary Kim2019-12-173-3/+9
| * | | rephrase "Target user" to "new owner"Sascha Wiswedel2019-12-171-1/+1
| * | | added patience note for shareeSascha Wiswedel2019-12-171-2/+2
| * | | transfer ownership dialog word choiceSascha Wiswedel2019-12-171-1/+1
| * | | notification polishingSascha Wiswedel2019-12-171-18/+18
| * | | Transfer ownership function polishingSascha Wiswedel2019-12-172-13/+13
* | | | Merge pull request #18428 from nextcloud/bugfix/noid/empty-templateRoeland Jago Douma2019-12-172-4/+34
|\ \ \ \ | |/ / / |/| | |
| * | | Return empty template for default creatorsJulius Härtl2019-12-162-4/+34
| |/ /
* | | Merge pull request #18438 from nextcloud/remove/old_npm_chunksRoeland Jago Douma2019-12-176-10913/+0
|\ \ \
| * | | Remove no longer generated chunksRoeland Jago Douma2019-12-176-10913/+0
|/ / /
* | | [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
|\ \ \
| * | | lower to debug, since we fire two events, so it is legitimateArthur Schiwon2019-12-161-1/+1
| * | | do not add (user) flows twiceArthur Schiwon2019-12-161-1/+1
* | | | Merge pull request #18431 from nextcloud/prov-api-query-applicationRoeland Jago Douma2019-12-161-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | query FederatedFileSharing Application instead of creating itRobin Appelman2019-12-161-1/+1
| | |/ | |/|
* | | 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 breadcrumbsJohn Molakvoæ (skjnldsv)2019-12-164-6/+5
* | | | Merge pull request #18418 from nextcloud/dependachristoph/npm_and_yarn/serial...Roeland Jago Douma2019-12-1637-76/+76
|\ \ \ \
| * | | | Bump serialize-javascript to v2.1.2Christoph Wurst2019-12-1637-76/+76
| |/ / /
* | | | 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 routeJulius Härtl2019-12-044-5/+27
* | | | | Merge pull request #17018 from nextcloud/feature/noid/allow-to-force-enable-v...Joas Schilling2019-12-168-42/+83
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allow to force enable apps via CLIJoas Schilling2019-12-138-42/+83
* | | | | Merge pull request #18417 from nextcloud/fix/transfer-ownership-ui-emailRoeland Jago Douma2019-12-163-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Make it possible to find transfer user by emailChristoph Wurst2019-12-163-2/+4
* | | | | Merge pull request #18384 from nextcloud/fix/18255/global_config_to_always_ac...Roeland Jago Douma2019-12-1611-61/+211
|\ \ \ \ \
| * | | | | config.php setting to always accept internal sharesRoeland Jago Douma2019-12-1611-61/+211
* | | | | | Merge pull request #18407 from nextcloud/dependabot/npm_and_yarn/css-loader-3...Roeland Jago Douma2019-12-1642-60/+60
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Bump css-loader from 3.2.1 to 3.3.2dependabot-preview[bot]2019-12-1642-60/+60
|/ / / / /
* | | | | Merge pull request #18401 from nextcloud/rakekniven-patch-1Roeland Jago Douma2019-12-161-1/+1
|\ \ \ \ \
| * | | | | l10n. Change grammar.rakekniven2019-12-131-1/+1
* | | | | | Merge pull request #18408 from nextcloud/dependabot/npm_and_yarn/eslint-plugi...Roeland Jago Douma2019-12-162-44/+66
|\ \ \ \ \ \
| * | | | | | Bump eslint-plugin-import from 2.18.2 to 2.19.1dependabot-preview[bot]2019-12-152-44/+66
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-1610-4/+32