d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-01 02:10:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
3441 commits 62 branches 46 tags 30 MiB
Commit graph

642 commits

Author SHA1 Message Date
Nicolas Werner
1be42045ee
fix linting 2021-03-05 15:26:07 +01:00
DeepBlueV7.X
56c44d0454
Merge pull request #505 from Nheko-Reborn/license-headers 
License headers
 2021-03-05 01:04:36 +00:00
Joseph Donofry
4b12b53133
Fix linting 2021-03-04 19:11:08 -05:00
Nicolas Werner
a6f0d2ea7d
Update license headers 2021-03-05 01:04:07 +01:00
Nicolas Werner
67ab204050
Fix reply relating to the wrong id of edited event 2021-03-03 17:42:41 +01:00
Nicolas Werner
345dc1e61f
Fix text input restoring after edits 2021-02-25 00:50:17 +01:00
Nicolas Werner
f6b5b24d64
Allow editing via up and down arrows 2021-02-24 23:51:05 +01:00
Jedi18
ee232c5c60 fix timeline focus 2021-02-23 00:46:40 +05:30
Jedi18
b1dec6f6ac enter key now works, fix room highlighting and add overlay 2021-02-23 00:18:31 +05:30
Jedi18
0922a8e4c7 add room alias delegate, fix some quickswitcher ui problems 2021-02-22 00:01:50 +05:30
Jedi18
32d419d14f add quick switcher qml file and moved completerFor from inputbar to timeline view class 2021-02-21 23:10:21 +05:30
DeepBlueV7.X
99efe2f06b
Merge pull request #479 from Jedi18/add_rooms_model_completer 
Add rooms completion model
 2021-02-19 14:03:42 +00:00
DeepBlueV7.X
744feabeca
Merge pull request #474 from Jedi18/room_settings_qml 
Shifted Room Settings Dialog to QML
 2021-02-19 08:43:03 +00:00
Nicolas Werner
b8c6c716be Make inline images work a bit better 2021-02-17 22:14:19 +01:00
Nicolas Werner
c9393fe3f6 Fix crash from logging unset indices (leftover after debugging) 2021-02-17 18:47:59 +01:00
Jedi18
0b6c82dfff added bool to choose between showing only rooms with aliases and all of the rooms 2021-02-17 19:58:41 +05:30
Jedi18
19dbbb2c6c add rooms model, add room delegate for completer 2021-02-16 00:50:28 +05:30
Akhil Nair
8400540428
Merge branch 'master' into room_settings_qml 2021-02-14 00:04:27 -05:00
Nicolas Werner
d43607d01c Fix hover handling in the timeline 2021-02-14 01:28:28 +01:00
Jedi18
1a406f79e6 replaced with togglebutton using qtquickcontrols2 2021-02-13 23:59:42 +05:30
Nicolas Werner
7ddcab3902 Mark messages as read, when Nheko gets focused 
fixes #235
 2021-02-13 01:41:09 +01:00
Nicolas Werner
3c91b5b47b Fix crash when editing an edited message pointing to itself 2021-02-12 16:11:11 +01:00
Jedi18
35aa0126ac added changing of name through edit modal, removed old roomsettings 2021-02-12 12:48:12 +05:30
Jedi18
f044e2d2a1 fix avatar update on timeline sync 2021-02-11 23:50:45 +05:30
Jedi18
7401bd13b2 added notifications and encryption for the new roomsettings 2021-02-11 19:54:09 +05:30
Nicolas Werner
0db4d71ec2 Prevent edits of unsent messages 2021-02-10 21:13:57 +01:00
Jedi18
b70f37194f ui almost looks the same, midway between transition from old room settings to new room settings 2021-02-10 21:22:42 +05:30
Nicolas Werner
2606568376 Fix messages sometimes not being rendered, when they are too large 2021-02-10 15:24:00 +01:00
Nicolas Werner
a62276c289 Fix UI allowing edits of foreign messages in some cases 2021-02-10 14:32:16 +01:00
Nicolas Werner
bdb6e6b79e Fix stuck notifications because of edits 
Does not fix the read status yet, for that we need to compare read
receipts for all events after the last visible event.
 2021-02-10 01:03:20 +01:00
Nicolas Werner
9b7d33e847 Implement message editing 
The UI still looks ugly, but I have no good idea atm.

fixes #134
 2021-02-09 20:22:53 +01:00
