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

1773 commits

Author SHA1 Message Date
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
c9d5ed4d00 i18n 2020-05-28 14:32:20 +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
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
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
352727906e i18n 2020-05-26 13:40:36 +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
8062e5a6e8
Merge pull request #4634 from matrix-org/t3chguy/passphrase-copy 
Update confirm passphrase copy
 2020-05-26 12:02:27 +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
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
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
c73c3ae927 Update confirm passphrase copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 11:35:21 +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
3d2b56aecd i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:23:23 +01:00
Michael Telatynski
891ba1bbe3 Replace New Version Bar with a Toast 
discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:08:45 +01:00
Michael Telatynski
9f060d1132 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:34:32 +01:00
Michael Telatynski
c91f8c2631 Migrate Analytics Banner to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:04:21 +01:00
Michael Telatynski
49c0748990 delint and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 14:32:41 +01:00
Michael Telatynski
a822ab49d5 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:40:30 +01:00
David Baker
6bfa31cd47 run i18n which is unhappy about 'create room' for some reason 2020-05-22 10:34:00 +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
Michael Telatynski
6a0ffe905f Iterate text alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:12:16 +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
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
Jorik Schellekens
bba6b2c441 Appease i18n 2020-05-18 17:06:54 +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
Michael Telatynski
f2979f3fd8 replace zxcvbn field in CreateKeyBackupDialog with PassphraseField 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 20:59:46 +01:00
Travis Ralston
9fbd489b3b Update i18n 2020-05-14 13:03:43 -06:00
Travis Ralston
df3d5c4159 Update i18n for room list 2020-05-14 12:46:16 -06:00
Travis Ralston
08419d195e Initial breakout for room list rewrite 
This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593)
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
 2020-05-14 12:44:29 -06:00
Michael Telatynski
562c5aa9c5
Merge pull request #4588 from matrix-org/t3chguy/kbd1 
Add new keyboard shortcuts for jump to unread and upload file
 2020-05-14 19:29:09 +01:00
Michael Telatynski
239197a3cb
Merge pull request #4394 from matrix-org/t3chguy/qrcode 
wrap node-qrcode in a React FC and use it for ShareDialog
 2020-05-14 17:31:26 +01:00
Travis Ralston
acc17e6026
Merge pull request #4584 from matrix-org/travis/deactivate-fix 
Acquire a new session before enacting deactivation
 2020-05-14 07:52:17 -06:00
Michael Telatynski
1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode 
 Conflicts:
	package.json
 2020-05-14 10:50:42 +01:00
Bruno Windels
4a8e642400
Merge pull request #4581 from matrix-org/bwindels/remove-asym-4s 
Remove UI for upgrading 4S to symmetric encryption
 2020-05-14 08:10:39 +00:00
Travis Ralston
9dd93f14ba
Merge pull request #4555 from matrix-org/travis/sso-xsigning 
Add copy to SSO prompts during cross-signing setup
 2020-05-13 15:33:09 -06:00
Jorik Schellekens
312b616d77 fix i18n 2020-05-13 14:11:16 +01:00
Michael Telatynski
0e05e6db86 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-13 10:40:23 +01:00
Travis Ralston
5e86dc2d60 Update i18n strings 2020-05-12 17:20:11 -06:00
David Baker
8b8eb7d3c0
Merge pull request #4580 from matrix-org/dbkr/dont_npe_if_no_device 
Avoid soft crash if unknown device in verification
 2020-05-12 14:36:54 +01:00
David Baker
a000be2b01 i18n 2020-05-12 14:03:40 +01:00
Bruno Windels
b3c641184b remove obsolete strings 2020-05-12 14:54:49 +02:00