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

11781 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
d9fb88246a
Merge pull request #2140 from matrix-org/dbkr/discardsession 
Slash command to discard megolm session
 2018-08-30 18:25:56 +01:00
Bruno Windels
debcc20604 also show spinner on new CATCHUP state 2018-08-30 15:39:48 +02:00
David Baker
5688f98d22 v0.13.3-rc.1 2018-08-30 14:28:58 +01:00
David Baker
53c6b7e4cb Prepare changelog for v0.13.3-rc.1 2018-08-30 14:28:58 +01:00
David Baker
47fcc0d264 js-sdk rc.1 2018-08-30 14:21:11 +01:00
Weblate
d292e3c3c3 Merge remote-tracking branch 'origin/develop' into develop 2018-08-30 10:45:59 +00:00
David Baker
75a2668e42
Merge pull request #2141 from matrix-org/bwindels/fixdmavatar 
Fix DM avatar
 2018-08-30 11:45:54 +01:00
Weblate
b6984e7aea Merge remote-tracking branch 'origin/develop' into develop 2018-08-30 10:45:36 +00:00
Peter Vágner
8dd17dadd2 Translated using Weblate (Slovak) 
Currently translated at 99.7% (1244 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-08-30 10:45:36 +00:00
David Baker
6d158d35eb
Merge pull request #2142 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-08-30 11:45:31 +01:00
Bruno Windels
fb0a0d5d9e allow self-chats 2018-08-30 12:36:53 +02:00
Peter Vágner
40e5d379f0 Translated using Weblate (Slovak) 
Currently translated at 99.4% (1240 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-08-30 10:32:59 +00:00
csybr
e45008ec22 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 97.8% (1220 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2018-08-30 10:32:59 +00:00
Krombel
fad6816d5e Translated using Weblate (German) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-08-30 10:32:59 +00:00
Kévin C
332c190c63 Translated using Weblate (French) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-08-30 10:32:59 +00:00
Bruno Windels
d8f15e1159 make sure we still have the room 2018-08-30 12:06:34 +02:00
Bruno Windels
85b6f157c1 only patch m.direct data on server once per session to avoid request storm 2018-08-30 12:01:13 +02:00
Bruno Windels
379ddfff29 dont reassign userToRooms as we're just patching it up, also better check if we really have self DMs 2018-08-30 11:50:57 +02:00
Bruno Windels
caff60d56d fix var decl 2018-08-30 11:37:13 +02:00
Osoitz
f8baa0f729 Translated using Weblate (Basque) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-08-30 09:31:34 +00:00
Bruno Windels
d7868dbe33 delegate avatar selection to room for rooms with two members (but not in m.direct) 2018-08-30 10:54:01 +02:00
Bruno Windels
5afb3bfb29 patch up DMs marked to self (can happy if any client has a bug here) 2018-08-30 10:53:25 +02:00
Jeff Huang
91544b42e7 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-08-30 00:42:07 +00:00
Kévin C
47609feb2c Translated using Weblate (French) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-08-29 20:57:53 +00:00
Kenneth Larsson
023035a7dd Translated using Weblate (Swedish) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-08-29 19:08:40 +00:00
Szimszon
0a8f62b92e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-08-29 18:52:42 +00:00
Weblate
dae22a753a Merge remote-tracking branch 'origin/develop' into develop 2018-08-29 17:38:53 +00:00
David Baker
2c1ba6f104
Merge pull request #2124 from matrix-org/dbkr/tombstone 
Support m.room.tombstone events
 2018-08-29 18:38:48 +01:00
Weblate
daa1d2ba87 Merge remote-tracking branch 'origin/develop' into develop 2018-08-29 17:38:26 +00:00
David Baker
7f2599c3ae
Merge pull request #2123 from matrix-org/dbkr/roomcreate 
Support room creation events
 2018-08-29 18:38:20 +01:00
David Baker
6cbe4144d4 unused import 2018-08-29 18:28:16 +01:00
David Baker
c40ac49b2a Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate 2018-08-29 18:18:08 +01:00
David Baker
63938a3f9f Slash command to discard megolm session 
For faster crypto debugging

Requires https://github.com/matrix-org/matrix-js-sdk/pull/704
 2018-08-29 18:09:37 +01:00
Weblate
e3f64344b8 Merge remote-tracking branch 'origin/develop' into develop 2018-08-29 16:20:09 +00:00
csybr
11d9e96d62 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-29 16:20:08 +00:00
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