Commit graph

82 commits

Author SHA1 Message Date
Joseph Donofry
6bb73f84a3
Merge master and fix conflicts 2020-06-09 20:51:36 -04: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
Joseph Donofry
1c521d1711
Merge origin/master into reactions 2020-05-18 21:13:41 -04:00
Nicolas Werner
23e4408fa8 Add /roomnick command 2020-05-18 14:02:14 +02:00
Joseph Donofry
a5778bdf40
Merge remote-tracking branch 'origin/master' into reactions 2020-05-16 15:10:49 -04:00
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
Joseph Donofry
6d2789f4d5
Merge master into reactions 2020-05-14 20:53:01 -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
000ab4853a Translation updates 2020-05-10 01:38:40 +02:00
Nicolas Werner
7b1fa60cc6 Add SSO
closes #94
2020-05-09 23:33:03 +02:00
Joseph Donofry
a1661f7006
merge master into reactions 2020-05-07 20:53:24 -04:00
Nicolas Werner
692c6119b4 Fix joined rooms dropping to the bottom at first 2020-05-05 19:08:59 +02:00
Nicolas Werner
dad2de7ba2 Add support for db migrations 2020-05-02 16:44:50 +02:00
Nicolas Werner
17c657a170 Send correct orientation for exif rotated images 2020-04-26 11:41:30 +02:00
Nicolas Werner
d6386546b3 Only prune old messages every 500 syncs 2020-04-26 11:29:05 +02:00
Nicolas Werner
d94ac86816 Fix double percent encoding of invites 2020-04-24 16:19:11 +02:00
Nicolas Werner
dcddea6fb8 Fix reply not closing
fixes #124
2020-04-13 16:22:30 +02:00
Nicolas Werner
2022775dd0 Clear notifications when event is read 2020-04-11 01:09:47 +02:00
Nicolas Werner
7a2b996f18 Fix high CPU usage on 5XX error codes 2020-03-22 20:33:15 +01:00
Nicolas Werner
7df6529310 Fix avatar not being set for some rooms in the top bar 2020-03-22 18:14:53 +01:00
Emi Simpson
6bbe8ade0f
Made merge compatible with master 2020-03-15 12:16:01 -04:00
Emi Simpson
b6bd36ac16
Added toggle in the settings to ignore minor events 2020-03-15 11:19:22 -04:00
Nicolas Werner
69a50c15c7 Reduce times we read upload data 2020-03-08 15:26:52 +01:00
Nicolas Werner
5ac18f1f5f Speed up blurhash code 2020-03-04 01:30:43 +01:00
Nicolas Werner
0fc98b2692 Experimental blurhash implementation (MXC2448) 2020-03-03 02:34:26 +01:00
Nicolas Werner
46a77a8c11 Fix linter issue 2020-02-05 22:43:33 +01:00
Joseph Donofry
096db389d1
Make closing the reply popup actually clear the reply message 2020-02-04 18:17:14 -05:00
Nicolas Werner
4cd260bfcf Optimize includes a bit 2020-01-31 15:11:21 +01:00
Nicolas Werner
558fd10f7b Add next/prev room shortcuts 2020-01-31 01:39:51 +01:00
Nicolas Werner
b541cecd2e Enable ban and kick button in UserProfile (and try to fix centering) 2020-01-30 03:45:27 +01:00
Nicolas Werner
75c5c01189 Merge branch 'plain-text-messages' into 0.7.0-dev 2020-01-29 00:42:46 +01:00
Nicolas Werner
b0ff1baa1d Add command for invite,kick,ban and unban 2020-01-29 00:30:53 +01:00
Joseph Donofry
2b8b04a04b
Add initial QML Reply Popup 2020-01-27 23:28:11 -05:00
Nicolas Werner
e2f547149a Allow sending messages as plain text 2020-01-27 15:59:25 +01:00
Nicolas Werner
fe912240bc Move typing display to qml 2020-01-17 01:25:14 +01:00
Nicolas Werner
4ca8da9a89 Allow replying with an image 2020-01-12 17:07:22 +01:00
Nicolas Werner
5fc1f3bd67 Reduce overhead of Cache.h 2019-12-15 02:56:04 +01:00
Nicolas Werner
659e36b113 Update to c++17 2019-12-14 18:59:38 +01:00
Nicolas Werner
31b00c445b Send encrypted files as generic mimetype and actually set url 2019-12-12 23:17:17 +01:00
Nicolas Werner
43d7fe0d35 Implement sending encrypted files 2019-12-05 15:31:53 +01:00
Nicolas Werner
91d1f19058 Remove old timeline 2019-11-23 20:07:15 +01:00
Nicolas Werner
aee29c6ed5 Reenable redactions 2019-11-23 20:06:15 +01:00
Nicolas Werner
0d3c9390c6 Rename initialize to sync, since it does the same thing 2019-11-23 20:06:15 +01:00
Nicolas Werner
8e611abe87 Replace timeline with empty qml view 2019-11-23 20:06:14 +01:00
Nicolas Werner
52056a79fa Try to reduce memory usage by reusing avatar pixmaps 2019-08-26 08:51:56 +02:00
Joseph Donofry
8d04236fbd
Fix build issues w/ clang 2019-08-19 18:54:17 -04:00
Joseph Donofry
bcdd97c85f
More updates to mentions functionality 2019-08-19 18:11:38 -04:00
Joseph Donofry
52a2621776
Fix issues with caching and loading of mentions.
Mentions are now loaded from the cache instead of
directly from the web request.  Mentions are also
properly saved to the cache now (instead of as empty
strings).  Still lots of tweaks left on this feature.
2019-08-12 22:09:40 -04:00