Commit graph

11394 commits

Author SHA1 Message Date
Bruno Windels
a6d241c29f
Merge pull request #2146 from matrix-org/bwindels/fixavatars-parttrois
Fix DM avatars, part 3
2018-09-04 18:17:52 +02:00
Bruno Windels
3b29b7aab6 fix getDMRoomsForUserId not calling _getUserToRooms first (thanks e2e tests) 2018-09-04 17:36:50 +02:00
Bruno Windels
bc97a3efb5
Merge pull request #2143 from matrix-org/bwindels/fixreconnectspinner
Fix: show spinner again while recovering from connection error
2018-09-04 16:40:30 +02:00
Bruno Windels
2530ecbf39
Merge pull request #2147 from matrix-org/bwindels/fix-gdpr-infinispini
Fix: infinite spinner on trying to create welcomeUserId room without consent
2018-09-04 16:10:45 +02:00
Bruno Windels
44a53cfc0d use lodash for unique function instead of rolling our own 2018-09-04 16:03:15 +02:00
Bruno Windels
e171296d51 patch self-chats lazily in favor of awaiting sync state 2018-09-04 16:00:40 +02:00
Bruno Windels
5c395e4db7 wait for room creation, to go to home page in case of failure 2018-09-04 14:26:36 +02:00
Bruno Windels
abd9d3a11e fix lint 2018-09-04 13:55:29 +02:00
Bruno Windels
6c7cb380e0 add warning in console when patching rooms, so it appears in rage shakes 2018-09-04 13:12:26 +02:00
Bruno Windels
441036ff93 remove duplicates from room lists 2018-09-04 13:12:26 +02:00
Bruno Windels
245dfbf957 only put NON-guessed rooms in self-chats 2018-09-04 13:12:26 +02:00
Bruno Windels
c12abab52d wait until rooms are available
as accountData get processed before rooms, during initial sync
or loading sync from cache, accountData gets emitted
before any room is available, hence our patching wasn't doing
anything. Just as well, because it would have failed (see next commits)
2018-09-04 13:12:26 +02:00
David Baker
727082b659 Merge branch 'master' into develop 2018-09-03 14:26:50 +01:00
David Baker
4b45c17f59 v0.13.3 2018-09-03 14:26:00 +01:00
David Baker
c87406c1b2 Prepare changelog for v0.13.3 2018-09-03 14:26:00 +01:00
David Baker
3e227bb40f released matrix-js-sdk 2018-09-03 14:14:24 +01:00
Bruno Windels
1eabb6012a
Merge pull request #2139 from matrix-org/bwindels/memberlist-spinner
Show spinner in member list while loading members
2018-09-03 15:05:27 +02:00
Bruno Windels
cae419e304 avoid rerendering when LL is disabled 2018-09-03 11:13:56 +02:00
David Baker
e83dca4150 v0.13.3-rc.2 2018-08-31 13:48:28 +01:00
David Baker
07baaca572 Prepare changelog for v0.13.3-rc.2 2018-08-31 13:48:27 +01:00
David Baker
77316dddf2 js-sdk rc.2 2018-08-31 13:43:55 +01:00
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
David Baker
75a2668e42
Merge pull request #2141 from matrix-org/bwindels/fixdmavatar
Fix DM avatar
2018-08-30 11:45:54 +01: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