Commit graph

24847 commits

Author SHA1 Message Date
Michael Telatynski
3f76b73b50
Merge pull request #4659 from matrix-org/t3chguy/dialog_cancel_space
Dialog wrap title instead of taking same space as the close/cancel button
2020-05-29 20:47:31 +01:00
Michael Telatynski
0b44e30517
Merge pull request #4627 from matrix-org/t3chguy/modular-utm
Update Modular hosting link
2020-05-29 20:16:13 +01:00
Travis Ralston
822a126cb6
Merge pull request #4663 from JorikSchellekens/develop
Fix field placeholder regression
2020-05-29 10:47:04 -06:00
Travis Ralston
e24773af83
Merge pull request #4667 from matrix-org/travis/uia/auth
Fix/document a number of UIA oddities
2020-05-29 08:33:49 -06:00
Travis Ralston
ea064afca4 Fix/document a number of UIA oddities
Edition 2 of https://github.com/matrix-org/matrix-react-sdk/pull/3211
Fixes https://github.com/vector-im/riot-web/issues/13837
2020-05-29 08:23:59 -06:00
Jorik Schellekens
6559fd499e Fix field placeholder regression 2020-05-28 21:09:42 +01:00
Jorik Schellekens
930b8ff901
Merge pull request #4662 from JorikSchellekens/joriks/appearance-tab
Stop copy icon repeating weirdly
2020-05-28 19:57:46 +01:00
Jorik Schellekens
1ab6f27535 Stop copy icon repeating weirdly. 2020-05-28 19:37:49 +01:00
Michael Telatynski
ab116e1e63
Merge pull request #4661 from matrix-org/t3chguy/notifier-race
Try and fix the Notifier race
2020-05-28 19:12:32 +01:00
Michael Telatynski
227fc24d3a delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 19:04:34 +01:00
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
Hubert Chathi
ec24350801
Merge pull request #4657 from matrix-org/uhoreg/keytar
set the client's pickle key if the platform can store one
2020-05-28 13:52:02 -04: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
Hubert Chathi
dc4a2191c1 really fix types 2020-05-28 12:04:32 -04:00
Hubert Chathi
0859827910 fix types 2020-05-28 11:56:48 -04:00
Michael Telatynski
03058bacbd Dialog wrap title instead of taking same space as the close/cancel button
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 16:48:50 +01:00
Hubert Chathi
30120dc0c7 Merge remote-tracking branch 'upstream/develop' into keytar 2020-05-28 11:15:36 -04: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
Hubert Chathi
73c35ff80e set the client's pickle key if the platform can store one 2020-05-28 00:05:45 -04: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