upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79
61389 commits 1039 branches 1221 tags 8.3 GiB
Commit graph

61389 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
bb94d2c191
Merge pull request #33383 from nextcloud/backport/33378/stable23 
[stable23] don't set `null` as a bundle path
 2022-08-01 20:37:57 +02:00
blizzz
8ac46a6645
Merge pull request #33103 from nextcloud/enhancement/add-logging-lo-federation 
[Stable23] Logging, updating status for general error in federation
 2022-08-01 15:17:45 +02:00
blizzz
4456576894
Merge pull request #33095 from nextcloud/dependabot/composer/build/integration/stable23/sabre/dav-4.4.0 
Update sabre/dav requirement from 4.3.1 to 4.4.0 in /build/integration
 2022-08-01 15:17:02 +02:00
Joas Schilling
7fe507aac0
Merge pull request #33366 from nextcloud/vincentdabot/npm_and_yarn/stable23/underscore-1.12.1 
[stable23] Bump underscore from 1.12.0 to 1.12.1
 2022-07-27 21:54:13 +02:00
Robin Appelman
db86e92d05 don't set null as a bundle path 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-07-27 13:50:05 +00:00
Vincent Petry
419cb21fd6
Fix core tests by stubbing debounce 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2022-07-27 14:07:10 +02:00
Vincent Petry
c9c2a6eb48
Bump underscore from 1.12.0 to 1.12.1 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-07-27 14:07:07 +02:00
Vincent Petry
941fcf270a
Merge pull request #33348 from nextcloud/dependabot/npm_and_yarn/stable23/dompurify-2.3.10 
Bump dompurify from 2.3.8 to 2.3.10
 2022-07-26 22:50:41 +02:00
Vincent Petry
452a25c9f0
Merge pull request #33351 from nextcloud/backport/33315/stable23 
[stable23] Reset user status based on message ID only
 2022-07-26 22:49:57 +02:00
Anna
155e9fd6c5
Merge pull request #33365 from nextcloud/backport/33341/stable23 
[stable23] Don't try to purge objects from the birthday calendar when it doesn't exist
 2022-07-26 20:56:14 +02:00
Thomas Citharel
84e764bf5a Don't try to purge objects from the birthday calendar when it doesn't exist 
Doesn't matter much as it's been recreated afterwards with (ensureCalendarExists).

Closes #29617

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2022-07-26 17:29:17 +00:00
Joas Schilling
ac43cf60c0
Reset user status based on message ID only 
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>
 2022-07-26 11:31:10 +02:00
Joas Schilling
339dfb8712
Merge pull request #33344 from nextcloud/backport/33129/stable23 
[stable23] Fix reading blob data as resource
 2022-07-26 09:44:15 +02:00
Nextcloud bot
9896c7f002
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-26 02:27:06 +00:00
dependabot[bot]
302dcb4930 Bump dompurify from 2.3.8 to 2.3.10 
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>
 2022-07-25 19:09:23 +00:00
Thomas Citharel
1c0342af58 Fix reading blob data as resource 
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>
 2022-07-25 16:03:19 +00:00
Nextcloud bot
a02e81831d
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-25 02:27:25 +00:00
Nextcloud bot
9910787b67
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-24 02:28:05 +00:00
Nextcloud bot
b4c433e1c2
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-23 02:26:34 +00:00
blizzz
82bb1fd241
Merge pull request #33253 from nextcloud/backport/32963/stable23 
[stable23] also use nextcloud certificate bundle when downloading from s3
 2022-07-22 23:55:19 +02:00
Nextcloud bot
77d767872a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-22 02:25:35 +00:00
Nextcloud bot
128e384494
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-21 02:27:08 +00:00
Nextcloud bot
625ed61493
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-20 02:26:03 +00:00
blizzz
353f6d8890
Merge pull request #33277 from nextcloud/backport/33270/stable23 
[stable23] fix loading legacy app.php with multi app dir
 2022-07-19 09:58:45 +02:00
Arthur Schiwon
1ec1321c26 fix loading legacy app.php with multi app dir 
- 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>
 2022-07-19 06:22:19 +00:00
Nextcloud bot
0f2f1a19d4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-19 02:26:06 +00:00
blizzz
1debe060a8
Merge pull request #33257 from nextcloud/release/23.0.7 
23.0.7
 2022-07-18 13:52:36 +02:00
Arthur Schiwon
76b689e171
23.0.7 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-07-18 12:03:11 +02:00
Robin Appelman
87b7f2683f only use nextcloud bundle when explicitly enabled 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-07-18 07:57:48 +00:00
Robin Appelman
9d4b0e2265 also use nextcloud certificate bundle when downloading from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-07-18 07:57:46 +00:00
Nextcloud bot
4b385a44cb
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-18 02:25:16 +00:00
Nextcloud bot
e91311b9d7
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-17 02:25:02 +00:00
Nextcloud bot
4744ea5f2c
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-16 02:25:52 +00:00
Nextcloud bot
682223b2e7
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-15 02:27:57 +00:00
Carl Schwan
e03ac9d2ff
Merge pull request #33150 from nextcloud/automated/noid/stable23-update-psalm-baseline 
[stable23] Update psalm-baseline.xml
 2022-07-14 10:12:31 +02:00
nextcloud-command
a29aebd171 Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2022-07-14 04:28:50 +00:00
Nextcloud bot
bc31530502
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-14 02:25:42 +00:00
Nextcloud bot
e79398c3e4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-13 02:25:07 +00:00
Nextcloud bot
c93f3658c4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-12 02:23:49 +00:00
Anna Larch
11089f7d33 Add logging to federation sync 
Signed-off-by: Anna Larch <anna@nextcloud.com>
 2022-07-11 12:43:36 +02:00
Nextcloud bot
45a75c7219
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-11 02:24:49 +00:00
Nextcloud bot
c7281dcf49
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-10 02:25:48 +00:00
Nextcloud bot
858900dfab
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-09 02:24:51 +00:00
John Molakvoæ
9d60d1d8af
Merge pull request #33168 from nextcloud/release/23.0.7_rc2 2022-07-08 11:19:18 +02:00
John Molakvoæ
44f28b4866
23.0.7 RC2 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-07-08 10:05:46 +02:00
John Molakvoæ
b93bde1c76
Merge pull request #33158 from nextcloud/backport/33153/stable23 2022-07-08 08:28:39 +02:00
Nextcloud bot
f8d196ef9f
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-08 02:24:59 +00:00
John Molakvoæ
ac55a8f148
Merge pull request #33123 from nextcloud/release/23.0.7_rc1 2022-07-07 14:46:31 +02:00
blizzz
c7e9a59124
Merge pull request #32987 from nextcloud/backport/stable23/31771 
[stable23] Fix hook encryption with cron job
 2022-07-07 12:02:09 +02:00
blizzz
7f41e72e8a
Merge pull request #32529 from nextcloud/dependabot/npm_and_yarn/stable23/vue-router-3.5.4 
Bump vue-router from 3.5.3 to 3.5.4
 2022-07-07 12:00:52 +02:00