upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
57831 commits 1028 branches 1221 tags 7.6 GiB
Commit graph

57831 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Molakvoæ
5d04a3fed2
Merge pull request #27707 from nextcloud/version/21.0.3/final 2021-07-01 11:41:30 +02:00
John Molakvoæ
91af4e2a15
Merge pull request #27107 from nextcloud/backport/27043/stable21 2021-07-01 11:39:47 +02:00
Nextcloud bot
053e1153eb
[tx-robot] updated from transifex 2021-07-01 02:24:59 +00:00
Vincent Petry
ece2e3e5ea
Merge pull request #27727 from nextcloud/backport/27638/stable21 
[stable21] Downstream encryption:fix-encrypted-version for repairing "bad signature" errors
 2021-06-30 17:18:14 +02:00
Vincent Petry
19d2dbf80b Prevent running FixEncryptedVersion without master key 
Return an error when running occ encryption:fix-encrypted-version
when master key encryption is not enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:23:32 +00:00
Vincent Petry
b3052e4932 Fix FixEncryptedVersionTest test 
Fixed setup to use EncryptionTrait like other existing tests.
Fix expectations to not rely on side effects from previous test cases.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:23:31 +00:00
Vincent Petry
36a175ccde Fix warnings in FixEncryptedVersion command 
Fixed code warnings

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:23:31 +00:00
Vincent Petry
7e1c807a0d Detect disabled signature check when reparing 
When running occ encryption:fix-encrypted-version, detect whether the
setting 'encryption_skip_signature_check' is set and abort if it is,
because the repair cannot detect version mismatch errors with it
enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:23:31 +00:00
Vincent Petry
d2574c4363 Downstream FixEncryptedVersionTest 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:23:30 +00:00
Vincent Petry
3db068ecb3 Downstream encryption:fix-encrypted-version 
For fixing "Bad signature" errors.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:23:30 +00:00
Nextcloud bot
e76b83393c
[tx-robot] updated from transifex 2021-06-30 02:25:43 +00:00
blizzz
3ceb76ecf0
Merge pull request #27551 from nextcloud/backport/26571/stable21 
[stable21] Only allow removing existing shares that would not be allowed due to reshare restrictions
 2021-06-29 23:38:53 +02:00
Julius Härtl
c3e7687cd2
Handle single action unshare 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-06-29 19:09:22 +02:00
Julius Härtl
b7328fab42
Only allow removing existing shares that would not be allowed due to reshare restrictions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-06-29 19:09:22 +02:00
Julius Härtl
e981072f4a
When changing the share owner, downgrade permissions where needed 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-06-29 19:00:21 +02:00
Julius Härtl
fe2d3161f7
Drop share if moved to a parent share that does not allow resharing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-06-29 19:00:21 +02:00
Arthur Schiwon
2b1774dd91
21.0.3 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-29 12:59:36 +02:00
John Molakvoæ
b614af016a
Merge pull request #27703 from nextcloud/backport/27698/stable21 
[stable21] LDAP: determine shares of offline users only when needed
 2021-06-29 08:27:44 +02:00
Arthur Schiwon
de3aa22057
LDAP: determine shares of offline users only when needed 
- determine shares may via Sharing code result in user exists checks
- this may result in an infinite loop when user exists was called before
- the info is really only required at one occ command

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-28 23:57:29 +02:00
John Molakvoæ
c4a20d3d5d
Merge pull request #27679 from nextcloud/backport/27675/stable21 
[stable21] Validate the theming color also on CLI
 2021-06-28 07:43:09 +02:00
Nextcloud bot
6467112605
[tx-robot] updated from transifex 2021-06-28 02:25:22 +00:00
Nextcloud bot
77a2b03e50
[tx-robot] updated from transifex 2021-06-27 02:25:52 +00:00
Nextcloud bot
364d9c0ed6
[tx-robot] updated from transifex 2021-06-26 02:25:54 +00:00
Joas Schilling
36b9fad779 Validate the theming color also on CLI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-06-25 16:20:32 +00:00
Christoph Wurst
22d2f05841
Merge pull request #27670 from nextcloud/backport/27663/stable21 
[stable21] Unshift crash reports when they are loaded, to break the recusion
 2021-06-25 13:57:50 +02:00
Christoph Wurst
5dd3b5067c Unshift crash reports when they are loaded, to break the recusion 
If, for whatever reason, during the loading of a crash reporter a new
log entry is generated, then the lazy loading mechanism will be invoked
*again* while it's already executed. This doesn't result in an endless
recursion, but means that the crash reporters will be built and
registered many times. This then means any further log entry will be
logged x times instead of once.

