mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 19:56:47 +03:00
Code Issues Projects Releases Packages Wiki Activity
24830 commits 214 branches 561 tags 414 MiB
Commit graph

24830 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
2530ec8419 Try and fix the Notifier race 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 19:03:42 +01:00
Michael Telatynski
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2 
Migrate Banners to Toasts
 2020-05-28 18:21:28 +01:00
Michael Telatynski
c4d6367a17 Swap priorities of Desktop Notifications and Update toasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 17:30:43 +01:00
Jorik Schellekens
4bee6532e1
Merge pull request #4658 from JorikSchellekens/joriks/appearance-tab-ts 
Move Appearance tab to ts
 2020-05-28 14:54:05 +01:00
Jorik Schellekens
9034889414 Reorder interfaces 2020-05-28 14:43:01 +01:00
Jorik Schellekens
c9d5ed4d00 i18n 2020-05-28 14:32:20 +01:00
Jorik Schellekens
81922231ed Move Appearance tab to ts 2020-05-28 13:55:07 +01:00
Michael Telatynski
0fd5714e21
Merge pull request #4606 from matrix-org/t3chguy/peeking-races 
Fix room alias lookup vs peeking race condition
 2020-05-27 17:07:12 +01:00
Jorik Schellekens
46134f5368
Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc 
Fix encryption icon miss-alignment
 2020-05-27 17:05:32 +01:00
Jorik Schellekens
5c3208d942
Merge pull request #4649 from JorikSchellekens/joriks/fix-sublist-sizing-regression 
Fix sublist sizing regression
 2020-05-27 17:04:49 +01:00
Jorik Schellekens
d534ca0e2b
Merge pull request #4650 from JorikSchellekens/joriks/fix-irc-codeblocks 
Fix lines overflowing room list width
 2020-05-27 17:03:53 +01:00
Michael Telatynski
71108fcf39 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 17:02:32 +01:00
Michael Telatynski
7486338efa Fix.the.tests. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 16:51:04 +01:00
Michael Telatynski
e35c9d5bbf more testing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 15:18:43 +01:00
Michael Telatynski
cb07fa53f4 test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 15:05:40 +01:00
Michael Telatynski
63ac1cb4ab debug some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:56:24 +01:00
Michael Telatynski
f3dfdbe746 debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:36:44 +01:00
Michael Telatynski
91811581bc fix assertNoToasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:35:59 +01:00
Michael Telatynski
61066b0c4c test it again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 14:27:09 +01:00
Michael Telatynski
627b568588 check if it is a race 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:48:20 +01:00
Michael Telatynski
841ce74ac2 Fix assert vs assert.equal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:39:00 +01:00
Michael Telatynski
faaca43a75 more loggin' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:35:15 +01:00
Michael Telatynski
37c875b863 improve end to end tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:23:49 +01:00
Michael Telatynski
d9552c7f5c e2e test toasts v2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 13:10:28 +01:00
Michael Telatynski
7b6d49c416 e2e test toasts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:57:45 +01:00
Michael Telatynski
b7c688d328 test e2e tests workaround 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:40:38 +01:00
Michael Telatynski
48de174576 remove debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:20:20 +01:00
Michael Telatynski
efa47f1a8e Change out debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 12:02:51 +01:00
Michael Telatynski
3dade4e759 tweak 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 11:48:48 +01:00
Michael Telatynski
254ed4b1b6 Add debug lined to figure out e2e test failure 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 11:33:42 +01:00
David Baker
8bac26c5e3
Merge pull request #4648 from matrix-org/dbkr/remove_keyshare_dialog 
Remove the keyshare dialog
 2020-05-27 10:24:33 +01:00
Michael Telatynski
c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
Travis Ralston
515304d32e
Merge pull request #4654 from matrix-org/travis/roomlist/badge-updates 
Update badge counts in new room list as needed
 2020-05-26 20:06:17 -06:00
Travis Ralston
8370fa8bb4 Event.decrypted from the client 2020-05-26 19:56:56 -06:00
Travis Ralston
bf8a3d4419 Bind to the room instead of the client 
Also add the other missing deregister handlers
 2020-05-26 16:20:51 -06:00
Travis Ralston
a9c54153ee Update badge counts in new room list as needed 2020-05-26 14:16:33 -06:00
poljar
6c10cbc903
EventIndex: Use a warning when redactions don't have an event id. 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-05-26 21:48:10 +02:00
Damir Jelić
58f0814530 EventIndex: Handle invalid m.room.redaction events correctly. 
Clients might send invalid redaction events, such events will not have a
valid redacts field containing the event id of the associated event that
was redacted.

Skip such events instead of ending up looping over the checkpoint
forever.
 2020-05-26 21:27:45 +02:00
Damir Jelić
403a64bcc6 EventIndex: Print out the checkpoint if there was an error during a crawl. 2020-05-26 20:48:22 +02:00
Jorik Schellekens
73213422a9 fix encryption icon missalignment 2020-05-26 18:15:06 +01:00
Jorik Schellekens
792859b939 Fix lines overflowing room list width 2020-05-26 17:39:39 +01:00
Jorik Schellekens
d8836f0f4b Fir sublist sizing regression 2020-05-26 17:09:42 +01:00
David Baker
a496dafd41 Remove the keyshare dialog 
Fixes https://github.com/vector-im/riot-web/issues/11908
 2020-05-26 16:51:20 +01:00
Jorik Schellekens
076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts 
Move Field to Typescript
 2020-05-26 16:13:03 +01:00
Bruno Windels
3fc060c754
Merge pull request #4646 from matrix-org/bwindels/detectnetworkfailureforjoin 
Use connection error to detect network problem
 2020-05-26 14:18:06 +00:00
Bruno Windels
f3ac96fa56
Merge pull request #4641 from matrix-org/bwindels/defaultfontsize 
Revert default font size to 15px
 2020-05-26 13:26:03 +00:00
Bruno Windels
cfe5173235 use connection error to detect network problem 2020-05-26 15:23:12 +02:00
Bruno Windels
d45a597528
Merge pull request #4645 from matrix-org/bwindels/addloggingforfailtojoinroom 
Add logging when room join fails
 2020-05-26 13:22:22 +00:00
Bruno Windels
f1282179fb add logging when we fail to join a room 2020-05-26 14:58:09 +02:00
David Baker
e5c4d6fdcd
Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog 
Remove EncryptedEventDialog
 2020-05-26 13:55:02 +01:00