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

4074 commits

Author SHA1 Message Date
David Baker
b83ecb1781 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-02 18:53:54 +01:00
David Baker
0046e204a0 Make the continue button actually work 2020-06-02 18:30:37 +01:00
David Baker
5624cf5ceb Add option to reset keys to the encryption setup screen 2020-06-02 17:55:27 +01:00
David Baker
e06ba2003b Prompt for recovery key on login rather than passphrase 
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
 2020-06-02 16:32:15 +01:00
J. Ryan Stinnett
0717c7749e
Merge pull request #4347 from MTRNord/fix-register-auth-with-new-spec 
Make auth argument in the register request compliant with r0.6.0
 2020-06-02 10:14:09 +01:00
Travis Ralston
ad617f9e3a Remove unused TagPanelButtons 
This isn't used, and is just confusing. The feedback dialog is still used by the top left menu.
 2020-06-01 15:35:08 -06:00
Jorik Schellekens
5bba62c28b Pass roomId to IRCTimelineProfileResizer 2020-06-01 18:27:10 +01:00
Jorik Schellekens
df18638164 useIRCLayout moved to props 2020-06-01 17:34:42 +01:00
Jorik Schellekens
419857c29c
Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression 
Fix FilePanel and NotificationsPanel regression
 2020-05-31 21:17:14 +01:00
Jorik Schellekens
b61f1704d3
Merge branch 'develop' into joriks/fix-filepanel-regression 2020-05-29 19:14:19 +01:00
Michael Telatynski
efd0da44a1 Give contextual feedback for manual update check instead of banner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 18:24:45 +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
81922231ed Move Appearance tab to ts 2020-05-28 13:55:07 +01:00
Travis Ralston
9e2d80b8c8 Update documentation and auth dict submissions 2020-05-27 13:16:49 -06:00
Travis Ralston
81cae66732 Merge branch 'develop' into fix-register-auth-with-new-spec 2020-05-27 12:02:46 -06: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
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
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
Jorik Schellekens
fcbd197e7d Fix file list regression 2020-05-26 15:56:16 +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
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
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
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
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
4193426808 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:14:33 +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
ccf9e65123 Migrate Server Limit Bar Banner to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:27:19 +01:00
Michael Telatynski
5d0040b8b3 Migrate Password Nag Bar Banner to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:15:22 +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
3732d1f5a5 Migrate Desktop Notifications MatrixToolbar to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 21:56:25 +01: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
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
Michael Telatynski
37bd59bf90 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/peeking-races 2020-05-22 11:18:19 +01:00
Michael Telatynski
67ffe94df4 Fix typo and improve error context 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 11:18:14 +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
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
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
Jorik Schellekens
286828b3bb Disable irc mode in notifiactions panel 2020-05-19 16:15:13 +01:00
Michael Telatynski
af2eed2228 Fix room alias lookup vs peeking race condition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-19 13:18:50 +01:00