nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
24,747 Commits 258 Branches 582 Tags
b7428fcf35f5f391f39a1ff4e3c2408f9ce4a08e
Commit Graph

10495 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Michael Telatynski
5e00481639 Fix sentMessageAndIsAlone by dispatching message_sent more consistently 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-24 13:08:29 +01:00
Michael Telatynski
22dba5f794 Merge branches 't3chguy/toasts3' and 't3chguy/toasts3_1' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_1 2020-05-23 11:22:19 +01:00
Michael Telatynski
880e16aaa2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
	test/components/views/messages/TextualBody-test.js
 2020-05-23 11:12:58 +01:00
Michael Telatynski
efeb8a8487 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 2020-05-23 11:01:36 +01:00
Travis Ralston
3a3ddbf7c4 Add missing documentation 2020-05-22 18:10:30 -06:00
Travis Ralston
a19e27d11c Calculate badges in the new room list more reliably 
Fixes https://github.com/vector-im/riot-web/issues/13757

This uses a different way of calculating the badges by using about 6 less variables, and consolidating the remaining ones down.
 2020-05-22 18:05:09 -06:00
Michael Telatynski
4e67e46863 fix countSeen 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 14:29:30 +01:00
Michael Telatynski
c464abaa49 Iterate toast count indicator more logically 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 14:28:01 +01:00
Michael Telatynski
ac0d794877 Fix: Tag_DM is not defined 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:49:56 +01:00
Michael Telatynski
14cee41360 Convert things to Typescript and re-use a generic component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:29:53 +01:00
Michael Telatynski
b21e5ba10b Set new granular priorities 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 12:57:48 +01:00
Michael Telatynski
dc37469808 Convert ToastContainer and ToastStore to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 12:47:40 +01:00
Travis Ralston
7ff850deea Merge pull request #4253 from matrix-org/travis/room-list-2 
Rewrite the room list store
 2020-05-21 13:30:32 -06:00
Travis Ralston
559dd98d01 Fix comment style to be less bothersome 2020-05-21 11:53:16 -06:00
Michael Telatynski
f539a960e1 re-add brackets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:50:32 +01:00
Michael Telatynski
1dfd62c142 iterate alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:47:35 +01:00
Michael Telatynski
6a0ffe905f Iterate text alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:12:16 +01:00
Michael Telatynski
7e7c48e046 Improve style of toasts to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 16:32:19 +01:00
David Baker
5d1c01fd6f Fix key backup restore with SSSS 
The room / session ID params come after the backupInfo for restoring
from SSSS so the options object was being passed into the wrong param.
Roll on TypeScript.

This meant restoring backups worked fine when the key was cached but
failed when it wasn't.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4507
 2020-05-21 12:26:27 +01:00
Jorik Schellekens
50a44405f0 CONSTANT_CASING 2020-05-20 15:17:47 +01:00
Jorik Schellekens
82b76192ae Fixes, lints and i18n 2020-05-20 14:44:56 +01:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
55e72dd5bf Remove min and max font setting 2020-05-20 13:45:54 +01:00
Jorik Schellekens
3e30df17fb Slider is more responsive 2020-05-20 13:07:33 +01:00
Travis Ralston
b96c1ada8a Merge pull request #4494 from pv/auxpanel-scrolling-persisted 
Prevent PersistedElements overflowing scrolled areas
 2020-05-19 15:28:58 -06:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00