Commit Graph

62531 Commits

Author SHA1 Message Date
Richard Lewis 7f91b47598 Move sticker picker icon. 2018-03-07 11:52:42 +00:00
Luke Barnard 63b696ff6c Make sure mx_TagPanel_tagTileContainer occupies full height
so that the user can drag groups to an empty TagPanel

fixes https://github.com/vector-im/riot-web/issues/6276
2018-03-07 11:47:52 +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
Michael Telatynski ed8f087eb6 fix access of element [0] of array even though it sometimes does not exist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-06 15:17:57 +00:00
Richard Lewis 6785d75ad2 Remove logging. 2018-03-06 14:46:40 +00:00
Richard Lewis 78ae1ada3c Fix tooltip vertical positioning. 2018-03-06 14:21:31 +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
Richard Lewis d77ab891a0 Update tooltip position on scroll. 2018-03-06 11:25:15 +00:00
Richard Lewis b529edb5cc Linting 2018-03-06 11:02:36 +00:00
Richard Lewis d5465cf2fa Prefix and clarify global variable naming. 2018-03-06 10:55:59 +00:00
Richard Lewis 7755a3ce90 Nest sticker image element for correct positioning of tooltips. 2018-03-06 10:48:32 +00:00
Richard Lewis 9fc7435ea2 Correctly position tooltips relative to parent element. 2018-03-06 10:47:53 +00:00
Weblate b2da66d670 Merge remote-tracking branch 'origin/develop' into develop 2018-03-06 09:56:28 +00:00
Matthew Hodgson 5ade4b2bcf Merge pull request #6281 from vector-im/luke/fix-room-tile-cosmetics
Add transparent CSS class for RoomTile
2018-03-06 09:56:22 +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
rugk 3c3fd7cf2a Remove typo 2018-03-05 21:47:28 +01:00
rugk cfed0cbd0d Mention localhost 2018-03-05 21:37:07 +01:00
Richard Lewis e2cedbe9d7 Pull in changes from develop 2018-03-05 16:43:59 +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
Luke Barnard 1b6cb2da68 Add transparent CSS class for RoomTile 2018-03-05 12:34:51 +00:00
Weblate 0311a3a1be Merge remote-tracking branch 'origin/develop' into develop 2018-03-05 11:29:29 +00:00
Ralitsa Bozhkova 7d7079a389 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2018-03-05 11:29:28 +00:00
David Baker 8f578f7378 Merge pull request #6273 from vector-im/luke/fix-copy-res-gen-i18n-crash
Fix crash; fs event received /w langauge file empty
2018-03-05 11:29:24 +00:00
Michael Telatynski 3b02766be9 isHtml makes no sense if there is no formatted_body
this is a bug pre-replies but replies exacerbates it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-05 07:33:18 +00:00
Michael Telatynski df56a67fda Add reply fallback and run gen-i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-04 12:39:34 +00:00
Weblate ab4019a612 Merge remote-tracking branch 'origin/develop' into develop 2018-03-03 20:30:18 +00:00
Matthew Hodgson ab55f2b938 document config.json 2018-03-03 20:30:08 +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
Luke Barnard 075f568f61 Fix crash; fs event received /w langauge file empty
It was common, at least for me, to experience a crash produced
when running the `matrix-react-sdk/scripts/gen-i18n.js` script
because when writing en_EN.json (via the script or otherwise)
choikdar would receive an event and cause the file to be read,
but the file would be empty when clearly it wasn't.

This would happen even when doing an atomic write in gen-i18n.

The fix adds a debounce as a workaround.
2018-03-02 15:30:06 +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
Luke Barnard 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
Andrey 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
Luke Barnard 86295acba3 Merge branch 'develop' into luke/fix-group-avatar-update 2018-03-01 15:27:06 +00:00
Kévin C 25e8272d2c Translated using Weblate (French)
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/fr/
2018-03-01 15:07:44 +00:00
Luke Barnard d5908fbc1e Fix FlairStore cache busting 2018-03-01 15:06:05 +00:00
Weblate 8499a95f18 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:05:51 +00:00