Commit graph

11646 commits

Author SHA1 Message Date
David Baker
499d14cf27
Merge pull request #2122 from matrix-org/dbkr/room_upgrade
Support for room upgrades
2018-08-29 17:20:00 +01:00
David Baker
bd0a9cf3a0 Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade 2018-08-29 15:51:07 +01:00
Bruno Windels
f9c40390e9 set state after setting _showPresence to avoid all members to appear offline on matrix.org 2018-08-29 11:09:55 +02:00
Bruno Windels
e9e5abfcc5 show a spinner in the memberlist while loading the members 2018-08-29 10:30:25 +02:00
Weblate
d0055283d8 Merge remote-tracking branch 'origin/develop' into develop 2018-08-28 13:36:29 +00:00
csybr
38bab898f2 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 99.0% (1217 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-28 13:36:29 +00:00
csybr
b97c203587 Translated using Weblate (Norwegian Bokmål)
Currently translated at 9.3% (115 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2018-08-28 13:36:29 +00:00
random
2064cfca77 Translated using Weblate (Italian)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-08-28 13:36:29 +00:00
Krombel
e44ca8df3e Translated using Weblate (German)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-28 13:36:28 +00:00
Bruno Windels
cc0375fa66
Merge pull request #2137 from matrix-org/bwindels/fixllroomavatar
Fix: dont show 1:1 avatar for rooms +2 members but only <=2 members loaded
2018-08-28 15:35:19 +02:00
Xose M
7d90e3ae21 Translated using Weblate (Galician)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-08-28 05:43:58 +00:00
Kenneth Larsson
db05121e2e Translated using Weblate (Swedish)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-08-27 21:37:57 +00:00
Bruno Windels
06160f5fae fix lint 2018-08-27 18:52:33 +02:00
Bruno Windels
6a077655e9 bring back old behaviour to also show member avatars if not marked as 1:1 room 2018-08-27 18:48:21 +02:00
Bruno Windels
36665d3c69 Fix: dont show 1:1 avatar for room with only 2 members loaded 2018-08-27 17:40:31 +02:00
Nikolas
5be206d8db Translated using Weblate (German)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-27 11:56:12 +00:00
random
21cc3f2467 Translated using Weblate (Italian)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-08-27 08:29:38 +00:00
Szimszon
25fb30bf7d Translated using Weblate (Hungarian)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-08-27 05:57:58 +00:00
Slavi Pantaleev
67d04f0f25 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-08-27 05:19:14 +00:00
Jeff Huang
03d8716ac6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-08-25 13:53:44 +00:00
Kévin C
192547b9e3 Translated using Weblate (French)
Currently translated at 100.0% (1229 of 1229 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-08-25 07:02:52 +00:00
Weblate
871f4f3adf Merge remote-tracking branch 'origin/develop' into develop 2018-08-24 13:44:35 +00:00
csybr
06a2942afe Translated using Weblate (Norwegian Nynorsk)
Currently translated at 99.1% (1217 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-24 13:44:34 +00:00
Nikolas
69cd499e28 Translated using Weblate (German)
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-24 13:44:34 +00:00
Slavi Pantaleev
04c0dd9526 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-08-24 13:44:34 +00:00
David Baker
30114e3b5b
Merge pull request #2136 from matrix-org/dbkr/tnclinks
Render terms & conditions in settings
2018-08-24 14:44:30 +01:00
Bamstam
d2bfaca9a5 Translated using Weblate (German)
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-24 10:57:06 +00:00
Krombel
8820771600 Translated using Weblate (German)
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-24 10:55:29 +00:00
David Baker
c03abddd1c s/terms and conditions/legal/ 2018-08-24 11:38:38 +01:00
David Baker
18ed6eb63c Rener terms & conditions in settings
If configured in config file
2018-08-24 11:35:21 +01:00
Slavi Pantaleev
58450b6b0f Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-08-24 05:57:50 +00:00
cocker-cc
6c3ca166f0 Translated using Weblate (German)
Currently translated at 99.9% (1227 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-23 20:58:48 +00:00
Szimszon
b468ffea63 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-08-23 18:29:39 +00:00
Weblate
69cd111d8c Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 14:29:59 +00:00
David Baker
8313dcd0dd Merge branch 'master' into develop 2018-08-23 15:26:25 +01:00
David Baker
04d1ba2637 v0.13.2 2018-08-23 15:25:33 +01:00
David Baker
3192ecca7a Prepare changelog for v0.13.2 2018-08-23 15:25:32 +01:00
David Baker
504005512e
Merge pull request #2135 from matrix-org/dbkr/dont_crash_if_room_tag_value_null_2
Don't crash if the value of a room tag is null
2018-08-23 15:06:08 +01:00
David Baker
e3afbb157d Don't crash if the value of a room tag is null
We were checking that the order was not null, but not the object
itself.
2018-08-23 14:55:56 +01:00
Jeff Huang
58701d26ae Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-08-23 13:18:23 +00:00
Weblate
31a812724c Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 13:05:49 +00:00
David Baker
ee4df85937
Merge pull request #2133 from matrix-org/dbkr/dont_crash_if_room_tag_value_null
Don't crash if the value of a room tag is null
2018-08-23 14:05:44 +01:00
David Baker
cc08179b5d Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_room_tag_value_null 2018-08-23 13:54:24 +01:00
Weblate
7f4227a76e Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 12:53:31 +00:00
David Baker
7190fa301d
Merge pull request #2134 from matrix-org/dbkr/stub_getvisiblerooms
Add stub for getVisibleRooms()
2018-08-23 13:53:27 +01:00
Peter Vágner
1488417c3e Translated using Weblate (Slovak)
Currently translated at 100.0% (1228 of 1228 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-08-23 12:11:55 +00:00
Weblate
d84a197d5d Merge remote-tracking branch 'origin/develop' into develop 2018-08-23 11:41:23 +00:00
David Baker
98dabe1a46
Merge pull request #2132 from matrix-org/bwindels/fixllcomposeravatar
Fix LL crash trying to render own avatar in composer when member isn't available yet
2018-08-23 12:41:18 +01:00
David Baker
cb84feefa9 Add stub for getVisibleRooms()
Fixes the tests
2018-08-23 12:14:52 +01:00
David Baker
54620591cc Don't crash if the value of a room tag is null
We were checking that the order was not null, but not the object
itself.
2018-08-23 12:05:09 +01:00