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

60095 commits

This branch
This branch
All branches
Author SHA1 Message Date
blizzz
d086fadb9e
Merge pull request #31188 from nextcloud/release/22.2.5 
22.2.5
 2022-02-15 14:51:33 +01:00
Arthur Schiwon
e02ad7c015
22.2.5 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-02-15 13:35:59 +01:00
Nextcloud bot
aedf679b82
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-15 02:45:36 +00:00
Nextcloud bot
ce5526d833
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-14 02:28:34 +00:00
Nextcloud bot
ac6a011557
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-13 02:27:09 +00:00
Nextcloud bot
79e82ff22c
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-12 02:28:09 +00:00
blizzz
5f94ee1d85
Merge pull request #31127 from nextcloud/release/22.2.5rc1 
22.2.5 RC 1
 2022-02-11 12:31:13 +01:00
Arthur Schiwon
ab10822b62
22.2.5 RC 1 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-02-11 11:47:17 +01:00
Vincent Petry
44300fcf28
Merge pull request #31114 from nextcloud/backport/31077/stable22 
[stable22] Revert the 'broken' public page changes
 2022-02-11 10:22:14 +01:00
Nextcloud bot
1336482df1
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-11 02:26:53 +00:00
szaimen
13e7efff90 Revert "Add non-breaking space in the file size" 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2022-02-10 21:38:30 +00:00
blizzz
6d3dfea43d
Merge pull request #31109 from nextcloud/backport/31107/stable22 
[stable22] Fix duplicated UUID migration issue
 2022-02-10 22:37:30 +01:00
Arthur Schiwon
64df0daa60
Setup warning for invalid LDAP user or group UUIDs. 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-02-10 20:12:37 +01:00
Côme Chilliet
a1d6678c25 Fix psalm errors in apps/user_ldap/lib/Jobs/CleanUp.php 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-02-10 18:48:33 +00:00
Côme Chilliet
ef11c61f19 Fix ldap:update-uuid 
Generators cannot be iterated with while or returned by an other
 generator, using foreach instead.
And a few other problems.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-02-10 18:48:33 +00:00
Arthur Schiwon
91578d0e5a add occ command to update UUIDs (incomplete) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-02-10 18:48:33 +00:00
Arthur Schiwon
0931853023 allow to re-run migration step when backup DB is already created 
- to heal incomplete states from broken upgrades

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-02-10 18:48:33 +00:00
Arthur Schiwon
ac68b0662a invalidated duplicated UUIDs prior to migration change 
- in a proper setup there are no duplicated UUIDs
- not all setups are proper
- log warning to admin

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-02-10 18:48:32 +00:00
Vincent Petry
b8ddca8119
Merge pull request #31013 from nextcloud/backport/30114/stable22 
[stable22] Prevent writing invalid mtime
 2022-02-10 10:02:17 +01:00
Nextcloud bot
bcbd42d56c
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-10 02:26:18 +00:00
Nextcloud bot
90b80a8d92
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-09 02:27:05 +00:00
Nextcloud bot
ce4e833de2
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-08 02:27:27 +00:00
Nextcloud bot
a0b80da378
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-07 02:26:55 +00:00
Nextcloud bot
79ffb97af4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-06 02:26:31 +00:00
Nextcloud bot
39da6a585a
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-05 02:26:42 +00:00
John Molakvoæ
41fe871111 Prevent writing invalid mtime 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-02-04 13:09:19 +00:00
Nextcloud bot
43932a9362
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-04 02:26:58 +00:00
Nextcloud bot
40b2a0f54d
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-03 02:27:07 +00:00
Vincent Petry
656b140452
Merge pull request #30976 from nextcloud/nickvergessen-patch-2 
Update version.php
 2022-02-02 15:45:42 +01:00
Joas Schilling
d886429952
Update version.php 2022-02-02 15:43:28 +01:00
Carl Schwan
464f996b85
Merge pull request #30971 from nextcloud/backport/stable22/office_preview 
Fix preview generation for office documents
 2022-02-02 15:30:34 +01:00
Jonas Meurer
418473be4b
Fix preview generation for office documents 
`new \imagick()` returns an object, but we need the image blob (binary
string) from this object.

This is a partial backport of #26531, which brings a lot of refactoring
but also contains the fix.

Fixes: #29956

Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2022-02-02 12:02:04 +01:00
Nextcloud bot
4ea9050328
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-02 02:27:21 +00:00
Nextcloud bot
059d1cd5f2
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-02-01 02:26:59 +00:00
John Molakvoæ
28cf331399
Merge pull request #30914 from nextcloud/fix/psalm-composer 2022-01-31 15:39:34 +01:00
blizzz
061069d305
Merge pull request #30930 from nextcloud/backport/30008/stable22 
[stable22] Cast orphan subscription id to int
 2022-01-31 13:51:41 +01:00
Christoph Wurst
9bd23752d1 Cast orphan subscription id to int 
DB columns are of type int by default, so they need to be casted.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2022-01-31 09:24:19 +00:00
Nextcloud bot
15795c8104
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-31 02:27:00 +00:00
Carl Schwan
e489c0c71a
Merge pull request #30910 from nextcloud/dependabot/npm_and_yarn/stable22/clipboard-2.0.9 
Bump clipboard from 2.0.8 to 2.0.9
 2022-01-30 09:50:15 +01:00
Nextcloud bot
c8726b82ec
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-30 02:26:54 +00:00
dependabot[bot]
88c53c7480 Bump clipboard from 2.0.8 to 2.0.9 
Bumps [clipboard](https://github.com/zenorocha/clipboard.js) from 2.0.8 to 2.0.9.
- [Release notes](https://github.com/zenorocha/clipboard.js/releases)
- [Commits](https://github.com/zenorocha/clipboard.js/compare/v2.0.8...v2.0.9)

---
updated-dependencies:
- dependency-name: clipboard
  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-01-29 11:40:12 +00:00
Carl Schwan
8330b18bfe
Fix psalm warning related to registerEventListener 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-29 11:47:53 +01:00
Nextcloud bot
0e68883c55
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-29 02:27:52 +00:00
Nextcloud bot
ea7474aeb8
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-01-28 02:27:21 +00:00
John Molakvoæ
fb5dbd8059
Merge pull request #30839 from nextcloud/releases/22.2.4 2022-01-27 20:53:49 +01:00
John Molakvoæ
c0b29720e1
Merge pull request #30826 from nextcloud/backport/stable22/psalm-fix 2022-01-27 20:05:54 +01:00
Carl Schwan
57514e44a9
Psalm fixing 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-27 17:20:48 +01:00
John Molakvoæ
d7e58015df
Merge pull request #30873 from nextcloud/backport/30844/stable22 2022-01-27 12:10:44 +01:00
John Molakvoæ
fa2ac9362e
Merge pull request #30741 from nextcloud/backport22 2022-01-27 09:26:53 +01:00
John Molakvoæ
56153ed19f Prevent merging on EOL branches 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-01-27 08:12:47 +00:00