Commit Graph

8981 Commits (ca6b259911f089324abd33de1cc49517ab7fcf85)

Author SHA1 Message Date
Luke Barnard 99b3922998
Merge pull request #1796 from matrix-org/luke/fix-group-invite-flow
Show GroupMemberList after inviting a group member
2018-03-12 17:53:59 +00:00
Luke Barnard 0a480b05aa Show GroupMemberList after inviting a group member
because we might be looking at a member when inviting a new
member.

See https://github.com/vector-im/riot-web/pull/6303
2018-03-12 17:23:31 +00:00
Weblate 05cdd8098b Merge remote-tracking branch 'origin/develop' into develop 2018-03-12 15:33:08 +00:00
Slavi Pantaleev 791ef02715 Translated using Weblate (Russian)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 15:33:07 +00:00
Slavi Pantaleev 5885104c3a Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-12 15:33:06 +00:00
Luke Barnard 0341b299ae
Merge pull request #1794 from matrix-org/dbkr/baseavatar_syntax
Fix syntax fail
2018-03-12 15:33:00 +00:00
David Baker d416b9d7d1 Copyright 2018-03-12 15:24:32 +00:00
David Baker ac85938186 Fix syntax fail 2018-03-12 15:23:22 +00:00
Andrey 5854c5f42c Translated using Weblate (Russian)
Currently translated at 99.7% (993 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-03-12 12:09:57 +00:00
Ralitsa Bozhkova d1961ab111 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-12 12:02:44 +00:00
Марко М. Костић 46d1328af4 Translated using Weblate (Serbian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-03-11 14:09:30 +00:00
Ralitsa Bozhkova bf41b7b91f Translated using Weblate (Bulgarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-10 10:37:27 +00:00
Szimszon b92e74bc60 Translated using Weblate (Hungarian)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-09 19:15:05 +00:00
Nathan van Beelen d4d8ed7797 Translated using Weblate (Dutch)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-03-09 14:23:08 +00:00
Weblate 9524d1c313 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 17:30:21 +00:00
David Baker e87f8ee7b8
Merge pull request #1793 from matrix-org/luke/fix-tag-panel-clear-filter-tinting
Use TintableSvg for TagPanel clear filter button
2018-03-08 17:30:17 +00:00
Luke Barnard 5ba55858e8 Use TintableSvg for TagPanel clear filter button 2018-03-08 17:06:48 +00:00
Kévin C 99c15be766 Translated using Weblate (French)
Currently translated at 100.0% (995 of 995 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-03-08 16:57:54 +00:00
Weblate 3d34596162 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 16:47:50 +00:00
Luke Barnard a03778388d
Merge pull request #1792 from matrix-org/luke/fix-privileged-users-cosmetics
Fix missing space between "...is a" and user ID
2018-03-08 16:47:46 +00:00
Luke Barnard a1d0cf65d6 Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
Weblate b5c44e6b36 Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 15:08:05 +00:00
Luke Barnard 5148ca1a88
Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button
E2E "fudge-button"
2018-03-08 15:07:58 +00:00
Luke Barnard 3a3cced905 E2E "fudge-button"
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.

This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.

Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
2018-03-08 14:13:33 +00:00
Osoitz e864dc97ba Translated using Weblate (Basque)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-03-08 10:16:51 +00:00
Weblate e0798af09d Merge remote-tracking branch 'origin/develop' into develop 2018-03-08 09:59:02 +00:00
Марко М. Костић 7f44f236e0 Translated using Weblate (Serbian)
Currently translated at 99.8% (989 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-03-08 09:59:01 +00:00
Tirifto d5ced62b90 Translated using Weblate (Esperanto)
Currently translated at 97.7% (968 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-03-08 09:59:01 +00:00
Luke Barnard 441a8c722c
Merge pull request #1790 from matrix-org/dbkr/hello_trace_why_are_you_here
Remove spurious console.trace
2018-03-08 09:58:57 +00:00
David Baker d919c1a41d Remove spurious console.trace
There's no comment to say why this is here and the commit that
add it (e91e94fd4) doesn't mention it either, so it's presumably
unintentional.
2018-03-08 09:47:42 +00:00
Weblate 4a81d1cd6b Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 20:18:07 +00:00
Matthew Hodgson 7a77da7a4c
Merge pull request #1789 from matrix-org/dbkr/presence_only_on_user_activity
Don't reset the presence timer on every dispatch
2018-03-06 20:18:00 +00:00
David Baker a97e7375d5 Don't reset the presence timer on every dispatch
Only on user activity (there's now a dispatch every time we set a
member event, ie. A LOT, hence this now being a problem)
2018-03-06 17:48:21 +00:00
Weblate 4d76194a9d Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 12:22:19 +00:00
David Baker d167dbcf86
Merge pull request #1788 from matrix-org/luke/fix-flair-store-potential-mem-leak
Potentially fix a memory leak in FlairStore
2018-03-06 12:22:14 +00:00
Luke Barnard faf517419f Return null instead of undefined on failure 2018-03-06 12:14:41 +00:00
Luke Barnard 0fc79a4a0d Remove delay used in testing 2018-03-06 12:13:46 +00:00
Luke Barnard afbd563810 Potentially fix a memory leak in FlairStore
For each successful request of a group profile, we previously
emitted an `updateGroupProfile` event per caller of
`getGroupProfileCached`. This is sub-optimal because only a single
event emit is required to update the views listening.

It's possible that this was enabling some race to cause a memory
leak but this is not certain, hence the extra logging for future
debugging.
2018-03-06 11:33:56 +00:00
Weblate 17657aa8e2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 09:43:39 +00:00
Ralitsa Bozhkova bd8f78526e Translated using Weblate (Bulgarian)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-06 09:43:38 +00:00
Luke Barnard 213e25ab0f
Merge pull request #1785 from matrix-org/luke/fix-room-tile-cosmetics
Implement transparent RoomTile for use in some places
2018-03-06 09:43:33 +00:00
Krombel ecad9b9dd3 Translated using Weblate (German)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-03-05 16:38:43 +00:00
Luke Barnard a95f6a9804 Implement transparent RoomTile for use in some places
where a transparent appearance is required (i.e. in MemberInfo
or ChatCreateOrReuseDialog)
2018-03-05 12:36:02 +00:00
Szimszon 73768a7afc Translated using Weblate (Hungarian)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-03-03 08:36:20 +00:00
RainSlide 8d8d73942e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-03-02 13:18:50 +00:00
Ralitsa Bozhkova ffcf58b144 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-03-02 08:53:42 +00:00
Weblate 7daf0279d6 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:56:37 +00:00
David Baker 9a7a7ea2d6
Merge pull request #1784 from matrix-org/luke/fix-group-avatar-default-colour
Fix varying default group avatar colour for given group
2018-03-01 15:56:33 +00:00
Luke Barnard 94c1baa25d Fix varying default group avatar colour for given group 2018-03-01 15:42:22 +00:00
Weblate 2aa15095f2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:38:16 +00:00