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

24621 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
4892d8cdd0 Merge branches 't3chguy/toasts3' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-23 11:19:20 +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
Michael Telatynski
d29ba5b597 fix priority sorting to highest first 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-23 09:02:35 +01:00
Michael Telatynski
3d2b56aecd i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:23:23 +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
9f060d1132 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:34:32 +01:00
Michael Telatynski
29cfb47a83 fix copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:33:13 +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
89292ca47b Fix toast priority sorting to put the highest priority into slot[0] 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:03:16 +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
a977b8c4ca Fix lifecycle to reset things before it starts them 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 21:55:43 +01:00
Michael Telatynski
08fadb092c Remove redundant component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 21:43:15 +01:00
Michael Telatynski
696f158be0
Merge pull request #4614 from matrix-org/t3chguy/toasts2 
Convert BasePlatform and BaseEventIndexManager to Typescript
 2020-05-22 14:57:25 +01:00
RiotRobot
af59d3a094 Reset matrix-js-sdk back to develop branch 2020-05-22 14:14:09 +01:00
RiotRobot
5ec8459468 Merge branch 'master' into develop 2020-05-22 14:13:01 +01:00
Michael Telatynski
50f3e26586
Merge pull request #4619 from matrix-org/t3chguy/tag_dm_regr 
Fix: Tag_DM is not defined
 2020-05-22 14:03:56 +01:00
RiotRobot
5a4da13e86 v2.6.1 2020-05-22 14:00:29 +01:00
RiotRobot
762918d664 Prepare changelog for v2.6.1 2020-05-22 14:00:29 +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
J. Ryan Stinnett
1c3c084491
Merge pull request #4617 from matrix-org/jryans/release-4612 
Fix key backup restore with SSSS
 2020-05-22 13:43:26 +01:00
J. Ryan Stinnett
88df8790df
Merge pull request #4616 from matrix-org/jryans/release-4607 
Remove SSSS key upgrade check from rageshake
 2020-05-22 13:43:17 +01:00
Michael Telatynski
a822ab49d5 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:40:30 +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
3bf5e003a1 Convert DeviceListener to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 12:54:03 +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
David Baker
0201655538 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-22 12:39:15 +01:00
David Baker
badda5ae81 Remove SSSS key upgrade check from rageshake 
This code doesn't exist anymore as the SSSS symmetric upgrade stuff
has been removed.

Fixes https://github.com/vector-im/riot-web/issues/13715
 2020-05-22 12:36:27 +01:00
David Baker
ac91304d8a
Merge pull request #4615 from matrix-org/travis/fix-timestamps 
Fix visibility of message timestamps
 2020-05-22 10:47:41 +01:00
David Baker
6bfa31cd47 run i18n which is unhappy about 'create room' for some reason 2020-05-22 10:34:00 +01:00
David Baker
ef4d0a8051 Make linter happy 2020-05-22 10:33:19 +01:00
Travis Ralston
a425c5440b Fix visibility of message timestamps 
Fixes https://github.com/vector-im/riot-web/issues/13736

This also fixes an unreported but complained about issue regarding the 'always show timestamps' option not working.

Looks like this regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4531 when things got shuffled around.
 2020-05-21 16:34:23 -06: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
e3c0b47116 Hyphenize algorithm directories 2020-05-21 11:56:04 -06:00
Michael Telatynski
d0451fcd80
Merge pull request #4610 from matrix-org/t3chguy-patch-1 
Update code style to mention switch statements
 2020-05-21 18:54:58 +01:00
Travis Ralston
a11985f239 Which component? The room list! 2020-05-21 11:54:38 -06:00
Travis Ralston
559dd98d01 Fix comment style to be less bothersome 2020-05-21 11:53:16 -06:00
Michael Telatynski
099c06c6e5 Merge branches 'develop' and 't3chguy-patch-1' of github.com:matrix-org/matrix-react-sdk into t3chguy-patch-1 2020-05-21 18:31:00 +01:00
Michael Telatynski
3ae38714c1 make ts happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 18:25:52 +01:00
Michael Telatynski
7b0e51a703 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 18:11:21 +01:00
Michael Telatynski
b27f1fa6db Convert BasePlatform and BaseEventIndexManager to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 18:06:36 +01:00
David Baker
7533a8f80b
Merge pull request #4612 from matrix-org/dbkr/fix_restore_with_ssss 
Fix key backup restore with SSSS
 2020-05-21 12:54:41 +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
poljar
af286ade4e
Merge pull request #4608 from matrix-org/poljar/eventindex-null-token 
Handle null tokens in the crawler loop.
 2020-05-21 12:07:18 +02:00
Michael Telatynski
5618c382bd
Update code style to mention switch statements 2020-05-20 16:01:34 +01:00
Jorik Schellekens
d95d0191a2
Merge pull request #4424 from JorikSchellekens/joriks/font-scaling-slider 
Font scaling settings and slider
 2020-05-20 15:29:36 +01:00
Jorik Schellekens
50a44405f0 CONSTANT_CASING 2020-05-20 15:17:47 +01:00