d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-29 14:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2227 commits 62 branches 46 tags 31 MiB
Commit graph

1399 commits

Author SHA1 Message Date
Nicolas Werner
4b36585e47 Fix typo in encryption error message 2020-09-19 15:45:23 +02:00
DeepBlueV7.X
791a01487b
Merge pull request #286 from trilene/voip 
Adapt device monitoring for GStreamer 1.18
 2020-09-17 23:27:25 +02:00
trilene
e065bf2205 Remove GStreamer version test 2020-09-17 16:50:13 -04:00
trilene
f7beb1b34e clang-format 2020-09-17 15:57:47 -04:00
trilene
8d7c70d912 Fix preprocessor directive 2020-09-17 15:17:06 -04:00
trilene
b527c5a21c Adapt device monitoring for GStreamer 1.18 2020-09-17 11:37:30 -04:00
DeepBlueV7.X
c62db00e6f
Merge pull request #284 from Nheko-Reborn/hidden-events 
Hidden events backend
 2020-09-17 07:36:37 +02:00
Nicolas Werner
c5f93efcd3 Actually use room account data 2020-09-16 23:49:17 +02:00
Nicolas Werner
8af056faa9 Fix avatars in notifications 2020-09-16 23:49:17 +02:00
Nicolas Werner
fef0cc2d71 Fix some images not showing up 2020-09-16 23:49:17 +02:00
Nicolas Werner
b05c101021 Fix null errors in qml 2020-09-16 23:49:17 +02:00
Nicolas Werner
77e241b9e5 Reenable top bar room settings menus on avatar or title clicks 
Also fixes a bug with an empty room settings window introduced in the
port.
 2020-09-16 23:49:17 +02:00
Nicolas Werner
640b0ee405 Port top bar to Qml 
Also fixes some resize issues with stupid workarounds to our resize
logic. This really needs to be cleaned up at some point!
 2020-09-16 23:49:17 +02:00
DeepBlueV7.X
66d6307252
Merge pull request #283 from trilene/voip 
Remove bus watch when call ends
 2020-09-16 21:06:57 +02:00
trilene
2526a5604e Remove bus watch when call ends 2020-09-16 07:29:26 -04:00
DeepBlueV7.X
d02e899941
Merge pull request #281 from trilene/voip 
Don't show default audio source in settings
 2020-09-14 22:57:14 +02:00
trilene
bd0e66b548 Don't show default audio source in settings 2020-09-14 15:55:43 -04:00
CH Chethan Reddy
8eb74daf76 Split qml part of Device Verification 2020-09-14 17:27:49 +05:30
DeepBlueV7.X
a7b979084f
Merge pull request #280 from trilene/voip 
Ignore empty remote ICE candidates
 2020-09-13 16:37:41 +02:00
trilene
124952a11c Ignore empty remote ICE candidates 2020-09-13 10:21:29 -04:00
Jussi Kuokkanen
bfcfa79d53 reset filter string when emoji completer is opened 2020-09-13 13:31:02 +03:00
DeepBlueV7.X
b37534aa53
Merge pull request #278 from trilene/voip 
Fix earlier commit + GStreamer v1.18 released
 2020-09-10 21:33:05 +02:00