Unshift makes sure to take the class off the registration list right
away, so another invokation of the same method won't try to do the same
job.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-25 06:37:07 +00:00
Nextcloud bot
4058c4c7db
[tx-robot] updated from transifex 2021-06-25 02:25:45 +00:00
John Molakvoæ
eeb052c48e
Merge pull request #27621 from nextcloud/version/21.0.3/rc1 2021-06-24 14:21:17 +02:00
Nextcloud bot
9d41426886
[tx-robot] updated from transifex 2021-06-24 02:25:33 +00:00
Arthur Schiwon
95298d4b3c
update CA bundle 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-24 01:32:21 +02:00
korelstar
c466d2ecd4
Merge pull request #27028 from nextcloud/backport/26852/stable21 
[stable21] fix error when using CORS with no auth credentials
 2021-06-24 00:05:12 +02:00
korelstar
7b8d4b2d37 fix error when using CORS with no auth credentials 2021-06-23 20:57:11 +02:00
Julius Härtl
6a40ed4765
Merge pull request #27622 from nextcloud/dependabot/npm_and_yarn/stable21/dompurify-2.2.9 
Bump dompurify from 2.2.8 to 2.2.9
 2021-06-23 19:33:12 +02:00
dependabot[bot]
1882b97935
Bump dompurify from 2.2.8 to 2.2.9 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.2.8 to 2.2.9.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.2.8...2.2.9)

---
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: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-06-23 18:09:27 +02:00
Lukas Reschke
82adb4c21e
Merge pull request #27616 from nextcloud/backport/27610/stable21 
[stable21] Throttle on public DAV endpoint
 2021-06-23 12:41:20 +02:00
Julius Härtl
a97c184423
Merge pull request #27237 from nextcloud/dependabot/npm_and_yarn/stable21/moment-timezone-0.5.33 
Bump moment-timezone from 0.5.32 to 0.5.33
 2021-06-23 10:57:22 +02:00
Julius Härtl
3ff79acd79
Merge pull request #27231 from nextcloud/dependabot/npm_and_yarn/stable21/vue-loader-15.9.7 
Bump vue-loader from 15.9.6 to 15.9.7
 2021-06-23 10:57:09 +02:00
Arthur Schiwon
df8885d939
21.0.3 RC1 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-23 10:51:24 +02:00
Lukas Reschke
ddcb70bd81 Reference correct private variable 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2021-06-23 07:37:17 +00:00
Lukas Reschke
117e466e20 Throttle on public DAV endpoint 
We should throttle whenever an invalid request is sent to the public WebDAV endpoint.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2021-06-23 07:37:17 +00:00
Nextcloud bot
f71306f8ee
[tx-robot] updated from transifex 2021-06-23 02:26:30 +00:00
dependabot[bot]
dad92ca15c Bump moment-timezone from 0.5.32 to 0.5.33 
Bumps [moment-timezone](https://github.com/moment/moment-timezone) from 0.5.32 to 0.5.33.
- [Release notes](https://github.com/moment/moment-timezone/releases)
- [Changelog](https://github.com/moment/moment-timezone/blob/develop/changelog.md)
- [Commits](https://github.com/moment/moment-timezone/compare/0.5.32...0.5.33)

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-06-22 18:58:40 +00:00
Julius Härtl
2931f31ac4
Merge pull request #27250 from nextcloud/dependabot/npm_and_yarn/stable21/ws-7.4.6 
[Security] Bump ws from 7.3.1 to 7.4.6
 2021-06-22 20:07:46 +02:00
blizzz
e6158eebf8
Merge pull request #27599 from nextcloud/backport/27596/stable21 
[stable21] [stable20] Properly cleanup entries of WebAuthn on user deletion
 2021-06-22 20:01:35 +02:00
Lukas Reschke
72309a158a Remove throwing annotation 
This class was just introduced in Nc 21.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2021-06-22 13:53:28 +00:00
Lukas Reschke
ba12eb7aba Use execute instead of executeStatement 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2021-06-22 13:53:28 +00:00
Morris Jobke
e757a5ecfd Properly cleanup entries of WebAuthn on user deletion 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-06-22 13:53:27 +00:00
Nextcloud bot
6069ea83e5
[tx-robot] updated from transifex 2021-06-22 02:27:12 +00:00
Nextcloud bot
030190ed07
[tx-robot] updated from transifex 2021-06-21 02:26:50 +00:00
Nextcloud bot
c7d7f9ca94
[tx-robot] updated from transifex 2021-06-20 02:27:16 +00:00