summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #33122 from nextcloud/release/22.2.10_rc1v22.2.10rc1John Molakvoæ2022-07-071-2/+2
|\
| * 22.2.10 RC1John Molakvoæ2022-07-051-2/+2
| | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
* | Merge pull request #33094 from ↵blizzz2022-07-071-1/+1
|\ \ | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/stable22/sabre/dav-4.4.0 Update sabre/dav requirement from 4.3.1 to 4.4.0 in /build/integration
| * | Update sabre/dav requirement from 4.3.1 to 4.4.0 in /build/integrationdependabot[bot]2022-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [sabre/dav](https://github.com/sabre-io/dav) to permit the latest version. - [Release notes](https://github.com/sabre-io/dav/releases) - [Changelog](https://github.com/sabre-io/dav/blob/master/CHANGELOG.md) - [Commits](https://github.com/sabre-io/dav/compare/4.3.1...4.4.0) --- updated-dependencies: - dependency-name: sabre/dav dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #33037 from nextcloud/backport/31345/stable22John Molakvoæ2022-07-074-12/+16
|\ \ \
| * | | Use unique key to prevent email component reuseChristopher Ng2022-06-274-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com> (cherry picked from commit fc03a935e859e619e8a1008a626cce68a581dae8) Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | Merge pull request #33003 from nextcloud/backport/32719/stable22John Molakvoæ2022-07-072-1/+312
|\ \ \ \
| * | | | Fix email shares not being shown to other usersRichard Steinmetz2022-06-242-1/+312
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
* | | | | Merge pull request #33152 from nextcloud/backport/33114/stable22John Molakvoæ2022-07-0711-10/+103
|\ \ \ \ \
| * | | | | Allow to disable password policy enforcement for selected groupsCarl Schwan2022-07-0711-10/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu> Co-authored-by: Vincent Petry <vincent@nextcloud.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | | Merge pull request #33151 from ↵John Molakvoæ2022-07-071-8/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | nextcloud/automated/noid/stable22-update-psalm-baseline
| * | | | | Update psalm baselinenextcloud-command2022-07-071-8/+0
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-0744-80/+100
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #33145 from nextcloud/backport/33052/stable22Pytal2022-07-064-3/+11
|\ \ \ \ \
| * | | | | Fix unit testsJoas Schilling2022-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Prevent duplicate set display name requestChristopher Ng2022-07-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
| * | | | | Do not save invalid display name to the databaseChristopher Ng2022-07-062-1/+7
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | Merge pull request #33134 from nextcloud/backport/32993/stable22blizzz2022-07-063-5/+11
|\ \ \ \ \ | | | | | | | | | | | | [stable22] Fixes for quota text in navigation bar
| * | | | | Fix quota text not updated after copying or moving a fileDaniel Calviño Sánchez2022-07-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the quota may change too when files are moved if the file is moved, for example, to or from a folder shared by other user. Besides the quota the storage statistics are also updated, similar to what is done when a file is deleted. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix quota text not updated when no quota is setDaniel Calviño Sánchez2022-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JavaScript code that updates the quota text expects the element to have "quotatext" as id. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix quota text shown escapedDaniel Calviño Sánchez2022-07-061-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "t()" escapes and sanitizes the returned text by default, so strings like "<" are converted to "&lt;". However, the "jQuery.text()" parameter does not need to be escaped, as "&lt;" is shown literally as "&lt;" rather than "<". Now "jQuery.html()" is used instead, which "unescapes" the given text and sets it as a new text node (as the text in the parameter does not contain markup for elements, only text). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #33121 from nextcloud/backport/33109/stable22blizzz2022-07-061-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | [stable22] Fix translation of home breadcrumb
| * | | | Fix translation of home breadcrumbChristopher Ng2022-07-051-1/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | Merge pull request #33017 from ↵blizzz2022-07-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/build/integration/stable22/guzzlehttp/guzzle-6.5.8 Update guzzlehttp/guzzle requirement from 6.5.7 to 6.5.8 in /build/integration
| * | | | Update guzzlehttp/guzzle requirement in /build/integrationdependabot[bot]2022-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the requirements on [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) to permit the latest version. - [Release notes](https://github.com/guzzle/guzzle/releases) - [Changelog](https://github.com/guzzle/guzzle/blob/6.5.8/CHANGELOG.md) - [Commits](https://github.com/guzzle/guzzle/compare/6.5.7...6.5.8) --- updated-dependencies: - dependency-name: guzzlehttp/guzzle dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #32891 from nextcloud/backport/32584/stable22blizzz2022-07-062-9/+30
|\ \ \ \ \ | | | | | | | | | | | | [stable22] Make sure ResetTokenBackgroundJob doesn't execute if config is read-only
| * | | | | Update tests after ResetTokenBackgroundJob changesThomas Citharel2022-06-151-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | Use OCP version of TimedJob instead of OC for ResetTokenBackgroundJobThomas Citharel2022-06-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | | Make sure ResetTokenBackgroundJob doesn't execute if config is read-onlyThomas Citharel2022-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to try to delete the config key in config.php if we aren't allowed to. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | | Merge pull request #32793 from nextcloud/backport/32675/stable22blizzz2022-07-061-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable22] Validate custom dashboard background image
| * | | | | | Validate custom dashboard background imageChristopher Ng2022-06-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | | | Merge pull request #32681 from nextcloud/backport/32510/stable22blizzz2022-07-064-6/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [stable22] Properly calculate primary element based on background luminance
| * | | | | | | Properly calculate primary element based on background luminanceJohn Molakvoæ2022-06-014-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-06140-164/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | Merge pull request #33117 from nextcloud/backport/33113/stable22Carl Schwan2022-07-052-3/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | [stable22] Remove .php from ajax url
| * | | | | | | add missing GET param to getstoragestats urlJulien Veyssier2022-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julien Veyssier <eneiluj@posteo.net> (cherry picked from commit ca6a7245032e87f6d7f65c8e796cc0f176659677)
| * | | | | | | Fix 404 when using index.php in the urlCarl Schwan2022-07-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit ee793572cb9acc9d688b1ff191a59e8699af9da1)
| * | | | | | | Remove .php from urlCarl Schwan2022-07-052-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably here for legacy reasons, but it is a bit weird to call an .php endpoint that doesn't correspond to a .php file Signed-off-by: Carl Schwan <carl@carlschwan.eu> (cherry picked from commit c7931086cc557211073540cf13e2af4c5afaaad3)
* | | | | | | Merge pull request #32976 from nextcloud/backport/32016/stable22blizzz2022-07-051-10/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [stable22] Use stored user for PasswordUpdatedEvent
| * | | | | | | Use stored user for PasswordUpdatedEventLouis Chemineau2022-06-221-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When handling PasswordUpdatedEvent event, we are calling getLoginName which does not exists. This PR adds a condition to use the previously stored user when handling PasswordUpdatedEvent. Signed-off-by: Louis Chemineau <louis@chmn.me>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-0526-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-0446-30/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-0320-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-0260-20/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | Merge pull request #32605 from nextcloud/backport/32575/stable22Simon L2022-07-011-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [stable22] Improve warning about missing pnctl
| * | | | | | | | Improve warning about missing pnctlCarl Schwan2022-06-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Carl Schwan <carl@carlschwan.eu>t
* | | | | | | | | Merge pull request #33060 from nextcloud/backport/33050/stable22Tobias Kaminsky2022-07-011-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [stable22] Check whether entry is of type ICacheEntry in Cache->remove()
| * | | | | | | | | Check whether entry is of type ICacheEntry in Cache->remove()Jonas2022-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some scenarios (file not in cache, but partial data of it in the object), Cache->get() might return an array, which leads to errors like "Call to a member function getId() on array". So check whether the returned entry is of type ICacheEntry before doing operations on it in Cache->remove(). Fixes: #33023 Signed-off-by: Jonas <jonas@freesources.org>
* | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-0144-82/+94
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2022-06-3026-10/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>