summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24622 from nextcloud/version/19.0.6/finalv19.0.6Roeland Jago Douma2020-12-091-2/+2
|\ | | | | 19.0.6
| * 19.0.6Roeland Jago Douma2020-12-091-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2020-12-098-6/+8
|
* [tx-robot] updated from transifexNextcloud bot2020-12-0820-6/+56
|
* Merge pull request #24585 from nextcloud/version/19.0.6/RC2v19.0.6RC2Roeland Jago Douma2020-12-071-2/+2
|\ | | | | 19.0.6 RC2
| * 19.0.6 RC2Roeland Jago Douma2020-12-071-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #24564 from nextcloud/backport/24552/stable19Roeland Jago Douma2020-12-071-2/+12
|\ \ | | | | | | [stable19] Remember me is not an app_password
| * | Fix typo Morris Jobke2020-12-041-1/+1
| | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Remember me is not an app_passwordRoeland Jago Douma2020-12-041-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | While technically they are stored the same. This session variable is used to indicate that a user is using an app password to authenticate. Like from a client. Or when having it generated automatically. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #24561 from nextcloud/backport/24557/stable19Roeland Jago Douma2020-12-072-17/+13
|\ \ \ | |_|/ |/| | [stable19] [stable20] dont use system composer for autoload checker
| * | Force composer v1Julius Härtl2020-12-041-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | cleanup after autoloader generationRobin Appelman2020-12-041-0/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | dont use system composer for autoload checkerRobin Appelman2020-12-042-17/+11
| |/ | | | | | | | | | | this ensures that the same composer version is used by everyone (and ci) Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #24583 from nextcloud/backport/24581/stable19Roeland Jago Douma2020-12-071-1/+0
|\ \ | | | | | | [stable19] Do not load nonexisting setup.js
| * | Do not load nonexisting setup.jsJulius Härtl2020-12-071-1/+0
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2020-12-0722-34/+60
| |
* | [tx-robot] updated from transifexNextcloud bot2020-12-0626-18/+64
| |
* | [tx-robot] updated from transifexNextcloud bot2020-12-0530-6/+48
|/
* Merge pull request #24554 from nextcloud/backport/24550/stable19Roeland Jago Douma2020-12-041-0/+1
|\ | | | | [stable19] Generate a new session id if the decrypting the session data fails
| * Generate a new session id if the decrypting the session data failsRoeland Jago Douma2020-12-041-0/+1
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2020-12-0434-0/+34
|
* Merge pull request #24471 from nextcloud/version/19.0.6/RC1Morris Jobke2020-12-031-2/+2
|\ | | | | 19.0.6 RC1
| * 19.0.6 RC1Roeland Jago Douma2020-12-031-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #24528 from nextcloud/backport/24519/stable19Roeland Jago Douma2020-12-032-2/+2
|\ | | | | [stable19] Fix vsprint parameter
| * Fix vsprint parameterRoeland Jago Douma2020-12-032-2/+2
| | | | | | | | | | | | | | %2\$; is not valid. On php7 this is just ignored but on php8 it gives an error. %2\$s; works. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #24518 from nextcloud/backport/24459/stable19Morris Jobke2020-12-031-2/+6
|\ \ | |/ |/| [stable19] Only execute plain mimetype check for directories and do the fallback…
| * Only execute plain mimetype check for directories and do the fallback only ↵Morris Jobke2020-12-021-2/+6
| | | | | | | | | | | | | | | | for non-directories Ref #23096 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #24514 from nextcloud/backport/24501/stable19Morris Jobke2020-12-032-3/+5
|\ \ | | | | | | [stable19] set mountid for personal external storage mounts
| * | set mountid for personal external storage mountsRobin Appelman2020-12-022-3/+5
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #24492 from nextcloud/backport/24376/stable19John Molakvoæ2020-12-037-10/+10
|\ \ \ | | | | | | | | [stable19] fix loading mtime of new file in conflict dialog in firefox
| * | | fix loading mtime of new file in conflict dialog in firefoxRobin Appelman2020-12-027-10/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2020-12-036-6/+58
| |_|/ |/| |
* | | Merge pull request #24508 from nextcloud/backport/23257/stable19Roeland Jago Douma2020-12-021-5/+4
|\ \ \ | |_|/ |/| | [stable19] Fix file size computation on 32bit platforms
| * | Fix file size computation on 32bit platformsaler92020-12-021-5/+4
|/ / | | | | | | Signed-off-by: aler9 <46489434+aler9@users.noreply.github.com>
* | Merge pull request #24503 from nextcloud/backport/24499/stable19Christoph Wurst2020-12-021-0/+3
|\ \ | | | | | | [stable19] Harden setup check for TLS version if host is not reachable
| * | Harden setup check for TLS version if host is not reachableMorris Jobke2020-12-021-0/+3
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #24386 from nextcloud/backport/24382/stable19John Molakvoæ2020-12-023-3/+3
|\ \ | |/ |/| [stable19] Properly encode path when fetching inherited shares
| * Properly encode path when fetching inherited sharesJulius Härtl2020-12-023-3/+3
| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | [tx-robot] updated from transifexNextcloud bot2020-12-022-0/+2
| |
* | Merge pull request #24484 from nextcloud/backport/24094/stable19Morris Jobke2020-12-011-1/+1
|\ \ | |/ |/| [stable19] Only attempt to move to trash if a file is not in appdata
| * Only attempt to move to trash if a file is not in appdataJulius Härtl2020-12-011-1/+1
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #24480 from nextcloud/backport/24242/stable19Morris Jobke2020-12-011-1/+1
|\ | | | | [stable19] Update ScanLegacyFormat.php
| * Update ScanLegacyFormat.phpessys2020-12-011-1/+1
|/ | | Fixed a small typo on line 99.
* Merge pull request #24327 from nextcloud/backport/24103/stable19Morris Jobke2020-12-011-1/+1
|\ | | | | [stable19] Only check path for being accessible when the storage is a object home
| * Only check path for being accessible when the storage is a object homeJulius Härtl2020-11-241-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #24343 from nextcloud/backport/24331/stable19Morris Jobke2020-12-013-2/+4
|\ \ | | | | | | [stable19] Fix contacts menu position and show uid as a tooltip
| * | Fix contacts menu position and show uid as a tooltipJulius Härtl2020-11-243-2/+4
| |/ | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | Merge pull request #24463 from nextcloud/backport/24460/stable19Roeland Jago Douma2020-12-013-12/+12
|\ \ | | | | | | [stable19] Use correct l10n source in files_sharing JS code
| * | Use correct l10n source in files_sharing JS codeMorris Jobke2020-11-303-12/+12
| | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-12-01138-170/+184
|/ /