Nicolas Werner
3c895ecd17
add missing license header
2023-02-24 02:55:56 +01:00
Nicolas Werner
aae3300860
Show rooms you share with someone
2023-02-24 02:40:14 +01:00
DeepBlueV7.X
4372742bc1
Merge pull request #1374 from Nheko-Reborn/private_images
...
Blur images properly
2023-02-23 18:03:13 +00:00
Loren Burkholder
5abd2df9b4
Fade in images when fully recieved
2023-02-22 20:25:45 -05:00
DeepBlueV7.X
532ab1a0a5
Merge pull request #1385 from Bubu/print_dialog_errors
...
print errors on failed dialog creation
2023-02-23 00:52:01 +00:00
Nicolas Werner
22ed465679
Merge branch 'v0.11.2-next'
2023-02-23 01:36:53 +01:00
Nicolas Werner
d27e42dec6
Hotfix redundant null terminator inserted by emoji completer
2023-02-23 00:50:45 +01:00
Marcus Hoffmann
7c08d88990
print errors on failed dialog creation
...
Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
2023-02-22 13:14:16 +01:00
Weblate
5d9895a38c
Translated using Weblate (Esperanto)
...
Currently translated at 99.6% (939 of 942 strings)
Co-authored-by: Tirifto <tirifto@posteo.cz>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/eo/
Translation: Nheko/nheko
2023-02-22 03:55:12 +00:00
Nicolas Werner
96f791daf1
Get rid of year in license headers
...
See also:
https://daniel.haxx.se/blog/2023/01/08/copyright-without-years/
https://hynek.me/til/copyright-years/
2023-02-21 23:48:49 +01:00
Nicolas Werner
1a6728fe47
Fix newlines in status messages
2023-02-21 23:35:52 +01:00
Nicolas Werner
5d7deca0db
Simplify status message in profile a bit
2023-02-21 23:25:49 +01:00
Marcus Hoffmann
7fe62aa4ca
UserProfile: add padding to device list
...
Add the same padding as is applied to long status messages.
Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
2023-02-21 14:29:14 +01:00
Marcus Hoffmann
4c328193ce
UserProfile: fix status message overflowing
...
Also style the "Status:" prefix bold.
2023-02-21 14:24:25 +01:00
Marcus Hoffmann
7c7a8d2d9a
UserProfile: reduce spacing by a bit
...
Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
2023-02-21 12:39:43 +01:00
Marcus Hoffmann
9635b248f8
UserProfile: display status message
...
Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
2023-02-21 12:39:43 +01:00
Marcus Hoffmann
9c5a7c4075
MessageView: Add ToolTip to status message
...
Show the user that this is a status text on hover.
We need to change the status text label width to be it's implicitWidth
(or the maximum width as specified before), otherwise the tooltip is
wildly off-centered.
Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
2023-02-21 12:39:43 +01:00
Marcus Hoffmann
6c37f219ba
MessageView: improve styling of presence status
...
Significantly reduce the font size as to visually indicate this is
additional information and not part of the username or message
text. Align the text with the username field besides it.
Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
2023-02-21 12:39:43 +01:00
Loren Burkholder
2b8cadaac8
Properly handle images without blurhashes
2023-02-20 19:59:06 -05:00
Loren Burkholder
179c16fd08
Use a single, reversible privacy screen transition
2023-02-20 19:18:05 -05:00
Loren Burkholder
c9e3ad1850
Animate transition to blurhash
2023-02-20 16:35:00 -05:00
Loren Burkholder
66d8a38c80
Blurhash images when the privacy screen is active
2023-02-20 16:35:00 -05:00
Weblate
38e259cc27
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (942 of 942 strings)
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (942 of 942 strings)
Co-authored-by: Estela ad Astra <i@estela.cn>
Co-authored-by: Poesty Li <poesty7450@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/zh_Hans/
Translation: Nheko/nheko
2023-02-20 03:40:01 +00:00
Weblate
58033d7bfc
Translated using Weblate (Ukrainian)
...
Currently translated at 42.5% (401 of 942 strings)
Co-authored-by: NullPointerException <kigen745@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/uk/
Translation: Nheko/nheko
2023-02-20 03:40:01 +00:00
Weblate
239c17d514
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (942 of 942 strings)
Co-authored-by: Linerly <linerly@protonmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/id/
Translation: Nheko/nheko
2023-02-20 03:40:01 +00:00
Nicolas Werner
7284b20643
Bump version
2023-02-20 02:34:29 +01:00
Nicolas Werner
920409e914
Reduce code bloat a bit
...
Especially the emoji array shrinks a lot with this, but adds a few extra
relocations on startup. But it removes a lot of exception handling code
at runtime, which is nice and possibly this is still faster.
2023-02-19 21:38:28 +01:00
Nicolas Werner
5457d67c98
Explicitly set parent for scrollbars to prevent them from showing on some platforms
2023-02-16 00:39:47 +01:00
Weblate
0e64ccca02
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (942 of 942 strings)
Co-authored-by: Priit Jõerüüt <nhkwlate@joeruut.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/et/
Translation: Nheko/nheko
2023-02-15 11:17:54 +00:00
Nicolas Werner
58f5ba5023
Make scrollbars optional and disabled by default
...
Also add them to the communities sidebar
2023-02-14 22:01:00 +01:00
Alexander Bantyev
ac19c6c92b
Room list: add scrollbar when not collapsed
2023-02-14 22:01:00 +01:00
DeepBlueV7.X
316eb07dbf
Merge pull request #1366 from Nheko-Reborn/uiTweaks
...
Focus text input when quick switcher is closed
2023-02-14 20:42:36 +01:00
Weblate
bbaa4b58d0
Translated using Weblate (German)
...
Currently translated at 100.0% (940 of 940 strings)
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/de/
Translation: Nheko/nheko
2023-02-14 19:31:04 +00:00
Nicolas Werner
c0fa7330a2
Update translations
2023-02-14 18:58:29 +01:00
Loren Burkholder
9297035ba8
Focus text input when quick switcher is closed
...
Fixes #1065
2023-02-14 12:58:28 -05:00
DeepBlueV7.X
009d1a8e2d
Merge pull request #1359 from Nheko-Reborn/encryption_delegate
...
Add a fancy delegate when encryption is enabled
2023-02-14 18:54:43 +01:00
Loren Burkholder
92d9539824
Update resources/qml/delegates/EncryptionEnabled.qml
...
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
2023-02-14 12:44:26 -05:00
DeepBlueV7.X
2a28b3a343
Merge pull request #1365 from Nheko-Reborn/video_improvements
...
Video player improvements
2023-02-14 18:25:23 +01:00
Weblate
b7b9b00c7f
Translated using Weblate (Ukrainian)
...
Currently translated at 40.4% (380 of 939 strings)
Co-authored-by: NullPointerException <kigen745@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/uk/
Translation: Nheko/nheko
2023-02-14 16:37:14 +00:00
Loren Burkholder
905b127a73
Add a generic video icon when there is no thumbnail
2023-02-14 09:16:00 -05:00
Loren Burkholder
1f8777178e
Limit max width of blurb
2023-02-13 20:46:53 -05:00
Loren Burkholder
707af2c11d
Update message
2023-02-13 20:46:53 -05:00
Loren Burkholder
902d4a7eb2
Add a fancy delegate when encryption is enabled
2023-02-13 20:46:53 -05:00
Weblate
ec9eb812f5
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (939 of 939 strings)
Co-authored-by: Linerly <linerly@protonmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/id/
Translation: Nheko/nheko
2023-02-13 13:18:39 +00:00
Weblate
e56c020f84
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (939 of 939 strings)
Co-authored-by: Priit Jõerüüt <nhkwlate@joeruut.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/et/
Translation: Nheko/nheko
2023-02-12 11:26:32 +00:00
Weblate
8e0db5e10e
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (939 of 939 strings)
Co-authored-by: Poesty Li <poesty7450@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/zh_Hans/
Translation: Nheko/nheko
2023-02-12 04:36:57 +00:00
Weblate
718965fa9b
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (939 of 939 strings)
Co-authored-by: Tirifto <tirifto@posteo.cz>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/eo/
Translation: Nheko/nheko
2023-02-12 04:36:57 +00:00
DeepBlueV7.X
dedc3cb1f8
Merge pull request #914 from Thulinma/imageOverlayRoleQml
...
Make ImageOverlay set appropriate windowRole again
2023-02-11 20:06:57 +00:00
Nicolas Werner
b2175d044f
Remove some commands from the translations
2023-02-11 12:34:26 +01:00
Weblate
0c8c1c24f0
Translated using Weblate (Finnish)
...
Currently translated at 95.6% (906 of 947 strings)
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fi/
Translation: Nheko/nheko
2023-02-11 11:33:52 +00:00
Weblate
74fe6d006c
Translated using Weblate (French)
...
Currently translated at 69.3% (657 of 947 strings)
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fr/
Translation: Nheko/nheko
2023-02-11 11:33:52 +00:00
Weblate
57c418d7e5
Translated using Weblate (French)
...
Currently translated at 69.1% (655 of 947 strings)
Translated using Weblate (French)
Currently translated at 69.1% (655 of 947 strings)
Co-authored-by: CB <chb0@lavache.com>
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fr/
Translation: Nheko/nheko
2023-02-11 11:27:21 +00:00
Weblate
5756cf299e
Translated using Weblate (French)
...
Currently translated at 68.2% (646 of 947 strings)
Translated using Weblate (French)
Currently translated at 68.2% (646 of 947 strings)
Co-authored-by: CB <chb0@lavache.com>
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fr/
Translation: Nheko/nheko
2023-02-11 11:21:01 +00:00
Weblate
e9ed96d522
Translated using Weblate (French)
...
Currently translated at 68.0% (644 of 947 strings)
Translated using Weblate (French)
Currently translated at 68.0% (644 of 947 strings)
Co-authored-by: CB <chb0@lavache.com>
Co-authored-by: Glandos <bugs-github@antipoul.fr>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fr/
Translation: Nheko/nheko
2023-02-11 11:20:06 +00:00
Nicolas Werner
3dc1802130
Update translations
2023-02-11 12:06:26 +01:00
phyto
4481b2518b
Standardise command format messages
2023-02-11 10:48:11 +01:00
Thulinma
7ffae002a5
Make ImageOverlay set appropriate windowRole again
2023-02-10 18:01:47 +01:00
Weblate
5483c35452
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (947 of 947 strings)
Co-authored-by: Priit Jõerüüt <nhkwlate@joeruut.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/et/
Translation: Nheko/nheko
2023-02-10 16:03:59 +00:00
Weblate
17127a08ac
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (947 of 947 strings)
Co-authored-by: Jaron Viëtor <jaron@v8or.nl>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/nl/
Translation: Nheko/nheko
2023-02-10 16:03:58 +00:00
Weblate
e16048fc10
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (947 of 947 strings)
Co-authored-by: Tirifto <tirifto@posteo.cz>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/eo/
Translation: Nheko/nheko
2023-02-10 16:03:58 +00:00
Weblate
1cac7fed0b
Translated using Weblate (Italian)
...
Currently translated at 20.0% (188 of 940 strings)
Translated using Weblate (Italian)
Currently translated at 20.0% (188 of 940 strings)
Translated using Weblate (Italian)
Currently translated at 20.0% (188 of 940 strings)
Translated using Weblate (Italian)
Currently translated at 20.0% (188 of 940 strings)
Co-authored-by: DynamoFox <magnacacuti@gmail.com>
Co-authored-by: Elia Tomasi <elia.tomasi@pm.me>
Co-authored-by: Joseph Curto <joe@joe.vr.it>
Co-authored-by: Quanterxotur <ganno.lexis.ag@mailbox.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/it/
Translation: Nheko/nheko
2023-02-10 16:03:58 +00:00
Weblate
160f740fbc
Translated using Weblate (Indonesian)
...
Currently translated at 99.8% (946 of 947 strings)
Co-authored-by: Linerly <linerly@protonmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/id/
Translation: Nheko/nheko
2023-02-10 16:03:58 +00:00
Nicolas Werner
a0fe13127d
Update translations
2023-02-08 22:45:09 +01:00
Joseph Donofry
720e7fceec
Fix empty list freeze in Completer
2023-02-08 14:19:35 -05:00
Nicolas Werner
ad4ea02547
Add a reduced motion option
...
fixes #1350
2023-02-06 13:56:23 +01:00
q234rty
fa3ea18dcd
Fix some leftover menus from #1319
2023-02-01 02:34:26 +08:00
Malte E
5ed3bfc8f8
add user search to invite dialog ( #1253 )
2023-01-31 16:59:49 +00:00
DeepBlueV7.X
3abb49c4a2
Merge pull request #1319 from Decodetalkers/menuhideonwayland
...
feat: hide all popup menus when press leftbutton on somewhere else
2023-01-28 12:15:54 +01:00
Weblate
7c8bb14f22
Translated using Weblate (Ukrainian)
...
Currently translated at 33.6% (316 of 940 strings)
Co-authored-by: NullPointerException <kigen745@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/uk/
Translation: Nheko/nheko
2023-01-27 18:36:42 +00:00
Weblate
13163699bc
Translated using Weblate (Ukrainian)
...
Currently translated at 28.1% (265 of 940 strings)
Co-authored-by: NullPointerException <kigen745@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/uk/
Translation: Nheko/nheko
2023-01-27 17:46:31 +00:00
Weblate
0e4c0c4949
Translated using Weblate (Ukrainian)
...
Currently translated at 28.0% (264 of 940 strings)
Co-authored-by: NullPointerException <kigen745@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/uk/
Translation: Nheko/nheko
2023-01-27 17:35:51 +00:00
Weblate
181ea3850e
Translated using Weblate (Ukrainian)
...
Currently translated at 27.2% (256 of 940 strings)
Co-authored-by: Priit Jõerüüt <nhkwlate@joeruut.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/uk/
Translation: Nheko/nheko
2023-01-27 15:28:30 +00:00
Weblate
edba6ad91f
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (940 of 940 strings)
Co-authored-by: Priit Jõerüüt <nhkwlate@joeruut.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/et/
Translation: Nheko/nheko
2023-01-27 15:28:30 +00:00
Weblate
68bf9c0bfa
Translated using Weblate (French)
...
Currently translated at 68.5% (644 of 940 strings)
Translated using Weblate (French)
Currently translated at 68.5% (644 of 940 strings)
Co-authored-by: CB <chb0@lavache.com>
Co-authored-by: Rick M. G <rick@gnous.eu>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fr/
Translation: Nheko/nheko
2023-01-24 19:22:10 +00:00
ShootingStarDragons
7d95ac23ce
feat: hide all popup menus when press leftbutton on somewhere else
...
Log: according to the bug on https://bugreports.qt.io/browse/QTBUG-83972 , The menu will always stay if not click one of the item. So I try to make a hack for it, wait qt solve it someday
2023-01-23 20:15:43 +08:00
tastytea
b17cc41645
update Zsh completion
...
- add new command line switches
- prevent duplication in argument descriptions
- load helper function before using it (fixes error with Zsh 5.9)
2023-01-22 23:22:01 +01:00
Nicolas Werner
15d7a2f021
Make code tags preserve whitespace
2023-01-22 17:36:23 +01:00
DeepBlueV7.X
2157ebb614
Merge pull request #1304 from Decodetalkers/imagesave
...
chore: when save file, hide ImageOverlay window
2023-01-22 00:54:44 +01:00
Nicolas Werner
47da48f6f2
Fix creating DMs from pasting an mxid
2023-01-21 21:02:46 +01:00
ShootingStarDragons
abe4f8eb3c
chore: when save file, hide ImageOverlay window
...
Log: on wm like sway, it will cover the whole screen, and I cannot get
the file save dialog, then the program will stay there, I must kill it,
so I think hide it is better, because after, it will be closed
2023-01-20 22:10:22 +08:00
Weblate
b4c0581948
Translated using Weblate (Russian)
...
Currently translated at 32.9% (310 of 940 strings)
Translated using Weblate (Russian)
Currently translated at 32.9% (310 of 940 strings)
Co-authored-by: Evgeny <mister.lameni@yandex.ru>
Co-authored-by: SOT-TECH <sblazhko@sot-te.ch>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/ru/
Translation: Nheko/nheko
2023-01-20 10:59:42 +00:00
Weblate
b1439ac8ae
Translated using Weblate (Finnish)
...
Currently translated at 96.4% (907 of 940 strings)
Co-authored-by: Lurkki14 <jussi.kuokkanen@protonmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fi/
Translation: Nheko/nheko
2023-01-20 10:59:42 +00:00
Weblate
24f09ed426
Translated using Weblate (Estonian)
...
Currently translated at 97.7% (919 of 940 strings)
Co-authored-by: Priit Jõerüüt <nhkwlate@joeruut.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/et/
Translation: Nheko/nheko
2023-01-20 10:59:42 +00:00
Nicolas Werner
c98231bac1
Make it more obvious that the add reaction button is not an emoji
...
fixes #1301
2023-01-19 06:51:51 +01:00
Nicolas Werner
33e9c80c1b
Fix html in sidebar again
2023-01-18 19:20:32 +01:00
Joseph Donofry
c13a9d3b16
v0.11.1
2023-01-15 18:55:32 -05:00
Weblate
cec9584f80
Translated using Weblate (Finnish)
...
Currently translated at 94.2% (886 of 940 strings)
Co-authored-by: Lurkki14 <jussi.kuokkanen@protonmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fi/
Translation: Nheko/nheko
2023-01-14 21:19:20 +00:00
Weblate
d45a084ffb
Translated using Weblate (Portuguese (Portugal))
...
Currently translated at 48.9% (460 of 940 strings)
Co-authored-by: Tmpod <tmpod@pm.me>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/pt_PT/
Translation: Nheko/nheko
2023-01-14 21:19:20 +00:00
Joseph Donofry
8835040db6
Pause ParticleEmitter when not in use ( #1284 )
...
* Pause ParticleEmitter when not in use
* Use timer instead to pause particle system
2023-01-14 02:23:07 +01:00
Weblate
e25fd5f4fc
Translated using Weblate (Japanese)
...
Currently translated at 9.3% (88 of 940 strings)
Translated using Weblate (Japanese)
Currently translated at 9.3% (88 of 940 strings)
Co-authored-by: kyoberry <kyo@tilde.pink>
Co-authored-by: srr24x7 <sven.r.richter@protonmail.ch>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/ja/
Translation: Nheko/nheko
2023-01-13 16:45:44 +00:00
Weblate
05e06f84ec
Translated using Weblate (German)
...
Currently translated at 100.0% (940 of 940 strings)
Co-authored-by: 123 <fof300f@posteo.net>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/de/
Translation: Nheko/nheko
2023-01-13 16:45:44 +00:00
Weblate
698030be62
Translated using Weblate (Finnish)
...
Currently translated at 94.1% (885 of 940 strings)
Co-authored-by: Lurkki14 <jussi.kuokkanen@protonmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/fi/
Translation: Nheko/nheko
2023-01-13 16:45:44 +00:00
Nicolas Werner
3507698ea5
v0.11.0
2023-01-12 22:06:30 +01:00
Nicolas Werner
0c6a2fb706
Fix white bar above sticker picker
2023-01-12 22:06:30 +01:00
Weblate
c38c4b47c8
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (940 of 940 strings)
Co-authored-by: Tirifto <tirifto@posteo.cz>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/eo/
Translation: Nheko/nheko
2023-01-12 19:27:06 +00:00
Nicolas Werner
239cfd6735
Fix weirdly big spinner
2023-01-12 20:26:35 +01:00
Nicolas Werner
9b8eb0a412
Fix white bar above emoji picker
2023-01-12 20:13:08 +01:00
Nicolas Werner
2345faf630
Try to fix binding loop in emoji picker
2023-01-12 07:34:17 +01:00
Weblate
067fb67a8e
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (940 of 940 strings)
Co-authored-by: ling <xll520yzl@gmail.com>
Translate-URL: https://weblate.nheko.im/projects/nheko/nheko-master/zh_Hans/
Translation: Nheko/nheko
2023-01-12 04:02:50 +00:00
Joseph Donofry
a90b46026b
Update translations from weblate, fix conflicts
2023-01-10 00:32:56 -05:00