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

16285 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
7a26100a2e Merge branch 'origin/develop' into Weblate. 2019-05-31 15:27:49 +00:00
Walter
98ab573b9a Translated using Weblate (Russian) 
Currently translated at 97.1% (1586 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-05-31 15:27:49 +00:00
Travis Ralston
f512f51f54
Merge pull request #3048 from matrix-org/travis/fix-lowbandwidth-logout 
Don't try and low encryption info when signing out in low bandwidth mode
 2019-05-31 09:27:43 -06:00
Travis Ralston
16a46be00f Cache shouldLoadBackupStatus in state 2019-05-31 09:20:13 -06:00
Travis Ralston
1c84abae44 Fix logout dialog for low bandwidth 2019-05-31 09:14:49 -06:00
Weblate
ed397a0542 Merge branch 'origin/develop' into Weblate. 2019-05-31 13:17:43 +00:00
Walter
7d3d6a763c Translated using Weblate (Russian) 
Currently translated at 94.7% (1547 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-05-31 13:17:43 +00:00
Nathan Follens
061d72e286 Translated using Weblate (German) 
Currently translated at 87.9% (1437 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-05-31 13:17:40 +00:00
Kévin C
da459c4f67 Translated using Weblate (French) 
Currently translated at 100.0% (1634 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-05-31 13:17:40 +00:00
Nathan Follens
f68833c9ac Translated using Weblate (Dutch) 
Currently translated at 99.9% (1633 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-05-31 13:17:39 +00:00
Bruno Windels
2f98d0edb7
Merge pull request #3047 from matrix-org/bwindels/autocomplete-enter-fix 
only capture enter if something was selected in completions
 2019-05-31 13:17:35 +00:00
Bruno Windels
716719187d only capture enter if something was selected in completions 2019-05-31 15:05:09 +02:00
Will Hunt
96c20ea536 Add missing keys to notif sound setting 2019-05-31 11:40:23 +01:00
Weblate
f1121b57ed Merge branch 'origin/develop' into Weblate. 2019-05-31 10:33:24 +00:00
RiotRobot
512c9b2ac8 Merge branch 'master' into develop 2019-05-31 11:26:49 +01:00
RiotRobot
21c8a64ce1 v1.2.1 2019-05-31 11:26:02 +01:00
RiotRobot
667232ded7 Prepare changelog for v1.2.1 2019-05-31 11:26:02 +01:00
J. Ryan Stinnett
cbcdd6bffb
Merge pull request #3045 from matrix-org/jryans/emoji-height-release 
Native emoji require extra line-height
 2019-05-31 11:18:12 +01:00
J. Ryan Stinnett
8e7933138f Native emoji require extra line-height 
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
 2019-05-31 11:11:22 +01:00
RiotRobot
2a41471df3 Upgrade to JS SDK 2.0.0 which fixes an error during key backup 2019-05-31 11:06:06 +01:00
Will Hunt
9369e964fa Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-31 10:44:30 +01:00
Weblate
76a8265415 Merge branch 'origin/develop' into Weblate. 2019-05-31 09:21:48 +00:00
Bruno Windels
2d8c523642
Merge pull request #3040 from matrix-org/bwindels/editor-remaining-md 
Fix: better HTML > MD conversion for editing, including lists and quotes
 2019-05-31 09:21:43 +00:00
Weblate
9de96b381a Merge branch 'origin/develop' into Weblate. 2019-05-31 09:17:31 +00:00
Szimszon
b9785ca025 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1634 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-05-31 09:17:31 +00:00
J. Ryan Stinnett
5593b499d9
Merge pull request #3044 from matrix-org/jryans/line-height-native-emoji 
Native emoji require extra line-height
 2019-05-31 10:17:26 +01:00
Bruno Windels
78fbea307c less escaping for backticks 2019-05-31 11:06:15 +02:00
Weblate
b3aa3f685f Merge branch 'origin/develop' into Weblate. 2019-05-31 08:57:09 +00:00
J. Ryan Stinnett
6ab136bd9a
Merge pull request #2598 from matrix-org/matthew/low_bandwidth 
port over low_bandwidth mode to develop
 2019-05-31 09:57:04 +01:00
Weblate
04655d3309 Merge branch 'origin/develop' into Weblate. 2019-05-31 08:44:12 +00:00
Karol Kosek
0fdcbbaa4f Translated using Weblate (Polish) 
Currently translated at 73.9% (1207 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-05-31 08:44:12 +00:00
Tirifto
da6a7d1048 Translated using Weblate (Esperanto) 
Currently translated at 81.6% (1332 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-05-31 08:44:11 +00:00
Nathan Follens
04252737b8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1633 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-05-31 08:44:11 +00:00
Jeff Huang
a3a75a9a7f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1633 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-05-31 08:44:11 +00:00
Bruno Windels
eb8dd52437
Merge pull request #3029 from matrix-org/bwindels/pill-n-newlines 
Fix: maintain caret at current line when position is on newline part
 2019-05-31 08:44:02 +00:00
Travis Ralston
af86cdfe9a Disable avatars in desktop notifs when in LB mode 2019-05-30 20:02:25 -06:00
Travis Ralston
a935e26ee3 Add flag to config to always show labs settings 2019-05-30 19:57:37 -06:00
Travis Ralston
0d47222132 Add LB setting to new user settings 
Put under labs out of concern for https://github.com/vector-im/riot-meta/issues/66
 2019-05-30 19:57:17 -06:00
Travis Ralston
d81804e0fe Merge branch 'develop' into matthew/low_bandwidth 2019-05-30 19:42:09 -06:00
J. A. Durieux
e6850ccfc3 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1633 of 1633 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-05-30 21:08:15 +00:00
Weblate
4589493167 Merge branch 'origin/develop' into Weblate. 2019-05-30 10:01:16 +00:00
IevgenVovk
bc13aff5fe Translated using Weblate (Ukrainian) 
Currently translated at 31.3% (511 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2019-05-30 10:01:16 +00:00
Walter
aaa75479b0 Translated using Weblate (German) 
Currently translated at 88.0% (1438 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-05-30 10:01:16 +00:00
Stanislav Lukeš
0418aee922 Translated using Weblate (Czech) 
Currently translated at 99.9% (1633 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2019-05-30 10:01:15 +00:00
J. Ryan Stinnett
7d4d09e8ac
Merge pull request #3042 from matrix-org/jryans/username-on-hs 
Remove username on HS input label
 2019-05-30 11:01:04 +01:00
J. Ryan Stinnett
2be00ee0e0 Native emoji require extra line-height 
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
 2019-05-30 10:26:12 +01:00
Travis Ralston
5c85f4609e Accept JSX into the GenericErrorPage and expose local session vars 2019-05-29 12:09:04 -06:00
J. Ryan Stinnett
1e3e9f4f87 Remove username on HS input label 
Removes redundant HS name on the username input that duplicates the header above
it.

Fixes https://github.com/vector-im/riot-web/issues/9884
 2019-05-29 17:48:16 +01:00
Weblate
9a71fe73bf Merge branch 'origin/develop' into Weblate. 2019-05-29 15:03:58 +00:00
Walter
35ea9fd8f4 Translated using Weblate (Russian) 
Currently translated at 90.3% (1475 of 1634 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2019-05-29 15:03:58 +00:00