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

493 commits

Author SHA1 Message Date
DeepBlueV7.X
20885dd66a
Merge pull request #378 from LorenDB/readReceipts 
Display read receipts when read indicator is clicked
 2021-01-17 23:55:58 +01:00
Nicolas Werner
07e71e6eae Fix crash with ScrollView 2021-01-17 04:05:02 +01:00
Loren Burkholder
93b492e9e6 Only use a pointing hand if there is something to click on 2021-01-16 19:55:50 -05:00
Loren Burkholder
6f6d962ab9 Fix warning messages about null image path 2021-01-16 11:52:58 -05:00
Loren Burkholder
b46cd339a1 Fix tooltips 2021-01-16 11:41:37 -05:00
Loren Burkholder
8f7ca298bc
Simplify source URL construction 
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
 2021-01-16 10:19:26 -05:00
Loren Burkholder
7671927fa4 Remove unnecessary properties; simplify hover code 2021-01-16 10:16:27 -05:00
Loren Burkholder
139ab146bb Use an ImageButton for the StatusIndicator 
Incidentally, this allows ImageButtons to not change color.
 2021-01-16 10:02:55 -05:00
Nicolas Werner
42b08257ec Make read markers a bit less confusing 2021-01-16 13:54:56 +01:00
Loren Burkholder
f520f8ce16 Display read receipts when read indicator is clicked 2021-01-15 20:46:43 -05:00
Nicolas Werner
ca54de0b50 Update translations 2021-01-15 13:57:19 +01:00
DeepBlueV7.X
061e4c1b09
Merge pull request #374 from trilene/master 
Add call invite screen for mobile
 2021-01-15 01:36:50 +01:00
trilene
dfe2f7dc57 Finesse mobile call invite screen 2021-01-13 16:00:41 -05:00
trilene
a85823b68a Add call invite screen for mobile 2021-01-12 14:22:52 -05:00
Nicolas Werner
14cb3bfe10 Don't use centerIn on popup on Qt < 5.12 2021-01-12 15:55:36 +01:00
Nicolas Werner
826a5cfb14 Use minimum required versions for qml imports 2021-01-12 15:04:31 +01:00
Nicolas Werner
6090d00251 Revert "Update QtQuick versions to match Qt 5.10" 
This reverts commit 74e32dd96b.
 2021-01-12 15:03:39 +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
81762119b9 Make device verification request dialogs easier to understand. 2021-01-12 15:00:59 +01:00
Joseph Donofry
74e32dd96b
Update QtQuick versions to match Qt 5.10 2021-01-11 22:17:00 -05:00
Joseph Donofry
9be466754e
Add ripple to completer 2021-01-11 20:22:40 -05:00
Joseph Donofry
9a604d3821
Clean up Avatar click event handling 2021-01-11 20:02:39 -05:00
Joseph Donofry
3ff8b3ad8c
Merge master and fix conflicts 2021-01-11 17:51:39 -05:00
Joseph Donofry
1bc2db4bdf
Add Ripple effects to qml buttons and avatar 2021-01-11 17:50:26 -05:00
trilene
cf8a47503f Fix device discovery under GStreamer 1.16 2021-01-07 09:48:25 -05:00
trilene
2bd8a386e2 Color and icon button spacing fixes 2021-01-07 14:04:54 +01:00
trilene
2984d71971 Fix Qml control colors 2021-01-07 14:04:54 +01:00
trilene
4123e6aff1 Fix previous commit 2021-01-07 14:04:54 +01:00
trilene
1c4a86e502 Set Label text color explicitly 2021-01-07 14:04:54 +01:00
trilene
13a280df13 Finesse PlaceCall dialog 2021-01-07 14:04:54 +01:00
trilene
6427687d20 Add missing translation marks 2021-01-07 14:04:54 +01:00
trilene
87d2074c81 Add devices dialog to CallInviteBar 2021-01-07 14:04:54 +01:00
trilene
055c6f7248 Add device combos to PlaceCall dialog 2021-01-07 14:04:54 +01:00
trilene
d315d02ee6 Use Layout margins 2021-01-07 14:04:54 +01:00
trilene
07ac7b7e85 Port PlaceCall dialog to Qml 2021-01-07 14:04:50 +01:00
trilene
459c59901e Fix one-way video calls 2021-01-07 14:04:21 +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
5ca043ad87 Fix user status that got lost at some point 2021-01-04 15:14:40 +01:00
Nicolas Werner
97688763f6 Background color for code and don't collapse space in timeline 2020-12-14 02:21:58 +01:00
Nicolas Werner
703950273b Don't overflow room name 2020-12-13 16:05:48 +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
d4cece2f4d
Update resources/qml/Avatar.qml 
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
 2020-11-30 14:58:50 -05:00
