Commit graph

24626 commits

Author SHA1 Message Date
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
3f2ab5a3a9
Merge pull request #4638 from matrix-org/travis/matrix-client-peg-ts
Convert MatrixClientPeg to TypeScript
2020-05-25 16:24:12 -06:00
Travis Ralston
1c9b5eb42d Appease the tests 2020-05-25 16:14:51 -06:00
Travis Ralston
e5c2d17015 Move the instance definition to the Window 2020-05-25 16:06:05 -06: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
Travis Ralston
bd2d13edd2 Convert the MatrixClientPeg to TypeScript 2020-05-25 15:52:05 -06:00
Travis Ralston
982e81f9a3 Rename MatrixClientPeg to ts 2020-05-25 15:43:21 -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
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
73d966443c fix tests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 14:25: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
02ddda587b Fix useEventEmitter to support passing all callback arguments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 14:11:25 +01:00
Michael Telatynski
37d04d6ceb
Merge pull request #4101 from matrix-org/t3chguy/leaks
Transition BaseAvatar to hooks
2020-05-23 11:19:58 +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
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
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