upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26
65851 commits 882 branches 1195 tags 7.2 GiB
Commit graph

65851 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
aaf759bbb0
Fix(l10n): 🔠 Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-01-19 02:27:03 +00:00
Simon L
752f3a39f9
Merge pull request #36225 from Jachhj-sc/patch-1 
Add check config.php for ffmpeg_path in PreviewManager.php. fix for snap no video preview
 2023-01-18 22:14:22 +01:00
Anna
444f11b857
Merge pull request #36211 from nextcloud/enh/catch-recurrence-exception 
fix(dav): catch MaxInstancesExceededException for recurring events without end date
 2023-01-18 21:39:15 +01:00
William
fa12219629
Update lib/private/PreviewManager.php 
fix lint issue

Co-authored-by: Simon L. <szaimen@e.mail.de>
Signed-off-by: William <william.hak57@gmail.com>
 2023-01-18 20:32:09 +01:00
William
81ec99ae33
Update config/config.sample.php 
add better description

Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: William <william.hak57@gmail.com>
 2023-01-18 20:13:34 +01:00
Joas Schilling
950b71c6ae
Merge pull request #36219 from nextcloud/fix/correction-35886-Replace_custom_tooltips_with_native_one_for_personal_and_administration_settings 
Correct title for button on federation actions button
 2023-01-18 20:05:36 +01:00
Simon L
06a572ff55
Merge pull request #27492 from cyclops8456/feature/24301-remove-can-install-on-occ-maintenance-install 
Remove the CAN_INSTALL file when occ maintenance:install is complete
 2023-01-18 19:53:02 +01:00
William
138814f964
Merge pull request #1 from Jachhj-sc/patch-2 
add documentation preview_ffmpeg_path
 2023-01-18 19:35:52 +01:00
William
57a3a17db7
Merge branch 'nextcloud:master' into patch-1 2023-01-18 19:31:39 +01:00
William
2c4afdcdd1
add documentation preview_ffmpeg_path 
add preview_ffmpeg_path documentation.
document custom path for ffmpeg so it can be used by the previewprovider to create video previews with the snap package of nextcloud.

Signed-off-by: William <william.hak57@gmail.com>
 2023-01-18 19:26:48 +01:00
Joas Schilling
c5a01695d1
Merge pull request #36205 from nextcloud/bugfix/noid/fix-settings-section-icon-color 
fix(search): Fix settings section icon color
 2023-01-18 19:13:10 +01:00
John Molakvoæ
cd72bef78b
Merge pull request #36221 from nextcloud/artonge/feat/cypress_git_branch 
Use current git branch by default when setting up cypress container
 2023-01-18 19:01:58 +01:00
Louis Chemineau
535c228d57 Use current git branch by default when setting up cypress container 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2023-01-18 17:17:06 +01:00
Christoph Wurst
46dcbd3b77
Merge pull request #35783 from nextcloud/feat/inject-controller-services-into-methods 
Inject services into controller methods
 2023-01-18 17:00:54 +01:00
William
1409a7cc92
Update PreviewManager.php 
add a check in config.php for a configured movieBinary path.
so now it first checks in config.php if  preview_ffmpeg_path is configured.

Signed-off-by: William <william.hak57@gmail.com>
 2023-01-18 16:30:41 +01:00
julia.kirschenheuter
6d13916a5f Correct title for button on federation actions button 
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
 2023-01-18 15:45:07 +01:00
Anna Larch
a9264b007f fix(dav): catch MaxInstancesExceedeException for recurring events without end date 
Ref https://github.com/nextcloud/calendar/issues/4811

Signed-off-by: Anna Larch <anna@nextcloud.com>
 2023-01-18 15:40:36 +01:00
Christoph Wurst
20fcfb5739
feat(app framework)!: Inject services into controller methods 
Usually Nextcloud DI goes through constructor injection. This has the
implication that each instance of a class builds the full DI tree. That
is the injected services, their services, etc. Occasionally there is a
service that is only needed for one controller method. Then the DI tree
is build regardless if used or not.

If services are injected into the method, we only build the DI tree if
that method gets executed.

This is also how Laravel allows injection.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2023-01-18 14:00:38 +01:00
Christoph Wurst
9e08e49998
Merge pull request #35419 from nextcloud/fix/login-csrf-not-logged-in-clear-cookies 
Fix login loop if login CSRF fails and user is not logged in
 2023-01-18 11:55:24 +01:00
Daniel
dfa1a7b33b
Merge pull request #36204 from nextcloud/automated/noid/master-update-psalm-baseline 
[master] Update psalm-baseline.xml
 2023-01-18 11:32:22 +01:00
Christoph Wurst
f22101d421
Fix login loop if login CSRF fails and user is not logged in 
If CSRF fails but the user is logged in that they probably logged in in
another tab. This is fine. We can just redirect.
If CSRF fails and the user is also not logged in then something is
fishy. E.g. because Nextcloud contantly regenrates the session and the
CSRF token and the user is stuck in an endless login loop.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2023-01-18 09:39:17 +01:00
Joas Schilling
c35d82aece
Merge pull request #36198 from nextcloud/3rdparty-remove-ds 
chore: drop dependency php-ds
 2023-01-18 09:37:37 +01:00
