5ae8f6326c
Do not auto merge package-lock.json, but treat as text file
...
If package-lock is specified to be a binary file, it becomes impossible
to diff any changes. Since we only want to prevent git from merging
changes in the lockfile, we can be more specific and tell it that binary
handling is only required as merge strategy.
[skip ci]
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2022-11-17 12:32:03 +01:00
f021172eab
Merge pull request #35203 from nextcloud/jpeg-80
...
Default Jpeg quality to 80
2022-11-17 08:41:34 +01:00
d27a39271e
getAppValue expects string
...
Co-authored-by: Pytal <24800714+Pytal@users.noreply.github.com>
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
2022-11-17 08:03:05 +01:00
d0f9eab647
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-17 02:14:28 +00:00
3aa16d60d5
Merge pull request #35207 from nextcloud/fix/date-picker
...
Fix sharing expiration date handling and saving
2022-11-16 19:06:30 +01:00
2b4ce7b95d
Fix date handling and saving
...
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2022-11-16 17:19:58 +01:00
3d77e386cd
Merge pull request #34615 from nextcloud/enh/noid/logo-inverted
...
fix logo not correctly inverted
2022-11-16 15:54:06 +01:00
e3822e1160
Merge pull request #35184 from nextcloud/s3-copy-dir-shadow
...
fix s3 directory copy
2022-11-16 15:41:19 +01:00
7e36002a93
Merge pull request #35210 from nextcloud/bugfix/noid/fix-settings-set-default-expiration-date
...
Fix settings for setting default expiration date
2022-11-16 15:38:02 +01:00
b62d3c4f39
Merge pull request #35192 from pserwylo/fix-performance-github-action
...
Fix github action "performance-8.0" when PR is from a fork.
2022-11-16 15:05:08 +01:00
56aee55f9b
Fix github action "performance-8.0" when PR is from a fork.
...
There is an assumption that the PR is from the same remote as
the base it is being merged into. This is fixed so that instead
of doing a `git fetch origin`, it now fetches from the `clone_url`
of the PR head.
Signed-off-by: Peter Serwylo <peter@serwylo.com>
2022-11-16 23:50:40 +11:00
2853e0887c
Fix settings for setting default expiration date
...
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2022-11-16 13:02:31 +01:00
0f3150cff7
Tests adjustement
...
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
2022-11-16 11:01:32 +01:00
c7e2787300
Default Jpeg quality to 80
...
See https://sirv.com/help/articles/jpeg-quality-comparison/
Almost 50% of file size (compared to 90) and no visual differences.
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
2022-11-16 10:59:50 +01:00
e6b7fa6cae
Fix logo invert
...
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2022-11-16 09:46:20 +01:00
62919ac81e
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-16 02:14:42 +00:00
f559792bf3
Merge pull request #35033 from nextcloud/enh/34732/fix-dashboard-scrolling
...
fix dashboard scrolling
2022-11-16 02:06:21 +01:00
fe15069c90
Merge pull request #35029 from nextcloud/enh/34969/fix-app-menu-firefox
...
Fix AppMenu icons for firefox
2022-11-16 02:05:58 +01:00
968a4110b8
Merge pull request #35179 from nextcloud/dependaskjnldsv/nextcloud-vue
...
Bump @nextcloud/vue to 7.1.0-beta0
2022-11-15 11:13:00 -08:00
d78fa59f37
Fix CalDavSettings spec
...
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2022-11-15 19:06:40 +01:00
7cc6f63e57
Bump @nextcloud/vue to 7.1.0-beta0
...
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2022-11-15 18:51:28 +01:00
b209a650cc
Merge pull request #35181 from nextcloud/fix/test-php-8.2-2
...
Fix more tests for PHP 8.2
2022-11-15 18:09:52 +01:00
ed8fedc685
fix s3 directory copy
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2022-11-15 17:17:59 +01:00
38440563dd
Fix themings tests and get rid of deprecated at matcher
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-15 16:29:26 +01:00
102617f0b3
Merge pull request #35147 from nextcloud/fix/fix-33741-h1_should_instead_be_in_the_app_content
...
Place ```<h1>``` into main content
2022-11-15 16:14:29 +01:00
68363f6944
Fix some more problems with tests under PHP 8.2
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-15 16:02:24 +01:00
c3d0b71f2f
Merge pull request #33631 from nextcloud/enh/noid/mariadb10.6-master
...
use the updated mariadb10.6 container in drone
2022-11-15 13:26:25 +01:00
4893d5e746
Merge pull request #35156 from nextcloud/fix/fix-tests-for-8.2
...
Fix dynamic properties and other problems in tests for PHP 8.2
2022-11-15 13:04:51 +01:00
a8ff2ff0b0
Place ```<h1>``` into main content
...
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
2022-11-15 10:50:33 +00:00
a577625767
Merge pull request #35173 from nextcloud/test/34976/received-share-in-shared-folders
...
Add test for received share in share_folder
2022-11-15 11:49:22 +01:00
72f4b34ad5
Fix tests depending on a trailing whitespace
...
Many editors remove trailing whitespaces, so avoid depending on them for
tests success.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-15 10:31:58 +01:00
486d8bc986
Add test for received share in share_folder
...
Add integration test for receiving a share in a configured
"share_folder".
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2022-11-15 09:57:44 +01:00
324126888e
Add Union types for properties in tests/lib/Encryption/Keys/StorageTest.php
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-15 09:29:35 +01:00
baf74f0aa1
Merge pull request #35014 from nextcloud/fix/login-headline
...
Fix rendering of login headline
2022-11-15 09:29:32 +01:00
0f7e56b3b3
Fix syntax in VerificationTokenTest.php
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-15 09:25:56 +01:00
ccb30e7825
Merge pull request #35091 from nextcloud/enh/a11y-single-char-search
...
Allow single character search by default
2022-11-14 19:59:38 -08:00
ad446daae0
[tx-robot] updated from transifex
...
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-15 02:15:30 +00:00
73c5591f68
Merge pull request #35024 from nextcloud/deprecate/php74
...
Deprecate PHP7.4
2022-11-14 20:35:54 +01:00
6d8774a232
Merge pull request #35157 from nextcloud/fix/avoid-passing-null-to-datetime-createfromformat
...
Make sure to not pass null to DateTime::createFromFormat
2022-11-14 19:33:16 +01:00
6bd55b73ea
Merge pull request #35075 from nextcloud/docs/remove_redis_sentinel_reference
...
Remove reference to Redis sentinel from configuration docs
2022-11-14 18:48:35 +01:00
c79a6b3f62
Fix errors from PHP 8.2 testing
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-14 17:08:21 +01:00
9ba9f9a7dc
Make sure to not pass null to DateTime::createFromFormat
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-14 16:23:50 +01:00
70e2217d1c
Fix dynamic properties and other problems in tests for PHP 8.2
...
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2022-11-14 16:14:35 +01:00
ea377578ad
Merge pull request #35139 from nextcloud/revert-35015-patch-1
...
Revert "Appropriate length check in Notification.php"
2022-11-14 12:49:44 +01:00
08c19c6b04
Merge pull request #35142 from nextcloud/nickvergessen-patch-1
...
Update CODEOWNERS
2022-11-14 11:24:53 +01:00
4811aabdc6
Update CODEOWNERS
...
Signed-off-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
2022-11-14 11:18:11 +01:00
6ea4ef9521
Revert "Appropriate length check in Notification.php"
2022-11-14 11:14:13 +01:00
81ea283752
Merge pull request #35043 from nextcloud/updateCrl
...
Update crl after revoke drawio.csr
2022-11-14 11:00:30 +01:00
f1b940bc78
Merge pull request #34645 from nextcloud/bugfix/support-to-postgres15
...
🐘 Support postgres15
2022-11-14 10:02:38 +01:00
4bf1f4e484
Merge pull request #35093 from nextcloud/nickvergessen-patch-1
...
Run integration tests on 3rdparty bump
2022-11-14 09:45:55 +01:00
Christoph Wurst
John Molakvoæ
Nextcloud bot
John Molakvoæ
Simon L
blizzz
Robin Appelman
Julius Härtl
Peter Serwylo
Vincent Petry
Git'Fellow
Pytal
Côme Chilliet
Côme Chilliet
Christoph Wurst
julia.kirschenheuter
Joas Schilling