trilene
b6563d9ffe GStreamer v1.18.0 released 2020-09-10 14:34:10 -04:00
trilene
7d2844b2b0 Fix earlier commit when GStreamer < v1.17 2020-09-10 14:29:25 -04:00
Chethan2k1
2b5deabbdc Fix breaking while using qmlRegisterSingletonInstance 2020-09-10 14:50:10 +05:30
Chethan2k1
a27662dc08 Making sure Verification Objects are deleted properly 2020-09-10 13:25:49 +05:30
Chethan2k1
898be090af Add support non-encrypted room-verification messages 2020-09-10 11:08:39 +05:30
Nicolas Werner
c4e4938d35 Save account data and allow hiding events via account data 2020-09-08 16:21:55 +02:00
Chethan2k1
e8eeb480d5 Fix Wrong Emojis Issue in Room Verification 2020-09-04 12:02:24 +05:30
DeepBlueV7.X
657f4073e9
Merge branch 'master' into device-verification 2020-09-03 18:11:17 +00:00
CH Chethan Reddy
5358854de3 Add support for Encrypted to-device verification messages 2020-09-03 09:37:16 +05:30
Nicolas Werner
10f09d4f43 Fix catch by value warning 2020-09-03 09:37:16 +05:30
Nicolas Werner
8d14a058c6 Fix endless pagination, when old history is inaccessible 2020-09-02 19:38:07 +02:00
Jussi Kuokkanen
8f872f1961 remove unused includes and use QRegularExpression 2020-08-31 18:24:03 +03:00
Jussi Kuokkanen
bb4636885d remove comment 2020-08-31 18:07:29 +03:00
Jussi Kuokkanen
beec2607fc get completion string based on trigger position instead of current word 2020-08-31 18:04:59 +03:00
Jussi Kuokkanen
254b7549eb ignore enter keypress when completion is selected 2020-08-31 12:21:47 +03:00
CH Chethan Reddy
f03a48eec5 fix 2020-08-30 22:36:53 +05:30
CH Chethan Reddy
b174bd9380 Merge remote-tracking branch 'upstream/master' into device-verification 2020-08-30 22:27:14 +05:30
CH Chethan Reddy
9a76db85d5 Change ReactionRealtesTo to RelatesTo 2020-08-30 16:32:28 +05:30
Jussi Kuokkanen
aed8d23aca don't select emoji completion by default and add minimum string length before showing completions 2020-08-29 23:05:40 +03:00
CH Chethan Reddy
0d1dd29b19 Small Fixes 2020-08-29 13:37:51 +05:30
Jussi Kuokkanen
9ad9c8ddf0 fix build and remove commented code 2020-08-29 00:26:45 +03:00
Jussi Kuokkanen
7acd4b3307 lint 2020-08-28 23:59:27 +03:00
Jussi Kuokkanen
5e344d2685 Merge branch 'master' of https://github.com/Nheko-Reborn/nheko 2020-08-28 23:35:40 +03:00
Jussi Kuokkanen
a173d964f7 add emoji completer to text input 2020-08-28 23:32:23 +03:00
DeepBlueV7.X
b7b9cee30e
Merge pull request #265 from trilene/voip 
Link GStreamer elements before syncing state
 2020-08-28 15:39:27 +00:00
trilene
67a6ab401b Link GStreamer elements before syncing state 2020-08-28 10:49:39 -04:00
DeepBlueV7.X
b58e370c03
Merge pull request #251 from Nheko-Reborn/new-event-store 
New event store
 2020-08-26 21:52:35 +00:00
Nicolas Werner
3df4bde032 Add some log messages, that migrations are in progress 2020-08-25 23:12:01 +02:00
Nicolas Werner
9f79b85579 Speedup db a bit, but loose some crash resiliency 
The loss in durability shouldn't matter, if we can just receive the same
events again after a restart
 2020-08-25 23:05:31 +02:00
CH Chethan Reddy
19cfd08a55 Verify signatures and find trusted devices 2020-08-25 15:41:27 +05:30
CH Chethan Reddy
1d299951b6 Cache Fix 2020-08-24 13:58:00 +05:30
trilene
473293b6a5 Under GStreamer >= 1.17 gather all candidates before sending offer/answer 2020-08-22 08:18:42 -04:00
CH Chethan Reddy
8a4bd37fea [WIP] Room Verification Works! 2020-08-18 11:29:02 +05:30
trilene
1402732b5f Stop SendFile and Call buttons swapping places on file upload 2020-08-17 17:42:06 -04:00
Nicolas Werner
7f7108161e Hide CallCandidates again in new store 2020-08-17 23:30:36 +02:00
Nicolas Werner
de7ec4d2b3 Merge remote-tracking branch 'origin/master' into new-event-store 
Conflicts:
	CMakeLists.txt
	io.github.NhekoReborn.Nheko.json
	src/Cache.cpp
	src/timeline/TimelineModel.cpp
	src/timeline/TimelineModel.h
	src/timeline/TimelineViewManager.cpp
 2020-08-17 20:40:33 +02:00
