summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-08-2838-48/+120
|
* [tx-robot] updated from transifexNextcloud bot2020-08-2714-48/+54
|
* Merge pull request #22410 from nextcloud/backport/22359/stable19Roeland Jago Douma2020-08-262-0/+15
|\ | | | | [stable19] fix possible leaking scope in Flow
| * fix possible leaking scope in FlowArthur Schiwon2020-08-252-0/+15
| | | | | | | | | | | | | | | | | | - a configured flow can be brought into consideration, despite its event was not fired - it could either run through - or run into a RuntimeException and killing processing of valid flows Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #22427 from nextcloud/backport/21988/stable19Roeland Jago Douma2020-08-261-40/+47
|\ \ | | | | | | [stable19] Combine body-login rules in theming and fix twofactor and guest styling on bright colors
| * | Combine body-login rules in theming and fix twofactor and guest styling on ↵Julius Härtl2020-08-251-40/+47
| | | | | | | | | | | | | | | | | | bright colors Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2020-08-2628-28/+56
|/ /
* | Merge pull request #22414 from nextcloud/backport/22358/stable19John Molakvoæ2020-08-254-9/+12
|\ \ | |/ |/|
| * compiled assetsArthur Schiwon2020-08-252-2/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix event icon sizes and text alignmentArthur Schiwon2020-08-242-7/+10
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #22400 from nextcloud/backport/22394/stable19Roeland Jago Douma2020-08-251-1/+1
|\ \ | | | | | | [stable19] Fix missing FN from federated contact
| * | Fix missing FN from federated contactJohn Molakvoæ (skjnldsv)2020-08-241-1/+1
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / [tx-robot] updated from transifexNextcloud bot2020-08-25164-300/+358
|/
* Merge pull request #22337 from nextcloud/backport/22322/stable19Roeland Jago Douma2020-08-243-3/+7
|\ | | | | [stable19] Only copy the link when updating a share or no password was forced
| * Only copy the link when updating a share or no password was forcedJoas Schilling2020-08-243-3/+7
| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Make legacy cipher opt inRoeland Jago Douma2020-08-247-12/+181
| | | | | | | | | | | | | | | | * Systems that upgrade have this enabled by default * New systems disable it * We'll have to add some wargning in the setup checks if this is enabled Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2020-08-248-26/+140
| |
* | [tx-robot] updated from transifexNextcloud bot2020-08-2316-12/+42
| |
* | [tx-robot] updated from transifexNextcloud bot2020-08-226-6/+6
| |
* | Merge pull request #22348 from nextcloud/backport/22346/stable19Roeland Jago Douma2020-08-213-5/+5
|\ \ | | | | | | [stable19] l10n:Correct appid for WebAuthn
| * | l10n:Correct appid for WebAuthnMichiel Janssens2020-08-213-5/+5
| | | | | | | | | | | | | | | Signed-off-by: Michiel Janssens <michiel@nexigon.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #22341 from nextcloud/backport/22335/stable19Roeland Jago Douma2020-08-211-2/+10
|\ \ \ | | | | | | | | [stable19] Remove encryption option for nextcloud external storage
| * | | Remove encryption option for nextcloud external storageRoeland Jago Douma2020-08-201-2/+10
| | |/ | |/| | | | | | | | | | | | | | | | | | | Fixes #16017 Since it never worked we should not show it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #22333 from nextcloud/backport/22236/stable19Roeland Jago Douma2020-08-215-6/+41
|\ \ \ | |_|/ |/| | [stable19] CalDAV: Add ability to limit sharing to owner
| * | Add ability to limit sharing to ownerGeorg Ehrke2020-08-205-6/+41
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* / [tx-robot] updated from transifexNextcloud bot2020-08-2130-44/+84
|/
* Merge pull request #22309 from nextcloud/backport/22221/stable19-2Morris Jobke2020-08-201-1/+1
|\ | | | | [stable19] fixing a logged deprecation message
| * simplified backport of #22221, fixing a deprecation log messageArthur Schiwon2020-08-191-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2020-08-204-2/+4
|/
* Merge pull request #21983 from nextcloud/backport/21628/stable19Morris Jobke2020-08-191-4/+16
|\ | | | | [stable19] fix moving files from external storage to object store trashbin
| * fix object store trashbin handlingRobin Appelman2020-07-311-3/+10
| | | | | | | | | | | | object stores are "special" given how they interact with the cache on their own Signed-off-by: Robin Appelman <robin@icewind.nl>
| * rollback cache rename if trashbin move failsRobin Appelman2020-07-231-0/+5
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * fix moving files from external storage to object store trashbinRobin Appelman2020-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | having the "cache rename" after the "storage move" caused the target to get the fileid from the source file, without taking care that the object is stored under the original file id. By doing the "cache rename" first, we trigger the "update existing file" logic while moving the file to the object store and the object gets stored for the correct file id Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #22239 from nextcloud/backport/22128/stable19Joas Schilling2020-08-192-10/+19
|\ \ | | | | | | [stable19] Delete chunks if the move on an upload failed
| * | Return proper status when file didn't exist beforeJulius Härtl2020-08-132-2/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Adjust chunking test for non-existing target nodeJulius Härtl2020-08-131-3/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Delete chunks if the move on an upload failedJulius Härtl2020-08-131-6/+10
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2020-08-1920-2/+30
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-1824-50/+74
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-176-6/+10
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-1614-0/+14
| | |
* | | [tx-robot] updated from transifexNextcloud bot2020-08-15146-1252/+1268
| | |
* | | Merge pull request #21975 from nextcloud/backport/21658/stable19Roeland Jago Douma2020-08-145-0/+159
|\ \ \ | | | | | | | | [stable19] allow admin to configure the max trashbin size
| * | | allow admin to configure the max trashbin sizeRobin Appelman2020-07-235-0/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows an admin to configure the max trashbin size instead of always relying on the users quota. The trashbin size can be configured using the `occ trash:size` command and can be set both globally and per-user Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2020-08-14258-684/+900
| |/ / |/| |
* | | Add app config option to disable "Email was changed by admin" activityMorris Jobke2020-08-131-0/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #22131 from nextcloud/backport/22062/stable19-take2Roeland Jago Douma2020-08-133-63/+63
|\ \ \ | | | | | | | | [stable19] fix display of remote users in incoming share notifications
| * | | Short php syntaxJoas Schilling2020-08-061-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix missing placeholders in translationsJoas Schilling2020-08-061-7/+11
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | effectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10nArthur Schiwon2020-08-061-13/+4
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>