upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38
59583 commits 679 branches 1186 tags 6.6 GiB
Commit graph

59583 commits

This branch
This branch
All branches
Author SHA1 Message Date
dependabot[bot]
fd4d4dbd8d Bump babel-loader from 8.2.2 to 8.2.3 
Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.2.2 to 8.2.3.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.2.2...v8.2.3)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-24 20:09:02 +02:00
Nextcloud bot
6c7efef285
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-24 02:22:32 +00:00
blizzz
7fe15c719c
Merge pull request #29419 from nextcloud/backport/29400/stable22 
[stable22] fixes an undefined index when getAccessList returns an empty array
 2021-10-24 01:25:57 +02:00
MichaIng
629225c30a
Merge pull request #29391 from nextcloud/backport/29220/stable22 
[stable22] s3 external storage fixes
 2021-10-23 20:20:25 +02:00
MichaIng
daeeae4ae0
Merge pull request #29398 from nextcloud/backport/29378/stable22 
[stable22] Make the route name error more helpful
 2021-10-23 20:12:28 +02:00
Arthur Schiwon
5145675d43 fixes an undefined index when getAccessList returns an empty array 
- [] is a valid return value that should be honored as having no access

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-10-23 12:48:51 +00:00
dependabot[bot]
99b151e87a
Merge pull request #29410 from nextcloud/dependabot/composer/build/integration/stable22/behat/behat-approx-3.9.0 2021-10-23 04:26:55 +00:00
Nextcloud bot
6853c89114
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-23 02:22:43 +00:00
dependabot[bot]
bf54b2138c
Update behat/behat requirement in /build/integration 
Updates the requirements on [behat/behat](https://github.com/Behat/Behat) to permit the latest version.
- [Release notes](https://github.com/Behat/Behat/releases)
- [Changelog](https://github.com/Behat/Behat/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Behat/Behat/compare/v3.8.0...v3.9.0)

---
updated-dependencies:
- dependency-name: behat/behat
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-23 02:11:35 +00:00
Christoph Wurst
bc17c790ad Make the route name error more helpful 
As a developer I have no clue what "Invalid route name" means. If the
exception gives me a hint I might find it easier to figure out why my
route triggers this error.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-10-22 20:36:42 +00:00
Julius Härtl
b98d314cec
Merge pull request #29381 from nextcloud/backport/29357/stable22 2021-10-22 20:14:56 +02:00
John Molakvoæ
93d0e207cc
Merge pull request #29385 from nextcloud/backport/28997/stable22 2021-10-22 18:37:49 +02:00
Richard Steinmetz
6c9a4dfe6f
Merge pull request #29389 from nextcloud/backport/29375/stable22 
[stable22] Make calendar schedule options translatable
 2021-10-22 18:23:24 +02:00
Robin Appelman
e62390045a cache versioning enabled status 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:31 +00:00
Robin Appelman
da4712b62c minor directory detect improvements 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:31 +00:00
Robin Appelman
d85c0f0c73 always set Key field in headObject 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:31 +00:00
Robin Appelman
5f438375a9 more reliable return value for Watcher::checkUpdate 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
4108655a46 more reliable hasUpdated for s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
7983ded102 remove old migration method 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
01cd477f04 optimize filetype for s3 directories a bit 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
a3d365b33b ci 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
30f0d9962a more reliable directory copy 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
804a7090f5 doesDirectoryExist fixes 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Robin Appelman
a4a4097068 s3 external storage listing rework 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-10-22 12:34:30 +00:00
Julius Härtl
517fa5f2b9 Make calendar schedule options translatable 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-10-22 10:38:11 +00:00
Daniel Kesselberg
f50ab2b158 Update attendence for external users 
For local users it's possible to select their calendar via the principal url and first update their own attendance status.
External users have no calendar event hence the recipient is the organizer.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2021-10-22 10:10:55 +00:00
Anna Larch
2f4d564ad4 Scheduling plugin not updating responding attendee status take two 
Signed-off-by: Anna Larch <anna@nextcloud.com>
 2021-10-22 10:10:55 +00:00
John Molakvoæ
029d86a9ac
Merge pull request #29316 from nextcloud/backport/29180/stable22 2021-10-22 11:20:19 +02:00
Christoph Wurst
4e41638101 Prevent duplicate auth token activity updates 
The auth token activity logic works as follows
* Read auth token
* Compare last activity time stamp to current time
* Update auth token activity if it's older than x seconds

This works fine in isolation but with concurrency that means that
occasionally the same token is read simultaneously by two processes and
both of these processes will trigger an update of the same row.
Affectively the second update doesn't add much value. It might set the
time stamp to the exact same time stamp or one a few seconds later. But
the last activity is no precise science, we don't need this accuracy.

This patch changes the UPDATE query to include the expected value in a
comparison with the current data. This results in an affected row when
the data in the DB still has an old time stamp, but won't affect a row
if the time stamp is (nearly) up to date.

This is a micro optimization and will possibly not show any significant
performance improvement. Yet in setups with a DB cluster it means that
the write node has to send fewer changes to the read nodes due to the
lower number of actual changes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-10-22 09:16:05 +00:00
Carl Schwan
759c5a762b
Merge pull request #29359 from nextcloud/backport/29355/stable22 
[stable22] Fix login button alignment
 2021-10-22 10:20:44 +02:00
Vincent Petry
e67a330fd1
Merge pull request #29365 from nextcloud/backport/29362/stable22 
[stable22] Fix security issues when copying groupfolder with advanced ACL
 2021-10-22 09:56:02 +02:00
Nextcloud bot
01c1a5945b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-22 02:22:11 +00:00
Carl Schwan
887f4ba2fb Fix security issues when copying groupfolder with advanced ACL 
Using advanced ACL, it is possible that an user has access to a
directory but not to a subdirectory, so the copying use
Common::copyFromStorage instead of Local::copyFromStorage.

Fix https://github.com/nextcloud/groupfolders/issues/1692

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-21 16:34:20 +00:00
Carl Schwan
6b667103c8 Fix login button alignment 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-21 13:16:58 +00:00
John Molakvoæ
cad44d69dd
Merge pull request #29288 from nextcloud/backport/28768/stable22 2021-10-21 09:31:46 +02:00
Nextcloud bot
0a1ee2da89
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-21 02:24:27 +00:00
Nextcloud bot
74c26288db
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-20 02:43:11 +00:00
Pytal
1ad0d3fb07
Merge pull request #29311 from nextcloud/backport/29295/stable22 2021-10-19 19:06:22 -07:00
MichaIng
dae59e5203
Merge pull request #29263 from nextcloud/backport/29090/stable22 
[stable22] Add configuration flag to disable the background job for files_versions
 2021-10-20 00:12:36 +02:00
MichaIng
1c69bc8180
Merge pull request #29262 from nextcloud/backport/29125/stable22 
[stable22] Add configuration flag to disable the background job for files_trashbin
 2021-10-20 00:10:54 +02:00
Joas Schilling
cbb2ffd1d2
Merge pull request #29301 from nextcloud/backport/29259/stable22 
[stable22] Fix app upgrade
 2021-10-19 13:36:57 +02:00
Côme Chilliet
9f27bde82b Use Psr\Log\LoggerInterface where it can easily be used in user_ldap 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-10-19 09:25:13 +00:00
Côme Chilliet
6372c34c40 Fix two mistakes in previous migration to LoggerInterface in OCA\User_LDAP\Access 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-10-19 09:25:13 +00:00
Côme Chilliet
d29a132949 Use Psr\Log\LoggerInterface in OCA\User_LDAP\Access 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-10-19 09:25:13 +00:00
Côme Chilliet
206d6d034f Avoid PHP errors when the LDAP attribute is not found 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-10-19 09:25:12 +00:00
John Molakvoæ
086950faf3
Merge pull request #29283 from nextcloud/backport/28250/stable22 2021-10-19 11:11:42 +02:00
John Molakvoæ
27c23b6f13
Merge pull request #29183 from nextcloud/backport/29028/stable22 2021-10-19 11:11:26 +02:00
Carl Schwan
1787d8257a Fix cliping issues in alternative logging buttons 
The issues was caused because the button with its margins was bigger
than the parent. Instead of setting the margin of the button, add
padding to the parent. This is more reliable.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-19 08:23:20 +00:00
Nextcloud bot
59376677b4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-19 02:23:00 +00:00
Joas Schilling
6a7b6ea0e8 Fix app upgrade 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-18 19:22:48 +00:00