Nicolas Werner
b6751ab01e Appease the linter 2020-08-14 09:01:56 +02:00
Nicolas Werner
e06ff1ac1f Fix SVG color undefined 2020-08-14 01:20:24 +02:00
Nicolas Werner
f157602a52 Disable call support, when GStreamer is unavailable 
Integrating that in our CI is currently a bit hard, so disable it for
now, if GStreamer isn't found. Just make sure to build against GStreamer
for call support!
 2020-08-14 01:03:27 +02:00
Nicolas Werner
29cb065102 Bump flatpak dependency 2020-08-11 08:51:57 +02:00
Nicolas Werner
14a0aac748 Add /clear-timeline command 2020-08-09 23:36:47 +02:00
CH Chethan Reddy
2e20049b36 [WIP] Room-Verification Messages 2020-08-09 08:35:15 +05:30
Nicolas Werner
b972d827cb Try to fix issue of pagination interfering with limited: true 2020-08-07 13:12:45 +02:00
Nicolas Werner
7eb0c4e09c Also request keys from own devices 2020-08-06 22:18:52 +02:00
Nicolas Werner
1f9215a5be Split error messages from event decryption 2020-08-06 21:46:16 +02:00
trilene
df65093374 Add audio input device selector 2020-08-05 17:56:44 -04:00
trilene
02dfc8039f Conditionally compile against upcoming GStreamer release 2020-08-02 22:27:05 -04:00
trilene
b86711a388 Merge remote-tracking branch 'upstream/master' into voip 2020-08-01 15:49:26 -04:00
trilene
979bba6460 Tweak AcceptCall dialog 2020-08-01 15:43:23 -04:00
trilene
e527da052b Reset TLVM initial sync flag on logout 2020-08-01 14:39:06 -04:00
trilene
e3e7595bab clang-format 2020-08-01 14:31:10 -04:00
trilene
f14d141cb5 Improve TURN server retrieval 2020-07-30 19:59:54 -04:00
trilene
c0743f9688 Fix error message 2020-07-30 19:39:03 -04:00
CH Chethan Reddy
3635c185e9 Add Room Verification Messages 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
1fcd768f88 Adding Room Key Verification Stuff 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
a2979c2df1 Updating keys of outdated encrypted users 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
1103cc15cf Adding icons to UserProfile 2020-07-30 22:10:27 +05:30
Nicolas Werner
08028d5c57 Refactor UserProfile 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
ac1fbbb69f Some issue with UserProfile 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
6fae36abc4 [WIP] Add Caching for users 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
ffa61095b8 Error Handling and some fixes 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
00e36b6068 Add some Userprofile buttons 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
75efa5d3a2 Fix the Weird auto-confirmation and cancellation 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
fd232b1f4a Some more fixes 2020-07-30 22:10:27 +05:30
Nicolas Werner
4862be06be Fix presence indicator 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
1633650303 Some more changes 
- remove unnecessary field sender in userprofile.qml
    - cover user facing string with qsTr to get picked by translations
    - add spacing and fix theming issue
    - increase and add color to username
    - change back to QVector from QLinkedList cause I have mistaken
    better time complexity to give better benchmark

red
 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
d49ab15656 Some Improvements 
- DeviceVerificationList change to LinkedList to improve time
    complexity while deleting
    - Downgrade the flow to not use key.verification.done and
    key.verification.ready
 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
ce013e67a6 Add some more slots and mac 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
67367d0004 Shared secret with decimal and emoji works! 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
41b6ef0c32 Add DeviceVerificationList to keep track of all flows and Popup on 
recieving start or request
 2020-07-30 22:10:27 +05:30
