Jorik Schellekens
303691eb72
Missing export
2020-05-25 17:37:07 +01:00
Jorik Schellekens
b4624baf2f
Merge branch 'develop' into joriks/field-ts
2020-05-25 17:29:25 +01:00
Jorik Schellekens
f34413c6ce
update yarn lock
2020-05-25 17:24:15 +01:00
Jorik Schellekens
30e2b01022
unlock react types
2020-05-25 17:08:37 +01:00
Jorik Schellekens
d10d887996
Explain unsafe coerce
2020-05-25 16:53:09 +01:00
Jorik Schellekens
5c9398a6b1
Types exiliary files
2020-05-25 16:47:57 +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
Jorik Schellekens
63f78b0808
Move tooltip to ts
2020-05-25 13:40:05 +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
Jorik Schellekens
adec5a4f92
fix test
2020-05-20 15:09:10 +01:00
Jorik Schellekens
4e9a139e8b
lint
2020-05-20 14:49:18 +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
Damir Jelić
db72c645ba
EventIndex: Add a missing semicolon.
2020-05-20 11:14:37 +02:00
Damir Jelić
86ad6de41e
EventIndex: Handle null tokens in the crawler loop as well.
...
This is similar to 5eb510387c
. But now the
checkpoint arrived during a crawl.
2020-05-20 11:06:52 +02:00