PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
24778 commits 1 branch 0 tags 338 MiB
Commit graph

24778 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
fe03d02cf6 Fix reacting to redactions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-23 08:43:15 +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
Weblate
e639c547f5 Merge branch 'origin/develop' into Weblate. 2020-05-22 13:57:35 +00:00
MamasLT
efb3dd2e25 Translated using Weblate (Lithuanian) 
Currently translated at 48.7% (1131 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-22 13:57:34 +00:00
XoseM
24c3791196 Translated using Weblate (Galician) 
Currently translated at 44.4% (1030 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-05-22 13:57:34 +00:00
XoseM
8a1ace43da Translated using Weblate (Galician) 
Currently translated at 44.4% (1030 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-05-22 13:57:34 +00: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
Michael Telatynski
49c0748990 delint and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 14:32:41 +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
Weblate
3c781e0e82 Merge branch 'origin/develop' into Weblate. 2020-05-22 13:14:39 +00:00
RiotRobot
af59d3a094 Reset matrix-js-sdk back to develop branch 2020-05-22 14:14:09 +01:00
Weblate
568391f69c Merge branch 'origin/develop' into Weblate. 2020-05-22 13:13:22 +00:00
RiotRobot
5ec8459468 Merge branch 'master' into develop 2020-05-22 14:13:01 +01:00
Weblate
ec61809798 Merge branch 'origin/develop' into Weblate. 2020-05-22 13:04:02 +00: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
Weblate
ba72d5eac4 Merge branch 'origin/develop' into Weblate. 2020-05-22 09:47:55 +00:00
MamasLT
fe357e530d Translated using Weblate (Lithuanian) 
Currently translated at 48.5% (1127 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-22 09:47:54 +00:00
random
ead1fc59fa Translated using Weblate (Italian) 
Currently translated at 100.0% (2322 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-05-22 09:47:54 +00:00
XoseM
f00ce9aace Translated using Weblate (Galician) 
Currently translated at 43.7% (1014 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-05-22 09:47:54 +00:00
Kévin C
19667964a7 Translated using Weblate (French) 
Currently translated at 100.0% (2322 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-05-22 09:47:51 +00:00
Priit Jõerüüt
f0c8f20cf6 Translated using Weblate (Estonian) 
Currently translated at 54.8% (1273 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-22 09:47:50 +00:00
Tirifto
cb270ba0d5 Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2322 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-22 09:47:48 +00: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
Weblate
00abaa7cc4 Merge branch 'origin/develop' into Weblate. 2020-05-21 19:30:40 +00:00
MamasLT
41a11bbdb2 Translated using Weblate (Lithuanian) 
Currently translated at 48.4% (1124 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-21 19:30:40 +00: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
Weblate
9e32bfd267 Merge branch 'origin/develop' into Weblate. 2020-05-21 17:55:09 +00:00
yuuki-san
565562ab5c Translated using Weblate (Slovak) 
Currently translated at 67.1% (1558 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-05-21 17:55:08 +00:00
MamasLT
e849d28874 Translated using Weblate (Lithuanian) 
Currently translated at 48.2% (1119 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-05-21 17:55:07 +00:00
XoseM
3741c296aa Translated using Weblate (Galician) 
Currently translated at 42.0% (974 of 2321 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-05-21 17:55:05 +00:00