Commit graph

4274 commits

Author SHA1 Message Date
Nicolas Werner
a75d7f00bc Fix reactions binding loop 2020-05-16 22:19:37 +02:00
Joseph Donofry
f4ea0b215d
Attach emoji picker picked to reaction sender 2020-05-16 15:52:51 -04:00
Joseph Donofry
a5778bdf40
Merge remote-tracking branch 'origin/master' into reactions 2020-05-16 15:10:49 -04:00
Joseph Donofry
fca85bea39
Merge pull request #202 from aaronraimist/brew-libolm
Update macOS building dependencies now that libolm is available in Homebrew.  Thanks @aaronraimist
2020-05-16 15:10:16 -04:00
Aaron Raimist
3338ecd39f
Remove MacPorts install instructions
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-05-16 13:46:25 -05:00
Aaron Raimist
14eaad355e
Update macOS building dependencies now that libolm is available in Homebrew 2020-05-16 13:10:13 -05:00
DeepBlueV7.X
883567b0b9
Merge pull request #201 from lkito/master
Implemented message background highlight feature as per issue #193
2020-05-16 16:27:17 +02:00
lkito
2c21f6e3fa Implemented optional message body highlighting feature. 2020-05-16 17:15:43 +04:00
Nicolas Werner
3db9298e66 Bump mtxclient version 2020-05-16 00:10:59 +02:00
Nicolas Werner
73e0a9f453 Drop explicit ZLIB dependency 2020-05-15 22:48:30 +02:00
Nicolas Werner
576269c9e5 Prevent timeline being black on some platforms 2020-05-15 22:46:34 +02:00
Joseph Donofry
ca20e2a98f
Remove accidental compiled translation commit 2020-05-15 13:23:19 -04:00
DeepBlueV7.X
ce1c6a7df3
Merge pull request #198 from Chethan2k1/device-verification-dialogs
Fix nheko build(uses mtxclient device-verification)
2020-05-15 14:56:11 +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
DeepBlueV7.X
54e2e7ef7f Translated using Weblate (German)
Currently translated at 100.0% (277 of 277 strings)

Translation: Nheko/nheko
Translate-URL: http://weblate.nheko.im/projects/nheko/nheko-master/de/
2020-05-15 06:31:24 -04:00
Nicolas Werner
5a5b85cded Wait on maybe long running install script in CI 2020-05-15 11:11:31 +02:00
Nicolas Werner
10f0f7462a Try to fix arm builds hanging breaking CI 2020-05-15 10:39:32 +02:00
Joseph Donofry
6d2789f4d5
Merge master into reactions 2020-05-14 20:53:01 -04:00
Joseph Donofry
eb4b02e8b9
Merge branch 'master' of ssh://github.com/Nheko-Reborn/nheko 2020-05-14 20:35:47 -04:00
Joseph Donofry
18f934efad
Add un-encrypted warning icon for messages in encrypted rooms 2020-05-14 20:35:29 -04:00
Nicolas Werner
6ff002b4ed Use standard cmake args instead of old -H 2020-05-15 00:38:09 +02:00
Joseph Donofry
ff7468e6d5
Update emoji picker and translations 2020-05-13 20:19:15 -04:00
Nicolas Werner
279bcd1bf2 Show inline images
(This is such a hack and will probably break, but it works for now for
most cases...)
2020-05-14 00:41:10 +02:00
Nicolas Werner
2c3d09edbb Try to smooth scrolling a bit by increasing cacheBuffer 2020-05-13 23:55:02 +02:00
Nicolas Werner
d6981355d3 Align scrolling to pixels manually 2020-05-13 23:33:00 +02:00
Joseph Donofry
dfb76c693d
Update translations for new emoji picker 2020-05-13 00:39:08 -04:00
Joseph Donofry
ee4dcef90f
Add new QML-based emoji picker (work in progress)
This is necessary to support having a picker within QML.
Eventually, this should replace the existing widget-based one.
2020-05-13 00:36:41 -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
8984661187
Initial support for sending reactions 2020-05-09 22:39:25 -04:00
Nicolas Werner
000ab4853a Translation updates 2020-05-10 01:38:40 +02:00
Nicolas Werner
6befadeec8 Remove shadowing loginMethod 2020-05-10 01:00:20 +02:00
Nicolas Werner
9713284435 Fix not being able to log http status on login 2020-05-10 00:04:45 +02:00
Nicolas Werner
15716f5a34 bump mtxclient for SSO 2020-05-09 23:34:53 +02:00
Nicolas Werner
7b1fa60cc6 Add SSO
closes #94
2020-05-09 23:33:03 +02:00
Nicolas Werner
813790e603 Improve Login and Register page hinting 2020-05-09 23:33:03 +02:00
DeepBlueV7.X
197f702dd0
Merge pull request #195 from jonnius/patch-1
Update Ubuntu Build and Install Instructions
2020-05-09 12:22:05 +02:00
jonnius
5f9ce33562 Update Ubuntu install and build instructions 2020-05-09 12:17:47 +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
DeepBlueV7.X
7beaf868ef
Merge pull request #192 from Nheko-Reborn/reactions
Reactions
2020-05-08 00:13:24 +02:00
Nicolas Werner
a942ae9b93 Fix messages being immediately read again 2020-05-06 19:21:31 +02:00
Nicolas Werner
0b1d3a40f4 Remove unused binding name 2020-05-06 13:45:38 +02:00
Nicolas Werner
e48dfd15fe Add shortcuts to select/deselect reply targets 2020-05-06 13:33:13 +02:00
Nicolas Werner
e5a5a66716 Fix reaction redaction for real this time 2020-05-06 12:52:13 +02:00
Nicolas Werner
ff54ce9334 Fix rooms with a lot of reactions not paginating correctly 2020-05-06 11:37:40 +02:00
Nicolas Werner
e045e3eb1c Show displayname on reactions 2020-05-06 11:28:24 +02:00