kamathmanu
a48c6353bf
Update resources/qml/Avatar.qml 
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
 2020-11-30 14:58:37 -05:00
Nicolas Werner
39a0a340d8 Fix selection in input area by mouse 2020-11-30 18:53:25 +01:00
kamathmanu
e36b090c5b Add support for viewing avatar images in full size 2020-11-30 10:05:24 -05:00
kirillpt
22997439ba change 'redacted' for 'removed' 2020-11-26 11:50:37 +03:00
DeepBlueV7.X
c44513614f
Merge branch 'master' into fix-call-bar 2020-11-25 22:01:19 +01:00
trilene
491ca1592a Fix ActiveCallBar 2020-11-25 15:54:54 -05:00
Nicolas Werner
b7505fe562 Open completer on tab 2020-11-25 19:05:12 +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
0eb8d4126b Fix enter when no completion available 2020-11-25 19:05:12 +01:00
Nicolas Werner
37df79f796 Show userid in completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
0cf556fa20 Mouse selection of completions 2020-11-25 19:05:12 +01:00
Nicolas Werner
90ce4f23ab Fix index out of range on backspace in completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
29625ae253 Fix some issues with completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
c8fa40a2df Use a trie for filtering completions (not fuzzy yet) 2020-11-25 19:05:12 +01:00
Nicolas Werner
094c0b09ab Qml emoji completer 2020-11-25 19:05:12 +01:00
Nicolas Werner
67dcc74c79 Simple prefix match for completions 2020-11-25 19:05:12 +01:00
Nicolas Werner
ecc7759973 Custom completer filtering 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
9d68d59465 Reenable Ctrl+U 2020-11-25 19:05:12 +01:00
Nicolas Werner
d14a5f8067 Reimplement message history 2020-11-25 19:05:12 +01:00
Nicolas Werner
82c441dddd Move emoji picker to qml 2020-11-25 19:05:12 +01:00
Nicolas Werner
2bec5d083c Use old style connection (for Qt5.12) 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
Nicolas Werner
35066900d1 Disable scroll helper on mobile 2020-11-25 19:05:11 +01:00
Nicolas Werner
5df47c4b4a Make reply background a bit less saturated 2020-11-21 01:18:55 +01:00
Nicolas Werner
081bd8d5f1 Add some padding between scrollbar and messages 2020-11-21 01:10:38 +01:00
DeepBlueV7.X
3ec8a291b6
Merge pull request #327 from kamathmanu/qtBackwardsCompatability 
Make compatible with qt 5.12
 2020-11-15 17:07:05 +01:00
kamathmanu
eb72fd2cf9 Make compatible with qt 5.12 2020-11-14 16:38:17 -05:00
DeepBlueV7.X
9c4148cca3
Merge pull request #314 from MayeulC/smoothie-2 
Smooth all the things [v2]
 2020-11-12 14:04:06 +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
Mayeul Cantan
2c542c398a Smooth pictures in timeline 2020-10-31 23:41:04 +01:00
Mayeul Cantan
a176f0bf35 Smooth Avatars in timeline 
This helps on low-dpi screens, getting rid of the jaggies.
 2020-10-31 23:40:45 +01: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
a9a0635c02 Wording: Verification request isn't a request anymore once accepted 
Replace it with "verification process".
 2020-10-31 22:23:34 +01:00
