Commit graph

80 commits

Author SHA1 Message Date
Nicolas Werner
4802c34009 Merge remote-tracking branch 'origin/master' into cross-signing 2020-09-24 21:36:43 +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
Nicolas Werner
75d7c2608a Update translations 2020-09-19 15:32:33 +02:00
Nicolas Werner
b05c101021 Fix null errors in qml 2020-09-16 23:49:17 +02:00
CH Chethan Reddy
b174bd9380 Merge remote-tracking branch 'upstream/master' into device-verification 2020-08-30 22:27:14 +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
1fcd768f88 Adding Room Key Verification Stuff 2020-07-30 22:10:27 +05:30
Nicolas Werner
4862be06be Fix presence indicator 2020-07-30 22:10:27 +05:30
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
9ae7d0dce3 Readd pagination and fix redactions 2020-07-13 00:08:58 +02:00
trilene
7a206441c8 Support voice calls 2020-07-10 19:19:48 -04:00
Joseph Donofry
6bb73f84a3
Merge master and fix conflicts 2020-06-09 20:51:36 -04: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
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
6d2789f4d5
Merge master into reactions 2020-05-14 20:53:01 -04:00
Nicolas Werner
004d10bfee Clip replies by default
In the future we should probably add a gradient when clipped...
2020-05-13 01:09:45 +02:00
Joseph Donofry
991fa4ac98
Change redaction color that accidentally got committed 2020-05-07 22:22:41 -04:00
Joseph Donofry
5b9611dcd3
Merge branch 'master' into reactions 2020-05-07 22:21:06 -04:00
Joseph Donofry
cc92161339
Fix redaction color change that accidentally got committed 2020-05-07 22:20:25 -04:00
Joseph Donofry
a1661f7006
merge master into reactions 2020-05-07 20:53:24 -04:00
Nicolas Werner
ca5490074a Fix scroll to replied to message (somewhat) 2020-05-05 23:43:28 +02:00
Lasath Fernando
c5d373e8f1 Address CR comments 2020-04-29 02:14:43 -07:00
Lasath Fernando
5c57de070e Remove commented out code; fix padding for Pill 2020-04-28 01:10:54 -07:00
Lasath Fernando
84c5ff0bcb Fix binding loops for height 2020-04-28 00:38:13 -07:00
Nicolas Werner
6a39b29acc Disable opening images, when they are not loaded 2020-04-21 20:55:28 +02:00
Nicolas Werner
537cc966cc Use Item for transparent rectangles 2020-04-10 08:48:30 +02:00
Nicolas Werner
d68b24188f Size reply background by contents 2020-04-10 08:48:30 +02:00
Nicolas Werner
d2e495532d Make Filemessage background size by content 2020-04-10 08:48:30 +02:00
Nicolas Werner
6794b6472d Add a few missing palette colors 2020-04-08 23:10:00 +02:00
Nicolas Werner
d35cc3dda4 Use palette for qml code for theming
Can't do it for QtWidgets code. We need to fully transition, before we
can fully switch over probably.
2020-03-29 22:11:33 +02:00
Nicolas Werner
a071f55c7b Fix images without size 2020-03-08 14:39:22 +01:00
DeepBlueV7.X
fc2f08a186
Merge pull request #137 from Nheko-Reborn/blurhash
Experimental Blurhash support
2020-03-05 21:07:18 +00:00
Nicolas Werner
b894ce4dcd Make blurhash provider async 2020-03-04 01:56:58 +01:00
Adasauce
ed4bb1a576
Add support for more room events in timeline 2020-03-03 15:06:52 -04:00
Nicolas Werner
0fc98b2692 Experimental blurhash implementation (MXC2448) 2020-03-03 02:34:26 +01:00
Nicolas Werner
b1eff0a37f Improve link theming 2020-02-27 00:34:58 +01:00
Nicolas Werner
4d79f8078e Don't let click on reply steal focus from the replied to elements 2020-02-26 23:43:54 +01:00
Nicolas Werner
6bdc75d073 Reset user colors on theme change (in qml timeline) 2020-02-20 20:51:07 +01:00
Nicolas Werner
284fc8eaa8 Improve styling of emote messages 2020-02-09 01:24:24 +01:00
Nicolas Werner
d330020fdd Improve styling a bit 2020-02-03 19:21:03 +01:00
Nicolas Werner
4951241d23 Simplify reply popup logic 2020-01-28 19:08:16 +01:00
Nicolas Werner
3319e0ec20 Fix resize loop of images in reply popup 2020-01-28 17:08:49 +01:00
Nicolas Werner
e9267ffc76 Show event type string in placeholder 2020-01-23 20:59:17 +01:00
Nicolas Werner
86960e67ec Implement display of membership events 2020-01-23 20:34:04 +01:00
Nicolas Werner
4eb0e11740 Try to match old theme better 2020-01-14 20:44:11 +01:00
Nicolas Werner
4727f1c2bb Fetch missing events for replies 2020-01-11 18:53:32 +01:00
Nicolas Werner
2b3dc3d8b9 Implement fancy reply rendering
This currently assumes the event, that is replied to, is already
fetched. If it isn't, it will render an empty reply. In the future we
should fetch replies before rendering them.
2020-01-11 14:07:51 +01:00