John Molakvoæ
1a0f9b57be
Merge pull request #36002 from nextcloud/feat/files2vue-quota 
feat(files): Quota in navigation
 2023-01-18 08:05:04 +01:00
Joas Schilling
ab8b54f2f6
fix(search): Fix settings section icon color 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2023-01-18 07:18:42 +01:00
Joas Schilling
de5fb80478
chore: drop dependency php-ds 
The dependency is not used.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2023-01-18 07:14:34 +01:00
Joas Schilling
634f5a17d9
Merge pull request #36194 from nextcloud/revert/35071 
Fix failed revert for #35071
 2023-01-18 07:01:05 +01:00
nextcloud-command
0d48e3c98c Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2023-01-18 04:45:48 +00:00
Nextcloud bot
4dc3f4dcac
Fix(l10n): 🔠 Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-01-18 02:25:23 +00:00
Joas Schilling
184d57c843
Merge pull request #36190 from nextcloud/3rdparty-guzzle 
chore(3rdparty): Bump guzzlehttp/guzzle from 7.2.0 to 7.5.0 and egulias/email-validator from 3.2.1 to 3.2.5
 2023-01-17 21:55:09 +01:00
John Molakvoæ
b9906fb21e
feat(files): Quota in navigation 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2023-01-17 18:30:41 +01:00
Christoph Wurst
312f19d6a4
Merge pull request #36166 from nextcloud/fix/php82/declare-symfony-console-application-property 
fix(PHP8.2): Declare Symfony Application property in console application
 2023-01-17 18:25:56 +01:00
John Molakvoæ
61446933e0
Fix failed revert for #35071 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2023-01-17 14:21:11 +01:00
John Molakvoæ
9af7ee8d11
Revert "Add alt to the logo, adapt css for logo" 
This reverts commit bba5ab0532.
 2023-01-17 14:19:23 +01:00
John Molakvoæ
6e53aacd86
chore(3rdparty): Bump guzzlehttp/guzzle from 7.2.0 to 7.5.0 and 
egulias/email-validator from 3.2.1 to 3.2.5

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2023-01-17 11:33:30 +01:00
Nextcloud bot
7ab34eefc5
Fix(l10n): 🔠 Update translations from Transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2023-01-17 02:26:53 +00:00
Joas Schilling
614e3e2969
Merge pull request #36094 from nextcloud/bugfix/noid/user-info-api-exclude-storage 
Only expose storage location to admins
 2023-01-16 22:27:37 +01:00
Joas Schilling
7f81ce5547
Merge pull request #36093 from nextcloud/techdebt/noid/improve-share-pw-generation 
Improve password generation for link shares
 2023-01-16 22:26:42 +01:00
Vincent Petry
018a597d9b
Merge pull request #36161 from nextcloud/bugfix/36153/fix-sharemount-cache-key-include-target 
still include the share target in the cache key for validating share mount
 2023-01-16 15:25:12 +01:00
Vincent Petry
bfcb2690a4
Merge pull request #36087 from nextcloud/enh/noid/improve-applicable-ext-storage 
Improve saving applicable users in ext storage
 2023-01-16 15:08:19 +01:00
Christoph Wurst
e2f4110a3f
fix(PHP8.2): Declare Symfony Application property in console application 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2023-01-16 14:55:16 +01:00
Vincent Petry
e9f7ea11bb
Improve password generation for link shares 
Use web crypto when generating password for link shares
whenever the password policy app is disabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2023-01-16 14:35:08 +01:00
Vincent Petry
f0b9b6ebaa
Merge pull request #36089 from nextcloud/enh/noid/ext-storage-default-values 
Ext storage configs default value support + enable SSL by default
 2023-01-16 14:22:16 +01:00
Vincent Petry
60eac3fec5
Merge pull request #36113 from nextcloud/bugfix/noid/viewonly-versions 
Extend ViewOnly DAV plugin to versions endpoint
 2023-01-16 14:09:55 +01:00
Julius Härtl
8557c61389
Merge pull request #35970 from nextcloud/perf/noid/exception-serializer 2023-01-16 14:00:57 +01:00
Robin Appelman
c105b6a85d
still include the share target in the cache key for validating share mount 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2023-01-16 13:09:50 +01:00
Côme Chilliet
052f09633b
Merge pull request #36115 from nextcloud/fix/catch-exception-in-provisioning_api 
Catch Exceptions when loading storage data of users
 2023-01-16 11:40:51 +01:00
blizzz
dbfe7b1816
Merge pull request #36073 from nextcloud/fix/fix-background-job-list 
Use a Generator for job list to fix background-job:list command
 2023-01-16 11:10:10 +01:00
Julius Härtl
cf1bd0eb70
chore: Add typings to Log properties 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2023-01-16 09:47:31 +01:00
Julius Härtl
7daa20d309
fix(ExceptionSerializer): encode arguments before filtering the trace 
This will avoid running into a Nesting level too deep error as the
encodeArg calls will limit potential recursive calls on the arguments to
a nesting level of 5

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2023-01-16 09:47:31 +01:00
Julius Härtl
00b7575c89
perf(logging): Return early when log level does not match before serializing an exception 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2023-01-16 09:47:31 +01:00