trilene
fd479a91be Merge remote-tracking branch 'upstream/master' into webrtc-video 2020-10-28 16:08:17 -04:00
Nicolas Werner
2143881997 Make back button bigger as it is hard to tap with your thumb 2020-10-28 14:53:11 +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
7f2d18c36d Fix small scope issue 2020-10-26 21:45:00 +01:00
Nicolas Werner
0e7baa21ab Disable new MessageInput, until you can paste images 2020-10-26 21:34:34 +01:00
Nicolas Werner
3d64df41da Split up TimelineView into separate components 2020-10-26 21:34:34 +01:00
Nicolas Werner
3a0e55e97b Qml message input mockup 2020-10-26 21:34:34 +01:00
Nicolas Werner
3172811ca7 Add mobile mode which improves scrolling 2020-10-24 16:21:00 +02:00
Nicolas Werner
53734607cf Fix copying text 2020-10-24 14:42:18 +02:00
Nicolas Werner
e959443831 Speed up rendering the timeline by a LOT by reducing clipping 
Sadly still required for replies, otherwise this would be perfect.
 2020-10-22 21:02:39 +02:00
Nicolas Werner
b3a7f0b888 Hide room name, if not loaded yet 2020-10-18 22:30:42 +02:00
DeepBlueV7.X
b23913fa7c
Merge pull request #301 from kamathmanu/issue266-filenameOnHover 
Display filename on mouse hover
 2020-10-16 12:44:45 +02:00
kamathmanu
e1c4f7d516 Make Text element a sibling of the Rectangle to avoid the text from depending on the rectangle's opacity property. Switch to Nheko theme colors 2020-10-15 11:52:49 -04:00
kamathmanu
e3c6656613 Avoid hardcoded font size 2020-10-14 18:07:09 -04:00
kamathmanu
a0c2a174ea Display filename on mouse hover 2020-10-13 16:24:42 -04:00
Nicolas Werner
d075a90024 Fix emoji filter losing focus 2020-10-12 22:05:55 +02:00
Nicolas Werner
1a029112d9 Lint qml with qml-format 2020-10-08 21:11:21 +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
51964c4fd7 Clean up verification pages a bit 2020-10-02 17:33:04 +02:00
Nicolas Werner
d4dccc8e36 Fix room name 2020-10-02 16:58:13 +02:00
Nicolas Werner
54e3c2c96b Fix verification start to start with request 2020-10-02 12:18:54 +02:00
Nicolas Werner
94690ebd4c Clean up verification and key cache a bit 2020-10-02 01:14:42 +02:00
trilene
e57199412a Allow button colors override 2020-09-25 12:09:22 -04: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
da27670cbe Port ActiveCallBar to Qml 2020-09-22 12:07:36 -04:00
Nicolas Werner
4179be427f Fix binding loop when trying to reply 2020-09-20 08:59:35 +02:00
Nicolas Werner
0afe1299e2 Fix emoji escape in file messages 
This disables color emojis for now in filenames
 2020-09-19 22:55:25 +02:00
DeepBlueV7.X
fe325f9266
Merge pull request #285 from Lurkki14/master 
Use Rectangle for typing users so it doesn't overlap with the timeline
 2020-09-19 17:02:53 +02:00
Nicolas Werner
75d7c2608a Update translations 2020-09-19 15:32:33 +02:00
Jussi Kuokkanen
13658d536e make typing Rectangle extents cleaner 2020-09-18 16:18:31 +03:00
Lurkki14
8741e5f36a
Set typing Rectangle color directly instead of Connection 
Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
 2020-09-18 14:55:48 +03:00