Nicolas Werner
00fd4eecec Display edits correctly 2021-02-09 20:22:49 +01:00
Nicolas Werner
faeaf9dc6b Fix edited replies 2021-02-09 20:22:02 +01:00
Nicolas Werner
d6504812c7 Render edits 2021-02-09 20:22:02 +01:00
Nicolas Werner
2e77a1554f Switch to new relations format 2021-02-09 20:22:02 +01:00
Jedi18
37679ac57e added room settings qml 2021-02-09 23:11:39 +05:30
DeepBlueV7.X
23a9306383
Merge pull request #459 from Jedi18/minor_fixes 
Fix emoji related issues
 2021-02-09 16:25:37 +01:00
Nicolas Werner
375e20462b Native rendering breaks kerning 2021-02-07 02:01:44 +01:00
Jedi18
4aefac08a4 focus message input on adding emoji/reacting to a message 2021-02-05 22:42:08 +05:30
DeepBlueV7.X
a7150b5666
Merge branch 'master' into avatar_username_feature 2021-02-03 03:17:28 +01:00
Jedi18
cd3f719e43 add loading indicator 2021-02-02 17:24:08 +05:30
Jedi18
d535cc5e75 add error message and update avatars on avatar change in timeline and user profile dialog 2021-02-02 13:30:47 +05:30
Joseph Donofry
53c653a228
Merge remote-tracking branch 'nheko-im/master' into privacy_screen 2021-02-01 18:42:38 -05:00
DeepBlueV7.X
2b7bd09ad3
Merge pull request #431 from Jedi18/avatar_username_feature 
Username editing (room specific and global)
 2021-02-01 19:14:57 +01:00
Loren Burkholder
c3fa592018 make lint 2021-01-29 18:17:44 -05:00
Loren Burkholder
cd998d1c35 Center user info dialog on the screen 2021-01-29 18:16:50 -05:00
Jedi18
9b5a287d14 made requeste changes 2021-01-29 11:55:24 +05:30
Jedi18
fa7ad4f234 Shifted fetching of global username fom timeline model to user profile 2021-01-29 00:09:11 +05:30
Jedi18
3b82b2ff97 fix linting 2021-01-28 23:53:56 +05:30
Jedi18
b3f29f592b Changed edit method from double clicking to an edit button 2021-01-28 23:35:02 +05:30
Jedi18
87490c29cd Username can be edited by double clicking on text, added global user profile menu action in user info widget 2021-01-28 20:03:50 +05:30
Nicolas Werner
50564985cc Fix crash, when keys for no events were requested 2021-01-27 21:30:06 +01:00
Nicolas Werner
5fbf17f6ec Fix request key loops 2021-01-27 20:29:06 +01:00
Jedi18
5e3f513655 update room specific username from userprofile 2021-01-27 11:03:08 +05:30
Joseph Donofry
bfeb766a91
Implement Privacy Screen 
* Add handles for window focus gained / focus lossed and connect to timer
* Clean up some of the PrivacyScreen.qml code
* Connect settings to PrivacyScreen visibility
 2021-01-26 17:23:28 -05:00
Nicolas Werner
f0102c1e55 Fix old messages being played back after limit reset 2021-01-24 20:02:24 +01:00
DeepBlueV7.X
a5944ab047
Merge pull request #406 from rnhmjoj/open-in 
Add "open in external program" action
 2021-01-24 05:52:44 +01:00
rnhmjoj
c569ab24bc
Add "open in external program" action 2021-01-24 01:50:23 +01:00
Nicolas Werner
7bc57f76f7 Request unknown message indices 2021-01-23 20:08:59 +01:00
DeepBlueV7.X
a082a98ede
Merge pull request #393 from LorenDB/mdCommands 
Markdown setting override commands
 2021-01-23 02:02:59 +01:00
DeepBlueV7.X
f956d012a9
Remove useless parentheses 2021-01-23 00:51:29 +00:00
Nicolas Werner
97340bed13 Fix font tags showing up in playable media messages 2021-01-23 00:49:28 +01:00
Loren Burkholder
06f6a5bcca Clarify how markdown is determined 2021-01-20 21:12:07 -05:00
Loren Burkholder
1d93570814 Make lint 2021-01-20 18:22:24 -05:00
Loren Burkholder
91155bf803 Add commands to override Markdown setting 2021-01-20 18:22:24 -05:00
Nicolas Werner
32a20a5f8c Simplify section handling a bit 2021-01-19 23:58:40 +01:00
Nicolas Werner
42b08257ec Make read markers a bit less confusing 2021-01-16 13:54:56 +01:00
Nicolas Werner
31881e14d9 Make it easier to understand, what button to click for verification from profile 2021-01-12 15:00:59 +01:00
Nicolas Werner
2a19783f99 Fix timeline becoming corrupted on backfill 
Fixes #273
 2021-01-12 00:02:18 +01:00