Chethan2k1
1eb162cb6f Handle Device Verification related to_device messages 2020-07-30 22:10:27 +05:30
Chethan2k1
cd5dd0e39b Add SAS Method choice and Add send_to_device API call 2020-07-30 22:10:27 +05:30
Chethan2k1
b628f485ff Tweak UI for device verification and Add more slots 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
f9c0f4dd54 Add C++ Model for DeviceList 2020-07-30 22:10:27 +05:30
Chethan2k1
a54a973ad6 Adding DeviceList for userprofile 2020-07-30 22:10:27 +05:30
CH Chethan Reddy
64f204d984 Rewrite UserProfile in qml 2020-07-30 22:10:27 +05:30
Nicolas Werner
707248fea3 Add DeviceVerificationFlow dummy and verification test button 2020-07-30 22:10:27 +05:30
Nicolas Werner
2088053d26 Add DeviceVerificationFlow dummy and verification test button 2020-07-30 22:10:27 +05:30
Nicolas Werner
7f3d97517f Fix double free by closing cursor at the right time 2020-07-30 18:13:19 +02:00
trilene
97681ccf64 Remove references to video calls 2020-07-29 18:16:52 -04:00
Nicolas Werner
12090c0a06 Add workaround for duplicate syncs 2020-07-27 16:37:29 +02:00
Nicolas Werner
720bb164f7 Fix migration (hopefully) 2020-07-26 19:04:36 +02:00
trilene
43ec0c0624 Handle ICE failure 2020-07-26 10:59:50 -04:00
Nicolas Werner
ade905c881 Fix shadowing variable 2020-07-26 13:07:36 +02:00
Nicolas Werner
a00b11def7 Rename EventStore::event to get to remove ambiguity with QObject::event 2020-07-26 12:33:30 +02:00
trilene
57d5a3d31f Improve debug messages 2020-07-25 18:11:11 -04:00
Nicolas Werner
4e7bd20e0c Reset fetch in progress when fetch failed 2020-07-25 19:38:56 +02:00
Nicolas Werner
b294430fe5 Return to redacted messages instead of just storing the redaction 2020-07-25 19:38:27 +02:00
trilene
aec24efbe2 Specify call type on timeline 2020-07-24 13:30:12 -04:00
trilene
d51e34e66a Cancel sent CallInvite if no response within expiry 2020-07-23 19:38:40 -04:00
trilene
a4301048e3 Fix QLayout warning 2020-07-23 18:36:10 -04:00
trilene
d508e3abd6 Send ICE candidates gathered after timeout 2020-07-23 17:58:22 -04:00
trilene
7377215d28 Confirm logout/quit if active call in progress 2020-07-23 17:20:32 -04:00
trilene
55783c6fe5 Tweak ActiveCallBar 2020-07-23 17:02:50 -04:00
Nicolas Werner
147ae68c31 Don't send url, if we send an encrypted file 
Fix issues when sending images to some clients.
 2020-07-23 14:33:07 +02:00
trilene
88cfa3a8fa Polish voice call UI 2020-07-22 21:15:45 -04:00
Nicolas Werner
f23d733cff Fix room joins 2020-07-20 18:25:22 +02:00
Nicolas Werner
19f27236ea Fix reactions 2020-07-20 00:42:48 +02:00
Nicolas Werner
6f2bc908ba Fix reaction display 2020-07-19 12:22:54 +02:00
Nicolas Werner
d467568a65 Close cursor we don't need and where we overwrite the contents 2020-07-18 22:59:03 +02:00
Nicolas Werner
8261446f83 Fix reply scrolling 2020-07-18 21:14:45 +02:00
Nicolas Werner
5695f004a2 Fix race condition between /messages and /sync 2020-07-18 21:00:36 +02:00
Nicolas Werner
046b3f4da6 Mark own events as read again after sending 2020-07-18 20:39:31 +02:00
Nicolas Werner
36e4405f25 Fix flickering of encrypted messages when sending using new store 2020-07-18 19:15:50 +02:00
Nicolas Werner
a5dda86a6c Fix encryption indicator 2020-07-18 17:59:59 +02:00
Nicolas Werner
56ea89aa11 Reenable sending messages 2020-07-18 17:43:49 +02:00
trilene
28a678ca60 Add comment wrt TURN server credentials 2020-07-16 15:53:35 -04:00
trilene
f8ef55c133 Case-insensitive sdp search 2020-07-16 15:44:07 -04:00
Nicolas Werner
aa34576dfd Warn before kicking,banning,inviting,etc 2020-07-16 20:19:28 +02:00
trilene
8968d51b65 Handle preemptive CallAnswer from fellow device 2020-07-16 13:31:38 -04:00
trilene
16209ce073 Hide incoming CallCandidates in encrypted rooms 2020-07-14 07:34:40 -04:00
trilene
195ba5e5ee Remove comments 2020-07-13 20:47:34 -04:00
trilene
9d6cce9fe3 Handle preemptive CallHangUp 2020-07-13 20:15:09 -04:00
trilene
774d864096 Hide CallCandidates events from the timeline 2020-07-13 19:45:41 -04:00
trilene
09d2d937c5 Centre PlaceCall dialog 2020-07-13 19:20:41 -04:00
trilene
e85652e7e7 Fix percent-encoding of TURN server URI 2020-07-13 19:16:28 -04:00
Nicolas Werner
9ae7d0dce3 Readd pagination and fix redactions 2020-07-13 00:08:58 +02:00
Nicolas Werner
9479fcde08 Initialize Profile later 2020-07-11 02:15:53 +02:00
trilene
c73cfe1810 Merge remote-tracking branch 'upstream/master' into voip 2020-07-10 19:39:44 -04:00
trilene
7a206441c8 Support voice calls 2020-07-10 19:19:48 -04:00
Nicolas Werner
da2f80df60 Fix translation loading 
Explanation see here:
https://www.kdab.com/fixing-a-common-antipattern-when-loading-translations-in-qt/
 2020-07-10 03:17:23 +02:00