Jussi Kuokkanen
1f71f7227a make Rectangle to fill the gap between input widget and typing users 2020-09-17 17:52:40 +03:00
Jussi Kuokkanen
c463568031 simplify check for no typing users 2020-09-17 17:50:39 +03:00
Jussi Kuokkanen
7d72356318 Merge branch 'master' of https://github.com/Nheko-Reborn/nheko 2020-09-17 16:51:50 +03:00
Jussi Kuokkanen
e49691fe3b use Rectangle for typing users so it doesn't overlap with the timeline 2020-09-17 16:49:56 +03: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
Nicolas Werner
94e1b52ddd Single line click handler 2020-09-13 18:23:41 +02:00
Nicolas Werner
b934cf329c Clean up UserProfile a bit 2020-09-13 18:16:48 +02:00
Chethan2k1
f6a47ce72f Some fixes 2020-09-12 15:10:36 +05:30
Chethan2k1
a27662dc08 Making sure Verification Objects are deleted properly 2020-09-10 13:25:49 +05:30
Chethan2k1
e70b4e4268 Fix wrong tran_id issue 2020-09-10 11:09:21 +05:30
Chethan2k1
e8eeb480d5 Fix Wrong Emojis Issue in Room Verification 2020-09-04 12:02:24 +05:30
Nicolas Werner
e0981e17a1 Fix reactions 2020-09-03 09:37:02 +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
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
CH Chethan Reddy
2e20049b36 [WIP] Room-Verification Messages 2020-08-09 08:35:15 +05:30
Nicolas Werner
1e9efa3072 Try to fix variable timestamp width 2020-08-07 17:31:58 +02:00
Nicolas Werner
dbaddb0165 Further tweak text element 2020-08-06 19:19:13 +02:00
trilene
b86711a388 Merge remote-tracking branch 'upstream/master' into voip 2020-08-01 15:49:26 -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
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
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
b1362ca69f Use label in device verification dialogs (for proper theming) 2020-07-30 22:10:27 +05:30
Nicolas Werner
fed0463e57 Make emojis a bit smaller 2020-07-30 22:10:27 +05:30
Nicolas Werner
480c4bc8f5 Set proper emoji font for device verification 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
488cc5e73b First design iteration of device verification dialogs 2020-07-30 22:10:27 +05:30
Nicolas Werner
8bf26917ad Make long press menu actually work 2020-07-26 02:06:38 +02:00
Nicolas Werner
6f557c19a1 Optimize scrolling a little bit 2020-07-25 23:10:02 +02:00
Nicolas Werner
cbb4356b19 Fix more non integer heights 2020-07-25 22:10:30 +02:00
Nicolas Werner
fdcf91f5eb Fix binding loop and non integer text height 2020-07-25 22:08:02 +02:00
trilene
aec24efbe2 Specify call type on timeline 2020-07-24 13:30:12 -04: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
Lorem
e86c1cc79f Make dateBubble's text vertically aligned to vertical center 2020-07-19 12:22:47 +05:30
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
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
fe12e63c7c Fix parent undefined warning 2020-07-08 02:02:48 +02:00
Nicolas Werner
cded494cb5 Try to make text rendering in qml sharper 2020-06-19 19:34:03 +02:00
Nicolas Werner
dde28c627b Lower qt version used for emoji picker and scroll helper 2020-06-17 21:34:02 +02:00
Nicolas Werner
5c8ee99e9a Remove online indicator for offline users 2020-06-17 20:50:39 +02:00
Joseph Donofry
7afb164244
Merge remote-tracking branch 'origin/master' into presence 2020-06-11 22:27:30 -04:00
Joseph Donofry
5e355c36fd
Fix build issue on some versions of clang 2020-06-10 22:34:14 -04:00
Joseph Donofry
39b240e25a
Remove unused QML file 2020-06-09 21:31:19 -04:00
Joseph Donofry
0078c72a37
Remove signals in favor of direct function calls 2020-06-09 21:28:15 -04:00
Joseph Donofry
75cdc1eee2
Remove duplicate search icons 2020-06-09 21:21:30 -04:00
Joseph Donofry
07ffd9e7e9
Fix UserSettings in QML 2020-06-09 21:05:27 -04:00
Joseph Donofry
6bb73f84a3
Merge master and fix conflicts 2020-06-09 20:51:36 -04:00
Joseph Donofry
fa34749279
Minor adjustments to emoji picker 2020-06-09 20:47:21 -04:00
Nicolas Werner
96f4169be9 Show presence and set custom status messages 2020-06-08 01:59:05 +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
Joseph Donofry
5228861b88
Add reaction/redaction for in-line Reactions 2020-05-21 21:21:35 -04:00