summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #33363 from ↵Vincent Petry2022-07-265-12/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/stable24/dompurify-2.3.10 Bump dompurify from 2.3.8 to 2.3.10
| * | | | Bump dompurify from 2.3.8 to 2.3.10dependabot[bot]2022-07-265-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.3.8 to 2.3.10. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.3.8...2.3.10) --- updated-dependencies: - dependency-name: dompurify dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | | Merge pull request #33132 from nextcloud/backport/33090/stable24Vincent Petry2022-07-261-56/+76
|\ \ \ \ \ | | | | | | | | | | | | [stable24] DAV custom props: catch Exception and rollback transaction in case
| * | | | | catch any exception for transaction controlArthur Schiwon2022-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | DAV custom props: catch Exception and rollback transaction in caseArthur Schiwon2022-07-061-56/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - before exceptions were not caught, a started transaction might not have been finished - also resolve depractions and use IQueryBuilder Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #33350 from nextcloud/backport/33315/stable24Vincent Petry2022-07-264-13/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable24] Reset user status based on message ID only
| * | | | | | Reset user status based on message ID onlyJoas Schilling2022-07-264-13/+20
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since some statuses (call) can occure with different status (away and dnd) we need to reset only based on the message id. But as it can not be set by the user this is still save and okay. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #33364 from nextcloud/backport/33341/stable24Anna2022-07-261-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [stable24] Don't try to purge objects from the birthday calendar when it doesn't exist
| * | | | | Don't try to purge objects from the birthday calendar when it doesn't existThomas Citharel2022-07-261-0/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't matter much as it's been recreated afterwards with (ensureCalendarExists). Closes #29617 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | Merge pull request #31984 from ↵blizzz2022-07-265-11/+21
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/stable24/underscore-1.12.1 Bump underscore from 1.12.0 to 1.12.1
| * | | | Fix core tests by stubbing debounceVincent Petry2022-07-261-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vincent Petry <vincent@nextcloud.com>
| * | | | Bump underscore from 1.12.0 to 1.12.1dependabot[bot]2022-07-264-11/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [underscore](https://github.com/jashkenas/underscore) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/jashkenas/underscore/releases) - [Commits](https://github.com/jashkenas/underscore/compare/1.12.0...1.12.1) --- updated-dependencies: - dependency-name: underscore dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
* | | | Merge pull request #33343 from nextcloud/backport/33129/stable24Joas Schilling2022-07-262-0/+20
|\ \ \ \ | | | | | | | | | | [stable24] Fix reading blob data as resource
| * | | | Fix reading blob data as resourceThomas Citharel2022-07-252-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL returns data as resource when using IQueryBuilder::PARAM_LOB (which is used for QBMapper). Previously we just converted this resource using settype, which produced things like "Resource id #14" instead of the actual resource data. Now we read the stream correctly if the returned data is a resource See context at #22472 Fixes #22439 Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-2610-4/+276
|/ / / / | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | Merge pull request #33326 from nextcloud/backport/33308/stable24Vincent Petry2022-07-251-6/+15
|\ \ \ \ | | | | | | | | | | [stable24] always triger setup of builtin storage wrappers
| * | | | always triger setup of builtin storage wrappersRobin Appelman2022-07-221-6/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-254-2/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-246-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-23154-306/+310
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #33252 from nextcloud/backport/32963/stable24blizzz2022-07-222-12/+24
|\ \ \ \ \ | | | | | | | | | | | | [stable24] also use nextcloud certificate bundle when downloading from s3
| * | | | | only use nextcloud bundle when explicitly enabledRobin Appelman2022-07-182-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | also use nextcloud certificate bundle when downloading from s3Robin Appelman2022-07-182-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #33178 from nextcloud/backport/33118/stable24blizzz2022-07-221-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [stable24] Fix empty address books being exported
| * | | | | Fix empty address books being exportedChristopher Ng2022-07-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Ng <chrng8@gmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-22140-4/+166
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-2198-94/+116
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #33262 from nextcloud/backport/33222/stable24Vincent Petry2022-07-204-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable24] Translate error when user already exists
| * | | | | | RecompileJoas Schilling2022-07-182-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Translate error when user already existsJoas Schilling2022-07-182-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2022-07-208-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | | Merge pull request #33212 from nextcloud/backport/33211/stable24Jonas2022-07-191-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [stable24] Fix listening for circle events in SetupManager
| * | | | | | | Fix listening for circle events in SetupManagerJonas2022-07-181-4/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far, SetupManager listened for deprecated events that are no longer triggered. Instead, use the circle events that actually get triggered when adding or removing a circle or circle member. Also, these events get triggered on each instance of a globalscale setup. Fixes: #33210 Signed-off-by: Jonas <jonas@freesources.org>
* | | | | | | Merge pull request #33276 from nextcloud/backport/33270/stable24blizzz2022-07-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [stable24] fix loading legacy app.php with multi app dir
| * | | | | | | fix loading legacy app.php with multi app dirArthur Schiwon2022-07-191-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - requireAppFile() only appends /appinfo/app.php - without the absolute path, require_once looks into include_path - the first match in inlcude_path however migth be different from appPath - fixed by providing the tested(!), full path to the app Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* / / / / / / [tx-robot] updated from transifexNextcloud bot2022-07-194-0/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | | Merge pull request #33256 from nextcloud/release/24.0.3v24.0.3blizzz2022-07-181-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | 24.0.3
| * | | | | 24.0.3Arthur Schiwon2022-07-181-2/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-1820-4/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-176-2/+62
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-1614-6/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | Merge pull request #33149 from ↵Carl Schwan2022-07-151-8/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/automated/noid/stable24-update-psalm-baseline [stable24] Update psalm-baseline.xml
| * | | | | Update psalm baselinenextcloud-command2022-07-151-8/+0
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-1540-0/+84
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-14162-2242/+2410
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-1314-8/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-126-0/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-118-0/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-1030-2/+70
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2022-07-0978-88/+130
|/ / / / | | | | | | | | | | | | Signed-off-by: Nextcloud bot <bot@nextcloud.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 11:32:17 +0000