Nicolas Werner
3421728898 Fetch missing events 2020-07-10 01:37:55 +02:00
Nicolas Werner
530c531c4b WIP: Event Store split out 2020-07-09 23:15:22 +02:00
Nicolas Werner
7650e6ced6 Fix autolinking breaking on single quotes in href attribute 
Fixes #234
 2020-07-09 13:26:01 +02:00
Nicolas Werner
8d3ab300b6 Open url using QDesktopServices from Qml 
This fixes some weirdness on some platforms, where Qt.openUrlExternally
does weird stuff.
 2020-07-09 00:45:37 +02:00
Nicolas Werner
0da1a6d5fc Add relations and order without hidden events to db 2020-07-08 02:02:14 +02:00
Nicolas Werner
82eff09062 Fetch event from db and use string_view where possible 2020-07-06 03:43:14 +02:00
Nicolas Werner
c79205c26a Use new timeline cache structure 2020-07-05 05:31:15 +02:00
Nicolas Werner
79a29953dd Persist event order 2020-07-04 02:09:12 +02:00
Nicolas Werner
233b3c06ce Store events in room specific db 2020-07-03 02:40:48 +02:00
Nicolas Werner
21a1f249f9 Fix Qt 5.9 build 2020-06-27 03:15:36 +02:00
Nicolas Werner
f6fa494666 Make connections across threads queued in any case 2020-06-26 13:36:21 +02:00
Nicolas Werner
a9e321e38f Don't use formatted body without format 2020-06-26 13:36:21 +02:00
Felix Yan
751c0526d7
Correct a typo in SnackBar.cpp 2020-06-22 20:29:47 +08:00
Nicolas Werner
c973fd759b Fix m.relates_to being sent as 'null' when not set in encrypted messages. 
Thank you Sorunome for reporting.
 2020-06-20 19:26:54 +02:00
Nicolas Werner
cded494cb5 Try to make text rendering in qml sharper 2020-06-19 19:34:03 +02:00
Lorem
e1706f4df5 Fix not being able to change theme 2020-06-14 13:56:15 +05:30
Joseph Donofry
7afb164244
Merge remote-tracking branch 'origin/master' into presence 2020-06-11 22:27:30 -04:00
Joseph Donofry
dbaf92734c
Fix formatting 2020-06-11 22:22:16 -04:00
Joseph Donofry
b90b718961
Merge remote-tracking branch 'origin/master' into reactions 2020-06-11 21:59:34 -04:00
Joseph Donofry
b9626f0c69
Additional code cleanup 2020-06-11 21:59:21 -04:00
Nicolas Werner
150c9b1dbc Fix scale factor setting 2020-06-11 23:08:15 +02:00
Nicolas Werner
db93e6b853 Fix warning about not registered Presence type 2020-06-11 18:37:09 +02:00
Nicolas Werner
488924c9b3 Allow deleting a status 2020-06-11 18:30:52 +02:00
Joseph Donofry
12c46e86b4
Fix linting 2020-06-11 00:37:54 -04:00
Joseph Donofry
5e355c36fd
Fix build issue on some versions of clang 2020-06-10 22:34:14 -04:00
Alexander 'z33ky' Hirsch
2b9860c3af Add setting to alert on notification 2020-06-10 12:34:26 +02:00
Joseph Donofry
6bb73f84a3
Merge master and fix conflicts 2020-06-09 20:51:36 -04:00
Nicolas Werner
0a23615dd7 Fix small formatting error 2020-06-09 13:29:24 +02:00
Nicolas Werner
b9631753dd Reenable custom status messages 
This still leaves out setting a client to online/offline, since that
seems to be causing the CPU issues with synapse.
 2020-06-09 12:49:36 +02:00
