63695 Commits

Author SHA1 Message Date
Luke Barnard 9f5211061e CSS for E2E "fudge-button" UI
See https://github.com/matrix-org/matrix-react-sdk/pull/1791
2018-03-08 14:10:33 +00:00
Richard Lewis 38efebb8d3 Split out sticker CSS 2018-03-08 12:31:23 +00:00
Richard Lewis c59dd5b840 Add placeholders for sticker images (and fancy transitions). 2018-03-08 12:31:01 +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 a4d8e9e4e5 Merge remote-tracking branch 'origin/develop' into develop 2018-03-07 14:23:27 +00:00
Ralitsa Bozhkova 2baa77a93f 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-07 14:23:25 +00:00
Luke Barnard c051492286 Merge pull request #6286 from vector-im/luke/fix-tag-panel-empty
Make sure mx_TagPanel_tagTileContainer occupies full height
2018-03-07 14:23:22 +00:00
Richard Lewis fe3f0be920 Ignore local config. 2018-03-07 12:03:28 +00:00
Richard Lewis b2bb15beb3 Remove accidentally checked in yarn.lock 2018-03-07 11:59:44 +00:00
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