Commit Graph

  • 3d6984e8e3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-12 18:05:26 +00:00
  • 5bfa052a48 Merge pull request #6290 from vector-im/luke/fix-tag-tile-avatar-border-gap Matthew Hodgson 2018-03-12 18:05:22 +00:00
  • 456f9833fa Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-12 17:54:09 +00:00
  • 502cba0be5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-12 17:54:05 +00:00
  • dfb0eb5233 Merge pull request #6303 from vector-im/luke/fix-group-invite-flow Luke Barnard 2018-03-12 17:54:04 +00:00
  • 99b3922998 Merge pull request #1796 from matrix-org/luke/fix-group-invite-flow Luke Barnard 2018-03-12 17:53:59 +00:00
  • 2f0d3f1313 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-12 17:53:10 +00:00
  • 5eae913803 Merge pull request #6301 from vector-im/luke/fix-firefox-wrong-theme Luke Barnard 2018-03-12 17:53:03 +00:00
  • 0a480b05aa Show GroupMemberList after inviting a group member Luke Barnard 2018-03-12 17:23:31 +00:00
  • afb9fdf4ec Fix bug where cannot send group invite on GroupMemberInfo phase Luke Barnard 2018-03-12 17:18:30 +00:00
  • 647c7d7629 Fix themeing bug with Firefox where "disabled" ignored Luke Barnard 2018-03-12 16:15:17 +00:00
  • 05cdd8098b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-12 15:33:08 +00:00
  • 791ef02715 Translated using Weblate (Russian) Slavi Pantaleev 2018-03-12 12:09:57 +00:00
  • 5885104c3a Translated using Weblate (Bulgarian) Slavi Pantaleev 2018-03-12 12:10:13 +00:00
  • 0341b299ae Merge pull request #1794 from matrix-org/dbkr/baseavatar_syntax Luke Barnard 2018-03-12 15:33:00 +00:00
  • d416b9d7d1 Copyright David Baker 2018-03-12 15:24:32 +00:00
  • ac85938186 Fix syntax fail David Baker 2018-03-12 15:23:22 +00:00
  • b2d23b6999 Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities. Richard Lewis 2018-03-12 13:56:02 +00:00
  • 5854c5f42c Translated using Weblate (Russian) Andrey 2018-03-10 15:46:34 +00:00
  • d1961ab111 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-03-12 12:00:43 +00:00
  • 46d1328af4 Translated using Weblate (Serbian) Марко М. Костић 2018-03-11 14:07:51 +00:00
  • bf41b7b91f Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-03-10 10:37:18 +00:00
  • 14f29e4740 fix the bugs Tulir found - THANKS Michael Telatynski 2018-03-09 23:37:42 +00:00
  • 023632e7e4 only strip reply fallbacks if the lab is enabled Michael Telatynski 2018-03-09 23:12:13 +00:00
  • 46f46ee294 Simplify request mapping. Richard Lewis 2018-03-09 23:04:00 +00:00
  • 7e062090de Cleanup timeout before unmount. Richard Lewis 2018-03-09 21:12:56 +00:00
  • b92e74bc60 Translated using Weblate (Hungarian) Szimszon 2018-03-09 19:14:25 +00:00
  • 52ce709840 Translated using Weblate (Dutch) Nathan van Beelen 2018-03-09 14:23:44 +00:00
  • d4d8ed7797 Translated using Weblate (Dutch) Nathan van Beelen 2018-03-09 14:22:46 +00:00
  • a33859326e Use getUserWidgets where possible. Richard Lewis 2018-03-09 09:15:16 +00:00
  • 1b9bd33692 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-09 02:00:35 +00:00
  • aa54032500 force refresh when updating the app Matthew Hodgson 2018-03-09 01:45:37 +00:00
  • 351f9b32ea Remove broken transitions. Richard Lewis 2018-03-08 23:54:44 +00:00
  • e7c19fd83b Don't render placeholder when image is visible. Richard Lewis 2018-03-08 23:12:12 +00:00
  • abb8413c16 Fix gap between avatar and border Luke Barnard 2018-03-08 18:00:55 +00:00
  • e36ae3cede Fix context menu offset. Richard Lewis 2018-03-08 17:33:07 +00:00
  • 9524d1c313 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-08 17:30:21 +00:00
  • e87f8ee7b8 Merge pull request #1793 from matrix-org/luke/fix-tag-panel-clear-filter-tinting David Baker 2018-03-08 17:30:17 +00:00
  • fdec4b36c9 Hide padding if last control. Richard Lewis 2018-03-08 17:25:28 +00:00
  • 3ab8b1f866 Hide sticker picker delete button and show minimise button. Richard Lewis 2018-03-08 17:20:42 +00:00
  • 5ba55858e8 Use TintableSvg for TagPanel clear filter button Luke Barnard 2018-03-08 17:06:48 +00:00
  • 2bdaf5026d Correctly position mx_TagPanel_clearButton Luke Barnard 2018-03-08 17:05:13 +00:00
  • 99c15be766 Translated using Weblate (French) Kévin C 2018-03-08 16:57:41 +00:00
  • 3d34596162 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-08 16:47:50 +00:00
  • a03778388d Merge pull request #1792 from matrix-org/luke/fix-privileged-users-cosmetics Luke Barnard 2018-03-08 16:47:46 +00:00
  • a1d0cf65d6 Fix missing space between "...is a" and user ID Luke Barnard 2018-03-08 16:34:19 +00:00
  • 511a192d8b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-08 15:08:08 +00:00
  • b5c44e6b36 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-08 15:08:05 +00:00
  • c3ebe1f591 Merge pull request #6288 from vector-im/luke/e2e-request-keys-button Luke Barnard 2018-03-08 15:08:02 +00:00
  • 5148ca1a88 Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button Luke Barnard 2018-03-08 15:07:58 +00:00
  • 3a3cced905 E2E "fudge-button" Luke Barnard 2018-03-08 11:48:04 +00:00
  • 1119098eec Alter style of TooltipButton_helpText Luke Barnard 2018-03-08 14:11:36 +00:00
  • 8d5717b812 Allow arbitrary React nodes in RoomTooltip Luke Barnard 2018-03-08 14:11:06 +00:00
  • 9f5211061e CSS for E2E "fudge-button" UI Luke Barnard 2018-03-08 14:10:33 +00:00
  • 38efebb8d3 Split out sticker CSS Richard Lewis 2018-03-08 12:31:23 +00:00
  • c59dd5b840 Add placeholders for sticker images (and fancy transitions). Richard Lewis 2018-03-08 12:31:01 +00:00
  • e864dc97ba Translated using Weblate (Basque) Osoitz 2018-03-08 10:15:15 +00:00
  • e0798af09d Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-08 09:59:02 +00:00
  • 7f44f236e0 Translated using Weblate (Serbian) Марко М. Костић 2018-03-07 19:52:00 +00:00
  • d5ced62b90 Translated using Weblate (Esperanto) Tirifto 2018-03-07 12:29:17 +00:00
  • 441a8c722c Merge pull request #1790 from matrix-org/dbkr/hello_trace_why_are_you_here Luke Barnard 2018-03-08 09:58:57 +00:00
  • d919c1a41d Remove spurious console.trace David Baker 2018-03-08 09:47:42 +00:00
  • a4d8e9e4e5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-07 14:23:27 +00:00
  • 2baa77a93f Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-03-07 13:25:54 +00:00
  • c051492286 Merge pull request #6286 from vector-im/luke/fix-tag-panel-empty Luke Barnard 2018-03-07 14:23:22 +00:00
  • fe3f0be920 Ignore local config. Richard Lewis 2018-03-07 12:03:28 +00:00
  • b2bb15beb3 Remove accidentally checked in yarn.lock Richard Lewis 2018-03-07 11:59:44 +00:00
  • 7f91b47598 Move sticker picker icon. Richard Lewis 2018-03-07 11:52:42 +00:00
  • 63b696ff6c Make sure mx_TagPanel_tagTileContainer occupies full height Luke Barnard 2018-03-07 11:47:52 +00:00
  • 4a81d1cd6b Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-06 20:18:07 +00:00
  • 7a77da7a4c Merge pull request #1789 from matrix-org/dbkr/presence_only_on_user_activity Matthew Hodgson 2018-03-06 20:18:00 +00:00
  • a97e7375d5 Don't reset the presence timer on every dispatch David Baker 2018-03-06 17:48:21 +00:00
  • ed8f087eb6 fix access of element [0] of array even though it sometimes does not exist Michael Telatynski 2018-03-06 15:17:57 +00:00
  • 6785d75ad2 Remove logging. Richard Lewis 2018-03-06 14:46:40 +00:00
  • 78ae1ada3c Fix tooltip vertical positioning. Richard Lewis 2018-03-06 14:21:31 +00:00
  • 4d76194a9d Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-06 12:22:19 +00:00
  • d167dbcf86 Merge pull request #1788 from matrix-org/luke/fix-flair-store-potential-mem-leak David Baker 2018-03-06 12:22:14 +00:00
  • faf517419f Return null instead of undefined on failure Luke Barnard 2018-03-06 12:14:41 +00:00
  • 0fc79a4a0d Remove delay used in testing Luke Barnard 2018-03-06 12:13:46 +00:00
  • afbd563810 Potentially fix a memory leak in FlairStore Luke Barnard 2018-03-06 11:33:56 +00:00
  • d77ab891a0 Update tooltip position on scroll. Richard Lewis 2018-03-06 11:25:15 +00:00
  • b529edb5cc Linting Richard Lewis 2018-03-06 11:02:36 +00:00
  • d5465cf2fa Prefix and clarify global variable naming. Richard Lewis 2018-03-06 10:55:59 +00:00
  • 7755a3ce90 Nest sticker image element for correct positioning of tooltips. Richard Lewis 2018-03-06 10:48:32 +00:00
  • 9fc7435ea2 Correctly position tooltips relative to parent element. Richard Lewis 2018-03-06 10:47:53 +00:00
  • b2da66d670 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-06 09:56:28 +00:00
  • 5ade4b2bcf Merge pull request #6281 from vector-im/luke/fix-room-tile-cosmetics Matthew Hodgson 2018-03-06 09:56:22 +00:00
  • 17657aa8e2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-06 09:43:39 +00:00
  • bd8f78526e Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-03-05 09:11:15 +00:00
  • 213e25ab0f Merge pull request #1785 from matrix-org/luke/fix-room-tile-cosmetics Luke Barnard 2018-03-06 09:43:33 +00:00
  • 3c3fd7cf2a Remove typo rugk 2018-03-05 21:47:28 +01:00
  • cfed0cbd0d Mention localhost rugk 2018-03-05 21:37:07 +01:00
  • e2cedbe9d7 Pull in changes from develop Richard Lewis 2018-03-05 16:43:59 +00:00
  • ecad9b9dd3 Translated using Weblate (German) Krombel 2018-03-03 10:24:45 +00:00
  • a95f6a9804 Implement transparent RoomTile for use in some places Luke Barnard 2018-03-05 12:36:02 +00:00
  • 1b6cb2da68 Add transparent CSS class for RoomTile Luke Barnard 2018-03-05 12:34:51 +00:00
  • 0311a3a1be Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-03-05 11:29:29 +00:00
  • 7d7079a389 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-03-05 10:38:57 +00:00
  • 8f578f7378 Merge pull request #6273 from vector-im/luke/fix-copy-res-gen-i18n-crash David Baker 2018-03-05 11:29:24 +00:00
  • 3b02766be9 isHtml makes no sense if there is no formatted_body Michael Telatynski 2018-03-05 07:33:18 +00:00