aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Only parse php7 code in app code checkerChristoph Wurst2019-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | Merge pull request #18370 from nextcloud/version/18/beta3v18.0.0beta3Roeland Jago Douma2019-12-191-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | 18 beta 3
| * | | | | | | | | 18 beta 3Roeland Jago Douma2019-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | fix credentials saving success message notification color (#18469)John Molakvoæ2019-12-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | fix credentials saving success message notification color
| * | | | | | | | | fix credentials saving success message notification colorSascha Wiswedel2019-12-181-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was red, now green Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | | | | | | Wiswedel/inherited shares/design polishing (#18447)John Molakvoæ2019-12-194-10/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Wiswedel/inherited shares/design polishing
| * | | | | | | | | removed inherited shares counterSascha Wiswedel2019-12-173-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | | | | | | clarifying share source folder link stringSascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | | | | | | | Streamline "unshare" wordingSascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
| * | | | | | | | | replace "invited by" with "added by"Sascha Wiswedel2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2019-12-1990-4/+504
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #18457 from nextcloud/fix/sharing/notifier/uidRoeland Jago Douma2019-12-181-7/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use the user from the notification
| * | | | | | | | | Use the user from the notificationRoeland Jago Douma2019-12-181-7/+2
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #18462 from nextcloud/fix/18211/list-group-with-slashRoeland Jago Douma2019-12-183-8/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix listing users in groups with slash in the name
| * | | | | | | | | Fix listing users in groups with slash in the nameGary Kim2019-12-183-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | | | | | | Merge pull request #18461 from ↵blizzz2019-12-181-8/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/noid/ensure-entity-on-scope-extension Flows that are managing themselves do not necessarily set the entity
| * | | | | | | | | | 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