41965 Commits

Author SHA1 Message Date
Bruno Windels
440b1032d5 increase receive message timeout 2018-08-15 15:17:11 +02:00
Bruno Windels
26e4645a01
Merge pull request #10 from matrix-org/bwindels/increasetimeout
Try to fix test running under travis by increasing timeout
2018-08-15 15:06:23 +02:00
Bruno Windels
4f76ad83d5 increase timeout 2018-08-15 15:05:46 +02:00
csybr
c8a99ddec1 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-15 12:01:42 +00:00
Weblate
861a360ab2 Merge remote-tracking branch 'origin/develop' into develop 2018-08-15 11:56:19 +00:00
Bruno Windels
e534090da7
Merge pull request #2119 from matrix-org/bwindels/fixroomsettingstest
Fix RoomSettings test
2018-08-15 13:56:13 +02:00
Bruno Windels
1675d3c4ba room stub not having getVersion method broke tests 2018-08-15 13:22:26 +02:00
Bruno Windels
0e56250bc2 didnt mean to commit this 2018-08-15 12:21:08 +02:00
Osoitz
3091738f22 Translated using Weblate (Basque)
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-08-15 10:12:50 +00:00
David Baker
86f60a803d
Merge pull request #2115 from matrix-org/bwindels/ll_toggle
Lazy loading: feature toggle
2018-08-15 10:46:18 +01:00
Bruno Windels
8507cf8258 add argument for passing riot server, makes local testing easier 2018-08-15 11:26:46 +02:00
Kévin C
ad6544f043 Translated using Weblate (French)
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-08-15 08:30:25 +00:00
Slavi Pantaleev
647ce511db Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-08-15 08:10:19 +00:00
Szimszon
2f3d0503af Translated using Weblate (Hungarian)
Currently translated at 100.0% (1219 of 1219 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-08-15 07:56:25 +00:00
Weblate
f1f52329d9 Merge remote-tracking branch 'origin/develop' into develop 2018-08-15 06:55:44 +00:00
Kévin C
6cbafa3faa Translated using Weblate (French)
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-08-15 06:55:44 +00:00
RainSlide
2c41a5e49a Translated using Weblate (Chinese (Simplified))
Currently translated at 99.7% (1215 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-08-15 06:55:43 +00:00
Bruno Windels
4c69c8d0f1
Merge pull request #2117 from matrix-org/dbkr/show_room_version
Show room version number in room settings
2018-08-15 08:55:38 +02:00
David Baker
c736ae7efb Copyright 2018-08-14 16:53:34 +01:00
random
db0acdad45 Translated using Weblate (Italian)
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-08-14 14:05:43 +00:00
David Baker
f20920718a Show room version number in room settings
Also change wording of the Room ID bit to match

Requires https://github.com/matrix-org/matrix-js-sdk/pull/689
For https://github.com/vector-im/riot-web/issues/7164
2018-08-14 14:28:30 +01:00
David Baker
956688237a
Merge pull request #8 from matrix-org/bwindels/indentation
bring indentation in line with other front-end projects
2018-08-14 14:02:41 +01:00
David Baker
b71e5590f9
Merge pull request #2116 from matrix-org/bwindels/ll_cleanup
Lazy loading: cleanup
2018-08-14 14:02:15 +01:00
Bruno Windels
377a20fffa bring indentation in line with other front-end projects 2018-08-14 12:53:16 +02:00
Bruno Windels
a54f13cd68
Merge pull request #6 from matrix-org/bwindels/e2erooms
Tests for creating and writing in a e2e encrypted room
2018-08-14 12:43:06 +02:00
Bruno Windels
4c3386a2a5
Merge pull request #4 from matrix-org/bwindels/2usersjoin
Support multiple users, have 2nd user join created room
2018-08-14 12:42:50 +02:00
Bruno Windels
440ebd187d getMyMembership() doesn't take id anymore 2018-08-14 11:47:05 +02:00
Bruno Windels
c8b6ccba25 fallback to room summary for dm detection 2018-08-14 11:43:03 +02:00
Bruno Windels
a86ca952b3 forgot to remove this 2018-08-14 09:38:43 +02:00
Szimszon
45584027a7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-08-13 20:02:59 +00:00
Kévin C
ecac2cfa8e Translated using Weblate (French)
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-08-13 16:08:07 +00:00
Bruno Windels
7dc92fe917 Avoid clearing e2e encryption keys, also avoid warning 2018-08-13 17:24:27 +02:00
Bruno Windels
08f322753d explain exception 2018-08-13 16:53:16 +02:00
Bruno Windels
3e9d1342e8 fix lint 2018-08-13 16:51:37 +02:00
Weblate
66d4de13cb Merge remote-tracking branch 'origin/develop' into develop 2018-08-13 14:38:02 +00:00
Andrey
77b22ea983 Translated using Weblate (Russian)
Currently translated at 99.1% (1207 of 1217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-08-13 14:38:01 +00:00
csybr
210d31a008 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 100.0% (1217 of 1217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-13 14:38:01 +00:00
Moo
5366584ab9 Translated using Weblate (Lithuanian)
Currently translated at 37.2% (453 of 1217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2018-08-13 14:38:01 +00:00
Szimszon
e8d9b85827 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1217 of 1217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-08-13 14:38:01 +00:00
Krombel
c2540c146c Translated using Weblate (German)
Currently translated at 100.0% (1217 of 1217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-08-13 14:38:00 +00:00
David Baker
d58dc23f7c
Merge pull request #2114 from matrix-org/dbkr/mau_warning_bar
Warning bar for MAU limit hit
2018-08-13 15:37:56 +01:00
Bruno Windels
84b74247e6 check if server supports lazy loading before enabling 2018-08-13 16:19:44 +02:00
David Baker
f7f62ba09d Lint 2018-08-13 14:04:08 +01:00
David Baker
d84ecbe97c s/m.server_notices/m.server_notice/ 2018-08-13 13:53:38 +01:00
David Baker
05bf200a72 Don't crash if scrollbars updated before init
The initialisation here is done on a timer to allow the DOM
elements to be in place before it's run, so it's possible for an
update to happen ebfore the initialisation. Stop & bail out if
there is no this.stickies.
2018-08-13 13:49:22 +01:00
Bruno Windels
94c424d3bb translations 2018-08-13 11:24:32 +02:00
Bruno Windels
2f9aaeca46 undo whitespace change 2018-08-13 11:17:04 +02:00
Bruno Windels
09ad138306 remove unused imports 2018-08-13 11:16:29 +02:00
Bruno Windels
28292c3388 implement PR feedback, move LL dialog to UserSettings 2018-08-13 11:14:30 +02:00
csybr
cf81b98534 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 100.0% (1217 of 1217 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2018-08-12 19:44:11 +00:00