trilene
3572c111f3 Fix call invite declined on another device 2021-01-10 12:23:58 -05:00
trilene
9bbade37de Fix call answered on another device 2021-01-07 14:04:54 +01:00
trilene
07ac7b7e85 Port PlaceCall dialog to Qml 2021-01-07 14:04:50 +01:00
trilene
7124024977 Make call invites less intrusive 2021-01-07 14:04:21 +01:00
trilene
ac410f46f2 Move call-related properties to CallManager 2021-01-07 14:04:21 +01:00
Nicolas Werner
4b4c321397 Allow inline replies from notifications on linux 2021-01-07 10:44:59 +01:00
Nicolas Werner
3a41bb9fff Fix typing notifications flickering sometimes 2021-01-05 22:38:21 +01:00
Nicolas Werner
904cafcd39 lint 2020-12-25 04:11:47 +01:00
Nicolas Werner
01e38d12ed Fix some compiler warnings 2020-12-25 00:08:06 +00:00
Nicolas Werner
7b46aa2a6e Store secrets in keychain 2020-12-16 22:10:09 +01:00
Nicolas Werner
7abeb1f1a4 React with arbitrary strings via /react 2020-12-13 16:23:04 +01:00
DeepBlueV7.X
95667edb14
Merge pull request #347 from kamathmanu/avatarFullViewSupport 
Add support for viewing avatar images in full size
 2020-11-30 21:25:42 +01:00
kamathmanu
69997a3d74 Lint code 2020-11-30 15:10:59 -05:00
kamathmanu
0edd75949b Lint code 2020-11-30 14:56:39 -05:00
kamathmanu
e36b090c5b Add support for viewing avatar images in full size 2020-11-30 10:05:24 -05:00
Nicolas Werner
2ce129e6b6 Properly share and rotate sessions on member and device changes 2020-11-30 01:54:53 +01:00
Nicolas Werner
c24f9a22a5 Load sessions lazily from db 2020-11-30 01:54:53 +01:00
Nicolas Werner
233a8a5dad Fix variable shadowing 2020-11-26 16:09:53 +01:00
Nicolas Werner
c31b9e2793 Fix race when reading members from db 2020-11-25 23:54:25 +01:00
Nicolas Werner
08e9461611 Fix input focus when pressing reply button 2020-11-25 19:05:12 +01:00
Nicolas Werner
c74077a41f Implement Qml drag and drop 2020-11-25 19:05:12 +01:00
Nicolas Werner
c2eea5cb55 Fix mimetype of media messages 2020-11-25 19:05:12 +01:00
Nicolas Werner
094c0b09ab Qml emoji completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
add5903fb0 Working User completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
cabeb1464c WIP Qml completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
d14a5f8067 Reimplement message history 2020-11-25 19:05:12 +01:00
Nicolas Werner
921379a4cc Send typing updates from QML 2020-11-25 19:05:12 +01:00
Nicolas Werner
d1af1a8669 Move calls to new input bar 2020-11-25 19:05:12 +01:00
Nicolas Werner
a31d3d0816 Add file uploading 2020-11-25 19:05:12 +01:00
Nicolas Werner
0bb4885632 Basic text input in qml 2020-11-25 19:05:12 +01:00
Nicolas Werner
7a74b86340 Pasteable textinput 2020-11-25 19:05:11 +01:00
DeepBlueV7.X
27bf654d92
Merge pull request #320 from trilene/webrtc-video 
Video calls: add local webcam view
 2020-11-09 21:49:26 +01:00
trilene
d391404b79 Video calls: add local webcam view 2020-11-09 10:51:17 -05:00
DeepBlueV7.X
5fb3d4ede8
Merge pull request #310 from MayeulC/fix-typo 
Improve wording in multiple strings.
 2020-10-31 22:28:40 +01:00
Mayeul Cantan
eea7aecc04 Wording: replace "encrypted room" with "encrypted private chat" 
This is for consistency with "Start a private chat", and is more
specific.
 2020-10-31 22:23:55 +01:00