Nicolas Werner
3baf11b5c4 Fix unused capture 2020-06-08 22:35:47 +02:00
Nicolas Werner
814868024c Disable presence and status_msg menu 
It currently causes severe performance issues in synapse as well as many
random resets, so this is disabled until those issues are resolved.
 2020-06-08 21:59:15 +02:00
Nicolas Werner
f2bfa61e08 Add menu actions to set presence 2020-06-08 20:26:37 +02:00
Nicolas Werner
96f4169be9 Show presence and set custom status messages 2020-06-08 01:59:05 +02:00
Nicolas Werner
e5a55ab1b9 Smooth scaling for images 
Fixes some issues with inline images.
 2020-06-07 14:53:35 +02:00
Nicolas Werner
43d2ebc095 Fix Qt5.15 issues 
fixes #214
 2020-06-05 23:34:00 +02:00
Nicolas Werner
50d5891493 Fix serialization bug introduced in 9eddcfc42f 2020-05-30 17:25:18 +02:00
Nicolas Werner
9eddcfc42f Remove some redundant functions 2020-05-30 16:38:11 +02:00
Nicolas Werner
6b60ff7713 Rename settings to be more consistent 2020-05-26 22:54:51 +02:00
Nicolas Werner
f452bdf2b0 Make settings update immediately in qml and allow limiting timeline width 
Limiting improves readability on wide monitors.

The immediate update of the settings is done by just exposing settings
as properties and then setting the settings as a context property.
 2020-05-26 22:54:51 +02:00
Nicolas Werner
4ee9e5c27c Improve compile times a tiny bit 2020-05-26 22:54:51 +02:00
Nicolas Werner
937b35ca8a Fix some join messages showing as empty 2020-05-26 22:54:51 +02:00
lkito
60ad6ce277 Added an option to have descriptions for user settings. 2020-05-24 15:35:25 +04:00
Joseph Donofry
5228861b88
Add reaction/redaction for in-line Reactions 2020-05-21 21:21:35 -04:00
lkito
d8b89e2ef0 Added an optional feature to show bigger emoji-only messages with 3 or less emoji 2020-05-21 16:31:27 +04:00
Joseph Donofry
1c521d1711
Merge origin/master into reactions 2020-05-18 21:13:41 -04:00
Nicolas Werner
bdf1147a80 add a bit of additional logging to image paste 2020-05-18 14:02:54 +02:00
Nicolas Werner
23e4408fa8 Add /roomnick command 2020-05-18 14:02:14 +02:00
Nicolas Werner
7de1fc62e8 Tag rooms via context menu 2020-05-18 04:23:36 +02:00
Nicolas Werner
5abdad308d Fix crash when reacting to messages from /sync 
Messages on /sync don't have a room_id
 2020-05-17 02:36:04 +02:00
Nicolas Werner
f0757a6426 Fix local echo for reactions 2020-05-16 22:48:43 +02:00
Joseph Donofry
a5778bdf40
Merge remote-tracking branch 'origin/master' into reactions 2020-05-16 15:10:49 -04:00
lkito
2c21f6e3fa Implemented optional message body highlighting feature. 2020-05-16 17:15:43 +04:00
Nicolas Werner
576269c9e5 Prevent timeline being black on some platforms 2020-05-15 22:46:34 +02:00
CH Chethan Reddy
57b8cdbd4d remove #if defined __has_include 2020-05-15 17:48:27 +05:30
CH Chethan Reddy
e4a7e85935 Change the commit hash for mtxclient 2020-05-15 17:48:27 +05:30
CH Chethan Reddy
30d61e3114 minor fixes 2020-05-15 17:48:27 +05:30
Joseph Donofry
6d2789f4d5
Merge master into reactions 2020-05-14 20:53:01 -04:00