upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-01 04:50:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 31
62829 commits 694 branches 1186 tags 7 GiB
Commit graph

62829 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
91c2a60424
Merge pull request #31984 from nextcloud/dependabot/npm_and_yarn/stable24/underscore-1.12.1 
Bump underscore from 1.12.0 to 1.12.1
 2022-07-26 19:21:38 +02:00
Vincent Petry
b0be67fb74
Fix core tests by stubbing debounce 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2022-07-26 15:47:12 +02:00
dependabot[bot]
6c81f543b2 Bump underscore from 1.12.0 to 1.12.1 
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>
 2022-07-26 13:11:29 +00:00
Côme Chilliet
d0ceedf054 Use Symfony IpUtils to check for local IP ranges 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-07-26 09:42:33 +00:00
Côme Chilliet
8cddb75c2b Check for local IPs nested in IPv6 as well 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-07-26 09:42:32 +00:00
Côme Chilliet
1d0ddcfca1 Refactor local IP if and set strict to true for in_array 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-07-26 09:42:32 +00:00
Côme Chilliet
7ab50248dc Improve local IP detection 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-07-26 09:42:32 +00:00
Côme Chilliet
76108a7adb
Sync 3rdparty with stable24, bumps sabre/dav to 4.4.0 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-07-26 10:48:07 +02:00
Joas Schilling
da14fde621 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 08:16:17 +00:00
Joas Schilling
1749771ce3
Merge pull request #33343 from nextcloud/backport/33129/stable24 
[stable24] Fix reading blob data as resource
 2022-07-26 09:43:54 +02:00
Nextcloud bot
4fbb53e85e
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-26 02:27:00 +00:00
Thomas Citharel
618bbb313c 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 15:59:36 +00:00
Vincent Petry
a2166864d4
Merge pull request #33326 from nextcloud/backport/33308/stable24 
[stable24] always triger setup of builtin storage wrappers
 2022-07-25 17:04:19 +02:00
Nextcloud bot
d2cd3adfea
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-25 02:27:19 +00:00
Nextcloud bot
5cc782f102
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-24 02:27:53 +00:00
Nextcloud bot
7ada3bc39a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-23 02:26:27 +00:00
blizzz
22822a836d
Merge pull request #33252 from nextcloud/backport/32963/stable24 
[stable24] also use nextcloud certificate bundle when downloading from s3
 2022-07-22 23:54:41 +02:00
blizzz
f3afffe416
Merge pull request #33178 from nextcloud/backport/33118/stable24 
[stable24] Fix empty address books being exported
 2022-07-22 23:23:50 +02:00
Robin Appelman
2c6cd0daf8 always triger setup of builtin storage wrappers 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-07-22 20:24:35 +00:00
Nextcloud bot
f23472e68f
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-22 02:25:24 +00:00
Nextcloud bot
2a73b53c44
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-21 02:26:57 +00:00
Vincent Petry
08dabe975e
Merge pull request #33262 from nextcloud/backport/33222/stable24 
[stable24] Translate error when user already exists
 2022-07-20 12:36:07 +02:00
Nextcloud bot
c1d7596143
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-20 02:25:52 +00:00
Jonas
78a3bfd120
Merge pull request #33212 from nextcloud/backport/33211/stable24 
[stable24] Fix listening for circle events in SetupManager
 2022-07-19 10:25:45 +02:00
blizzz
4cd4378dac
Merge pull request #33276 from nextcloud/backport/33270/stable24 
[stable24] fix loading legacy app.php with multi app dir
 2022-07-19 09:58:04 +02:00
Arthur Schiwon
7af9f2741f 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:18:59 +00:00
Nextcloud bot
4f8e18d4a6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-19 02:26:00 +00:00
Jonas
786317e1cb
Fix listening for circle events in SetupManager 
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>
 2022-07-18 21:09:37 +01:00
Joas Schilling
636ae8e829
Recompile 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-07-18 15:29:57 +02:00
Joas Schilling
4f0862c431
Translate error when user already exists 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-07-18 15:26:21 +02:00
blizzz
7844c0bce1
Merge pull request #33256 from nextcloud/release/24.0.3 
24.0.3
 2022-07-18 13:23:32 +02:00
Arthur Schiwon
959c1f3145
24.0.3 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-07-18 12:02:16 +02:00
Robin Appelman
d4de68f1d4 only use nextcloud bundle when explicitly enabled 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-07-18 07:54:55 +00:00
Robin Appelman
e640ee4720 also use nextcloud certificate bundle when downloading from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-07-18 07:54:54 +00:00
Nextcloud bot
01dd022502
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-18 02:25:09 +00:00
Nextcloud bot
08ad7a465a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-17 02:24:50 +00:00
Nextcloud bot
0858b10c4d
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-16 02:25:44 +00:00
Carl Schwan
1d602044a4
Merge pull request #33149 from nextcloud/automated/noid/stable24-update-psalm-baseline 
[stable24] Update psalm-baseline.xml
 2022-07-15 09:11:39 +02:00
nextcloud-command
31937f5488 Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2022-07-15 04:36:48 +00:00
Nextcloud bot
0c254123f5
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-15 02:27:46 +00:00
Nextcloud bot
ce7b2c1329
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-14 02:25:32 +00:00
Nextcloud bot
c485a0f9af
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-13 02:24:59 +00:00
Nextcloud bot
c6f667fb86
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-12 02:23:37 +00:00
Nextcloud bot
d885e9d70b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-11 02:24:41 +00:00
Nextcloud bot
6b5e366500
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-10 02:25:41 +00:00
Nextcloud bot
6b61ae235e
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-07-09 02:24:43 +00:00
Christopher Ng
e4674d5402 Fix empty address books being exported 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-07-08 20:17:39 +00:00
John Molakvoæ
c01e5d53a1
Merge pull request #33169 from nextcloud/release/24.0.3_rc2 2022-07-08 11:07:05 +02:00
John Molakvoæ
07fbeccb84
24.0.3 RC2 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-07-08 10:06:24 +02:00
John Molakvoæ
dec16a9543
Merge pull request #33157 from nextcloud/backport/33153/stable24 2022-07-08 08:28:29 +02:00