trilene
fd479a91be Merge remote-tracking branch 'upstream/master' into webrtc-video 2020-10-28 16:08:17 -04:00
Nicolas Werner
70f35de449 Don't pass around empty timeline 2020-10-28 13:06:28 +01:00
trilene
d9ca5309ac Merge remote-tracking branch 'upstream/master' into webrtc-video 2020-10-27 15:29:53 -04:00
trilene
d1f3a3ef40 Support video calls 2020-10-27 13:14:06 -04:00
Nicolas Werner
12fff7408e Optimize build 2020-10-27 17:45:28 +01:00
Nicolas Werner
4797b9fa96 Fix infinite pagination properly now. 2020-10-23 19:42:23 +02:00
Nicolas Werner
cea7f4574f Clean up key requests + autoreload 2020-10-20 19:46:37 +02:00
Nicolas Werner
983690c94f Share code for sending encrypted olm messages 2020-10-20 18:10:09 +02:00
Nicolas Werner
aa9b453f81 Store timestamp with olm sessions 2020-10-20 13:46:05 +02:00
Nicolas Werner
bd0deb7213 Fix crash on exit 2020-10-17 00:57:29 +02:00
Nicolas Werner
392d7d5568 Try to fix windows build 2020-10-08 20:07:43 +02:00
Nicolas Werner
e5fb9a25ea Try to please the CI gods 2020-10-08 18:16:30 +02:00
Nicolas Werner
08d5a84cbd Fix issues with old qt and bump to 5.10 2020-10-08 17:26:07 +02:00
Nicolas Werner
99ba1f17d3 Merge remote-tracking branch 'origin/master' into cross-signing 2020-10-08 16:57:03 +02:00
Nicolas Werner
7b6fab3373 Calculate verification status from cross-signing sigs and update dynamically 2020-10-08 00:20:12 +02:00
Nicolas Werner
64d5a193f1 Fix in room verification 2020-10-06 17:02:41 +02:00
Nicolas Werner
8a4d85f801 Show different verification errors 2020-10-05 22:58:07 +02:00
Nicolas Werner
bca29a4227 Make steps in verification flow explicit 2020-10-05 22:12:10 +02:00
Nicolas Werner
2a79cd2b6b Don't fail on missing key for a device and /rotate-megolm-session command 2020-10-03 18:38:28 +02:00
Nicolas Werner
abff61bb6c Fix nullopt when iterating reactions 2020-10-03 17:23:59 +02:00
Nicolas Werner
94690ebd4c Clean up verification and key cache a bit 2020-10-02 01:14:42 +02:00
trilene
3f73853e4b Move ActiveCallBar Qml to separate file 2020-09-25 10:26:36 -04:00
Nicolas Werner
4802c34009 Merge remote-tracking branch 'origin/master' into cross-signing 2020-09-24 21:36:43 +02:00
trilene
44cfc8d22a clang-format 2020-09-22 12:14:15 -04:00
trilene
da27670cbe Port ActiveCallBar to Qml 2020-09-22 12:07:36 -04:00
Nicolas Werner
54db9c89ed Simplify outbound session setup 
Don't send inbound session to self and claim and send all keys at once.
 2020-09-20 23:07:02 +02:00
Nicolas Werner
4b36585e47 Fix typo in encryption error message 2020-09-19 15:45:23 +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
CH Chethan Reddy
8eb74daf76 Split qml part of Device Verification 2020-09-14 17:27:49 +05:30
Chethan2k1
2b5deabbdc Fix breaking while using qmlRegisterSingletonInstance 2020-09-10 14:50:10 +05:30
Chethan2k1
898be090af Add support non-encrypted room-verification messages 2020-09-10 11:08:39 +05:30
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
8d14a058c6 Fix endless pagination, when old history is inaccessible 2020-09-02 19:38:07 +02:00
CH Chethan Reddy
b174bd9380 Merge remote-tracking branch 'upstream/master' into device-verification 2020-08-30 22:27:14 +05:30
CH Chethan Reddy
0d1dd29b19 Small Fixes 2020-08-29 13:37:51 +05:30
CH Chethan Reddy
8a4bd37fea [WIP] Room Verification Works! 2020-08-18 11:29:02 +05:30
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
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
1f9215a5be Split error messages from event decryption 2020-08-06 21:46:16 +02: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
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
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
ffa61095b8 Error Handling and some 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
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
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
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
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
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
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
8261446f83 Fix reply scrolling 2020-07-18 21:14:45 +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
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
774d864096 Hide CallCandidates events from the timeline 2020-07-13 19:45:41 -04:00
Nicolas Werner
9ae7d0dce3 Readd pagination and fix redactions 2020-07-13 00:08:58 +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
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
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
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
cded494cb5 Try to make text rendering in qml sharper 2020-06-19 19:34:03 +02:00
Joseph Donofry
7afb164244
Merge remote-tracking branch 'origin/master' into presence 2020-06-11 22:27:30 -04:00
Joseph Donofry
b9626f0c69
Additional code cleanup 2020-06-11 21:59:21 -04: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
Joseph Donofry
6bb73f84a3
Merge master and fix conflicts 2020-06-09 20:51:36 -04:00
Nicolas Werner
96f4169be9 Show presence and set custom status messages 2020-06-08 01:59:05 +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