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

242 commits

Author SHA1 Message Date
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