e7c19fd83b
Don't render placeholder when image is visible.
2018-03-08 23:12:12 +00:00
e36ae3cede
Fix context menu offset.
2018-03-08 17:33:07 +00:00
9524d1c313
Merge remote-tracking branch 'origin/develop' into develop
2018-03-08 17:30:21 +00:00
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
fdec4b36c9
Hide padding if last control.
2018-03-08 17:25:28 +00:00
3ab8b1f866
Hide sticker picker delete button and show minimise button.
2018-03-08 17:20:42 +00:00
5ba55858e8
Use TintableSvg for TagPanel clear filter button
2018-03-08 17:06:48 +00:00
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
3d34596162
Merge remote-tracking branch 'origin/develop' into develop
2018-03-08 16:47:50 +00:00
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
a1d0cf65d6
Fix missing space between "...is a" and user ID
2018-03-08 16:34:19 +00:00
b5c44e6b36
Merge remote-tracking branch 'origin/develop' into develop
2018-03-08 15:08:05 +00:00
5148ca1a88
Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button
...
E2E "fudge-button"
2018-03-08 15:07:58 +00:00
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
c59dd5b840
Add placeholders for sticker images (and fancy transitions).
2018-03-08 12:31:01 +00:00
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
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
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
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
d919c1a41d
Remove spurious console.trace
...
There's no comment to say why this is here and the commit that
add it (e91e94fd4
2018-03-08 09:47:42 +00:00
b2bb15beb3
Remove accidentally checked in yarn.lock
2018-03-07 11:59:44 +00:00
7f91b47598
Move sticker picker icon.
2018-03-07 11:52:42 +00:00
4a81d1cd6b
Merge remote-tracking branch 'origin/develop' into develop
2018-03-06 20:18:07 +00:00
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
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
4d76194a9d
Merge remote-tracking branch 'origin/develop' into develop
2018-03-06 12:22:19 +00:00
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
faf517419f
Return null instead of undefined on failure
2018-03-06 12:14:41 +00:00
0fc79a4a0d
Remove delay used in testing
2018-03-06 12:13:46 +00:00
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
b529edb5cc
Linting
2018-03-06 11:02:36 +00:00
d5465cf2fa
Prefix and clarify global variable naming.
2018-03-06 10:55:59 +00:00
7755a3ce90
Nest sticker image element for correct positioning of tooltips.
2018-03-06 10:48:32 +00:00
17657aa8e2
Merge remote-tracking branch 'origin/develop' into develop
2018-03-06 09:43:39 +00:00
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
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
e2cedbe9d7
Pull in changes from develop
2018-03-05 16:43:59 +00:00
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
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
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
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
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
7daf0279d6
Merge remote-tracking branch 'origin/develop' into develop
2018-03-01 15:56:37 +00:00
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
94c1baa25d
Fix varying default group avatar colour for given group
2018-03-01 15:42:22 +00:00
2aa15095f2
Merge remote-tracking branch 'origin/develop' into develop
2018-03-01 15:38:16 +00:00
a62a650c5a
Merge pull request #1783 from matrix-org/luke/fix-group-avatar-update
...
Fix bug where avatar change not reflected in LLP
2018-03-01 15:38:12 +00:00
379690bcc2
Translated using Weblate (Russian)
...
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/ru/
2018-03-01 15:36:58 +00:00
86295acba3
Merge branch 'develop' into luke/fix-group-avatar-update
2018-03-01 15:27:06 +00:00
Richard Lewis