Michael Telatynski
|
ccd0c952e3
|
Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer
Conflicts:
src/components/views/rooms/MessageComposer.js
|
2020-05-29 14:53:42 +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 |
|
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 |
|
Jorik Schellekens
|
9034889414
|
Reorder interfaces
|
2020-05-28 14:43:01 +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 |
|
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 |
|
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
|
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 |
|
Jorik Schellekens
|
73213422a9
|
fix encryption icon missalignment
|
2020-05-26 18:15:06 +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 |
|
David Baker
|
e5c4d6fdcd
|
Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog
Remove EncryptedEventDialog
|
2020-05-26 13:55:02 +01:00 |
|
Michael Telatynski
|
b7428fcf35
|
Merge pull request #4618 from matrix-org/t3chguy/toasts3
Migrate Toasts to Typescript and to granular priority system
|
2020-05-26 13:48:47 +01:00 |
|
David Baker
|
d2fe4bcecd
|
Unused imports
|
2020-05-26 13:46:47 +01:00 |
|
Michael Telatynski
|
0cec16d3b1
|
Merge pull request #4632 from matrix-org/t3chguy/confusing_copy
Update Crypto Store Too New copy
|
2020-05-26 13:45:40 +01:00 |
|
Michael Telatynski
|
d1084afb92
|
Merge pull request #4643 from matrix-org/t3chguy/fix-memberavatar
MemberAvatar should not have its own letter fallback, it should use BaseAvatar
|
2020-05-26 13:41:15 +01:00 |
|
Michael Telatynski
|
c74d890774
|
Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3
Conflicts:
src/@types/global.d.ts
src/components/structures/ToastContainer.tsx
|
2020-05-26 13:38:17 +01:00 |
|
David Baker
|
7e45a71a8a
|
Remove EncryptedEventDialog
https://github.com/matrix-org/matrix-react-sdk/pull/4412 disabled it
when cross signing was enabled so it is essentially gone now anyway.
Fixes https://github.com/vector-im/riot-web/issues/11752
|
2020-05-26 13:37:57 +01:00 |
|
Michael Telatynski
|
0713139dc5
|
Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy
|
2020-05-26 13:35:18 +01:00 |
|
Michael Telatynski
|
f8d2124aa3
|
MemberAvatar should not have its own letter fallback, it should use BaseAvatar's
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-26 13:33:47 +01:00 |
|
Jorik Schellekens
|
ba3fe850e0
|
Implement review
- lint member order
- cleaner type coersion
- specify access modifiers everywhere
|
2020-05-26 12:09:23 +01:00 |
|
Michael Telatynski
|
a64de63f00
|
Merge pull request #4633 from matrix-org/t3chguy/group-view-guest
fix viewGroup to actually show the group if possible
|
2020-05-26 12:03:52 +01:00 |
|
Michael Telatynski
|
e049ead25f
|
Merge pull request #4636 from matrix-org/t3chguy/emojipickera11y
Improve accessibility of the emoji picker
|
2020-05-26 12:02:07 +01:00 |
|
Michael Telatynski
|
c00fd326c5
|
Merge pull request #4613 from matrix-org/t3chguy/toasts1
Improve style of toasts to match Figma
|
2020-05-26 11:59:58 +01:00 |
|
Michael Telatynski
|
47af85b7b9
|
Merge pull request #4628 from matrix-org/t3chguy/message_sent
Fix sentMessageAndIsAlone by dispatching `message_sent` more consistently
|
2020-05-26 11:58:14 +01:00 |
|
Michael Telatynski
|
707e22ad09
|
Merge pull request #4402 from matrix-org/t3chguy/alias
Replace `alias` with `address` in copy for consistency
|
2020-05-26 09:36:58 +01:00 |
|
Travis Ralston
|
0cec74cc2b
|
Appease the linter (and the project)
Also export the interface that the project expects to be able to import :|
|
2020-05-25 15:59:15 -06:00 |
|
Michael Telatynski
|
ddcfe881c4
|
Merge pull request #4629 from matrix-org/t3chguy/fix-baseavatar-hooks
Fix BaseAvatar wrongly retrying urls
|
2020-05-25 22:29:22 +01:00 |
|
Michael Telatynski
|
608a1feb03
|
Merge pull request #4637 from matrix-org/t3chguy/edit_highlights
Fix event highlights not being updated to reflect edits
|
2020-05-25 19:05:50 +01:00 |
|
Michael Telatynski
|
0861b1fbec
|
remove redundant props
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-25 19:05:02 +01:00 |
|
Michael Telatynski
|
148f215d4e
|
clean up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-25 19:02:44 +01:00 |
|
Jorik Schellekens
|
dfc73626fa
|
Fix import
|
2020-05-25 18:18:47 +01:00 |
|
Jorik Schellekens
|
fc1f14f5aa
|
Appease the types
|
2020-05-25 17:53:09 +01:00 |
|
Jorik Schellekens
|
303691eb72
|
Missing export
|
2020-05-25 17:37:07 +01:00 |
|
Jorik Schellekens
|
b4624baf2f
|
Merge branch 'develop' into joriks/field-ts
|
2020-05-25 17:29:25 +01:00 |
|
Jorik Schellekens
|
5c9398a6b1
|
Types exiliary files
|
2020-05-25 16:47:57 +01:00 |
|
Michael Telatynski
|
1a47ceb322
|
Fix event highlight with edits
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-25 16:17:46 +01:00 |
|
Michael Telatynski
|
6677a3f20e
|
Implement Tabs with Automatic Activation pattern for EmojiPicker header
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-25 15:46:44 +01:00 |
|
Michael Telatynski
|
457f4c82db
|
Make some ARIA promises
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-25 14:59:03 +01:00 |
|
Travis Ralston
|
0e41bde875
|
Merge pull request #4625 from matrix-org/travis/new-badges
Calculate badges in the new room list more reliably
|
2020-05-25 06:48:16 -06:00 |
|
Jorik Schellekens
|
63f78b0808
|
Move tooltip to ts
|
2020-05-25 13:40:05 +01:00 |
|
Michael Telatynski
|
c372e8edee
|
fix viewGroup to actually show the group if possible
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-25 11:29:56 +01:00 |
|
Michael Telatynski
|
1f52b5e203
|
Update Crypto Store Too New copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-25 10:59:31 +01:00 |
|
Michael Telatynski
|
cf7acded50
|
Simply BaseAvatar hooks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-24 14:12:16 +01:00 |
|