mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 16:41:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
24733 commits 219 branches 562 tags 474 MiB
Commit graph

7536 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
ac0d794877 Fix: Tag_DM is not defined 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:49:56 +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
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
Michael Telatynski
e7d37228f2
Merge pull request #4603 from matrix-org/t3chguy/add_room_tooltip 
Label the create room button better than "Add room"
 2020-05-19 11:57:59 +01:00
Travis Ralston
38920e7f30 Merge branch 'develop' into travis/room-list-2 2020-05-18 23:23:59 -06:00
Travis Ralston
9aff2e836e
Merge pull request #4593 from matrix-org/travis/dispatcher-types 
Convert the dispatcher to TypeScript
 2020-05-18 23:22:32 -06:00
Jorik Schellekens
4deeef5fca Remove ability to remove avatars 2020-05-18 16:57:00 +01:00
Jorik Schellekens
17f535e5f8 Fix review problems 
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
 2020-05-18 16:37:10 +01:00
Michael Telatynski
1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour 
Consolidate password/passphrase fields into a component & add dynamic colour to progress
 2020-05-18 11:08:08 +01:00
Michael Telatynski
a864643d98 Label the create room button something better than "Add room" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-18 10:37:02 +01:00
Travis Ralston
798e7a1f86 Merge branch 'develop' into travis/dispatcher-types 2020-05-15 09:56:02 -06:00
David Baker
07eed94b35
Merge pull request #4600 from matrix-org/dbkr/fix_email_sent_to_blank 
Make email auth component fail better if server claims email isn't validated
 2020-05-15 14:33:20 +01:00
David Baker
523067e5f9 Make email auth component fail better if server claims email isn't validated 
https://github.com/matrix-org/synapse/issues/7512 means that (at least)
sometimes after clicking on the email validation link and being redirected
to riot, the server will claim the email identity auth stage is still incomplete.

This meant that we displayed the email identity UIA component but with an empty
email address, because we don't know that in the new session. Work around this by
assuming that if the email UIA component is being displayed but we don't have an
email address input, the link has been clicked and we're just waiting for the poll.

Also don't fire off an initial register request if we're already mid-UI-auth, because
that's confusing and unnecessary.

Also also remove unused requestingToken state.

Fixes https://github.com/vector-im/riot-web/issues/13434
 2020-05-15 13:32:12 +01:00
Michael Telatynski
5844bee8f2 Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks 
 Conflicts:
	src/components/views/avatars/BaseAvatar.js
 2020-05-15 00:16:41 +01:00
Michael Telatynski
89c16603fc Remove the now inlined ZxcvbnProgressBar.tsx 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 21:06:18 +01:00
Michael Telatynski
865495dd69 replace zxcvbn field in CreateSecretStorageDialog with PassphraseField 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 20:50:22 +01:00
Travis Ralston
6cb1efc1a4 Use the new TS dispatcher 2020-05-14 13:45:17 -06:00
Travis Ralston
2b4c19e9ba Merge branch 'travis/dispatcher-types' into travis/room-list-2 2020-05-14 13:40:37 -06:00
Michael Telatynski
cf3c4d9e5f Extract Password field from Registration into a reusable component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 20:20:36 +01:00
Travis Ralston
f8cbadaba5 Clean up comments in skeleton components 2020-05-14 12:53:00 -06:00