Commit graph

21760 commits

Author SHA1 Message Date
Weblate
a523535948 Merge branch 'origin/develop' into Weblate. 2020-02-21 15:37:49 +00:00
Michael Telatynski
476c622a61
Merge pull request #4105 from matrix-org/t3chguy/fix_theme
Fix theme being overridden to light even after login is completed
2020-02-21 15:37:44 +00:00
Weblate
0d0e533c74 Merge branch 'origin/develop' into Weblate. 2020-02-21 15:19:58 +00:00
Hubert Chathi
953af6f036
add device and cross-signing public keys to rageshake info (#4097) 2020-02-21 10:19:53 -05:00
Michael Telatynski
4ed4d91b48 move to a more reusable code path
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:54:56 +00:00
Michael Telatynski
b77c2df2be Fix theme being overridden to light even after login is completed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:40:42 +00:00
Weblate
faa6e8bf6e Merge branch 'origin/develop' into Weblate. 2020-02-21 14:02:43 +00:00
Remi Reuvekamp
c1f40fa4ab Translated using Weblate (Dutch)
Currently translated at 88.3% (1877 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-02-21 14:02:43 +00:00
Osoitz
7dac6b9b65 Translated using Weblate (Basque)
Currently translated at 97.9% (2082 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-02-21 14:02:40 +00:00
Miren
d4972e91a3 Translated using Weblate (Basque)
Currently translated at 97.9% (2082 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-02-21 14:02:36 +00:00
Zoe
dcc8862d4c
Merge pull request #4100 from matrix-org/foldleft/12352-ssss-overwrite
Fix bug where SSSS could be overwritten if user never cross-signs
2020-02-21 14:02:29 +00:00
Zoe
7d319bab7f fix ssss overwrite 2020-02-21 10:18:47 +00:00
Weblate
52f92c327a Merge branch 'origin/develop' into Weblate. 2020-02-20 17:07:59 +00:00
Bruno Windels
744826db48
Merge pull request #4096 from matrix-org/bwindels/canonicalpill
Accept canonical alias for pills
2020-02-20 17:07:54 +00:00
Weblate
7ca72adc88 Merge branch 'origin/develop' into Weblate. 2020-02-20 16:44:35 +00:00
MamasLT
2027f410e3 Translated using Weblate (Lithuanian)
Currently translated at 43.1% (916 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-02-20 16:44:35 +00:00
J. A. Durieux
403895ebb9 Translated using Weblate (Dutch)
Currently translated at 86.8% (1846 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-02-20 16:44:33 +00:00
Bruno Windels
d324dfaceb
Merge pull request #4094 from matrix-org/bwindels/dontsaywecanscan
Fix: don't advertise ability to scan a QR code for verification
2020-02-20 16:44:27 +00:00
Bruno Windels
fee9c7d21f accept canonical alias for pills 2020-02-20 17:43:33 +01:00
Weblate
b3a4526157 Merge branch 'origin/develop' into Weblate. 2020-02-20 13:58:43 +00:00
MamasLT
4cc37d13c7 Translated using Weblate (Lithuanian)
Currently translated at 42.1% (895 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-02-20 13:58:43 +00:00
Damir Jelić
81e61d6f9d EventIndexPanel: Move the comments around for the getStats calls. 2020-02-20 14:46:10 +01:00
Damir Jelić
a650c47d6b ManageEventIndexDialog: Add a space before the function parenthesis. 2020-02-20 14:46:10 +01:00
Damir Jelić
1897d67818 EventIndexPanel: Catch getStats failures.
Getting the stats can fail when used with Seshat. Tantivy periodically
garbage collects its files. Smaller files are merged and the old ones
are removed.

If garbage collection occurs while we try to get the stats, which go
trough the files and figure out their sizes, we can end up trying to
figure out the file size of a removed file. The getStats call will fail
in this case but we can ignore the failure since we will likely get a
nice result next time we try.
2020-02-20 14:46:10 +01:00
Damir Jelić
9e3b0fdf7c EventIndexPanel: Fix the removal of the updateCurrentRoom listeners.
The event listeners that update the current room and try to get the
current stats from the event index don't seem to be unmounted because
this != this confusion.

Turning them into arrow methods of the react class fixes this.
2020-02-20 14:46:10 +01:00
Weblate
b2fb5703c5 Merge branch 'origin/develop' into Weblate. 2020-02-20 13:37:49 +00:00
J. Ryan Stinnett
2dd093de49
Merge pull request #4095 from matrix-org/jryans/rm-release-exec
Remove exec so release script continues
2020-02-20 13:37:44 +00:00
J. Ryan Stinnett
31e82b8050 Remove exec so release script continues
We now want to do post-processing after the JS SDK release script, so we can't
use `exec` here.
2020-02-20 12:05:08 +00:00
Weblate
86300d8ce6 Merge branch 'origin/develop' into Weblate. 2020-02-20 11:57:00 +00:00
Michael Telatynski
b1a3d8ad63
Merge pull request #4092 from matrix-org/t3chguy/persist
Use Persistent Storage where possible
2020-02-20 11:56:54 +00:00
Weblate
04a591b682 Merge branch 'origin/develop' into Weblate. 2020-02-20 11:42:10 +00:00
J. Ryan Stinnett
766f523c00 Reset matrix-js-sdk back to develop branch 2020-02-20 11:41:53 +00:00
Bruno Windels
fb28bbbaa6 dont say we can scan when we dont 2020-02-20 12:06:34 +01:00
Weblate
63a5da06e7 Merge branch 'origin/develop' into Weblate. 2020-02-20 11:01:21 +00:00
Bruno Windels
86c871f55f
Merge pull request #4088 from matrix-org/bwindels/fixuserpage
Fix user page (missing null check)
2020-02-20 11:01:15 +00:00
Weblate
a775d9dbf8 Merge branch 'origin/develop' into Weblate. 2020-02-20 11:00:09 +00:00
MamasLT
c04eef6521 Translated using Weblate (Lithuanian)
Currently translated at 42.1% (894 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-02-20 11:00:09 +00:00
Bruno Windels
913caf67a9
Merge pull request #4081 from matrix-org/bwindels/cancelondialogclose
Cancel verification request on dialog close
2020-02-20 11:00:00 +00:00
Weblate
25deb7e411 Merge branch 'origin/develop' into Weblate. 2020-02-20 03:01:33 +00:00
Walter
10f90be5af Translated using Weblate (Russian)
Currently translated at 81.1% (1725 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-02-20 03:01:33 +00:00
Michael Telatynski
b72042496e
Merge pull request #4093 from matrix-org/t3chguy/leaks
Fix various memory leaks due to method re-binding
2020-02-20 03:01:25 +00:00
Michael Telatynski
16bbea0b59 Fix various leaks due to method re-binding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-20 02:35:30 +00:00
Michael Telatynski
ffde11ca91 Use Persistent Storage where possible
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-20 00:38:08 +00:00
Weblate
9acd1e7d64 Merge branch 'origin/develop' into Weblate. 2020-02-19 17:41:34 +00:00
Michael Telatynski
12eb408c58
Merge pull request #4073 from matrix-org/t3chguy/a11y_share_msg
Fix share message context menu option keyboard a11y
2020-02-19 17:41:28 +00:00
Weblate
5202fffb6e Merge branch 'origin/develop' into Weblate. 2020-02-19 16:05:01 +00:00
Tentarial
fa39021387 Translated using Weblate (German)
Currently translated at 75.6% (1608 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-02-19 16:05:00 +00:00
Remi Reuvekamp
df897b4734 Translated using Weblate (Dutch)
Currently translated at 86.6% (1841 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-02-19 16:04:57 +00:00
RiotRobot
2d05205c9e v2.1.1 2020-02-19 16:03:58 +00:00
RiotRobot
faf8a5c2db Prepare changelog for v2.1.1 2020-02-19 16:03:57 +00:00