Commit Graph

  • 453b7d1007 Implement riot-web side of dragging GroupTile avatars to TagPanel Luke Barnard 2018-02-14 16:37:32 +00:00
  • c68eb57798 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-14 11:41:05 +00:00
  • ca763faf96 Merge pull request #1750 from matrix-org/luke/fix-room-list-custom-tag-ordering2 David Baker 2018-02-14 11:40:59 +00:00
  • eb4f5b76b3 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-14 11:33:53 +00:00
  • 46b8fb9a19 Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets David Baker 2018-02-14 11:33:48 +00:00
  • 3020c8cd94 Fix custom tags not being ordered manually Luke Barnard 2018-02-14 11:23:29 +00:00
  • 7ac350ea36 Give mx_RoomView_messageListWrapper its min-height: 100% back Luke Barnard 2018-02-14 11:17:21 +00:00
  • 47c232b5b3 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first Luke Barnard 2018-02-14 11:00:27 +00:00
  • b3bb2d2aa5 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first Luke Barnard 2018-02-14 10:51:20 +00:00
  • 9139dcbd1e Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-14 10:42:55 +00:00
  • 14b0e85850 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-14 10:42:46 +00:00
  • 8c1d2a4555 Merge pull request #6140 from vector-im/luke/fix-tag-panel-css Luke Barnard 2018-02-14 10:42:49 +00:00
  • 480c046fb1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-14 10:31:43 +00:00
  • db2f6f863a Translated using Weblate (Spanish) Simó Albert i Beltran 2018-02-13 18:00:22 +00:00
  • ed871cbd83 Translated using Weblate (Russian) Walter 2018-02-13 18:55:45 +00:00
  • 02e0663409 Translated using Weblate (Catalan) Simó Albert i Beltran 2018-02-13 18:44:58 +00:00
  • bee0a952c3 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-13 18:57:09 +00:00
  • 7cc82a682c Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback David Baker 2018-02-14 10:31:36 +00:00
  • 009e01c1b0 Fix LeftPanel size being incorrect when TagPanel disabled Luke Barnard 2018-02-14 10:18:12 +00:00
  • 0d85a46e84 Translated using Weblate (Hungarian) Szimszon 2018-02-14 07:51:52 +00:00
  • d05b221a6c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 22:03:03 +00:00
  • 54f4563303 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-13 21:08:10 +00:00
  • 7aea7f9400 Merge pull request #6134 from vector-im/luke/fix-tag-panel-collapse Matthew Hodgson 2018-02-13 22:02:58 +00:00
  • 9abda76d9e Merge branch 'develop' into luke/fix-tag-panel-collapse Matthew Hodgson 2018-02-13 22:02:49 +00:00
  • 42582c7ccd Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 20:45:44 +00:00
  • c88a59c228 Translated using Weblate (Spanish) Simó Albert i Beltran 2018-02-13 18:49:16 +00:00
  • b54f949fe6 Translated using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-13 19:55:08 +00:00
  • a966cc7dec Merge pull request #6138 from vector-im/rxl881/llpFix Richard Lewis 2018-02-13 20:45:39 +00:00
  • 55cacfba82 Temporary hack to constrain LLP container size. Richard Lewis 2018-02-13 20:42:46 +00:00
  • 3bc1eef39b Translated using Weblate (Russian) Walter 2018-02-13 18:55:45 +00:00
  • ee7add05ae Translated using Weblate (Catalan) Simó Albert i Beltran 2018-02-13 18:44:58 +00:00
  • e7d1c04bb5 Translated using Weblate (French) Kévin C 2018-02-13 18:25:06 +00:00
  • 247a3cebb9 Translated using Weblate (Spanish) Simó Albert i Beltran 2018-02-13 18:00:22 +00:00
  • 5bf0b7d652 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 17:32:54 +00:00
  • 0b5fe1232f Merge pull request #6137 from rbozhkova/patch-1 Matthew Hodgson 2018-02-13 17:32:50 +00:00
  • 03be7eb32c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 17:28:52 +00:00
  • 24c9a06c80 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 17:28:48 +00:00
  • 3a808411f5 Merge pull request #6127 from vector-im/luke/feature-tag-panel-tile-context-menu Luke Barnard 2018-02-13 17:28:47 +00:00
  • c670b76ec8 Merge pull request #1743 from matrix-org/luke/feature-tag-panel-tile-context-menu Luke Barnard 2018-02-13 17:28:43 +00:00
  • 06b18dda18 Added translation using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-13 17:23:42 +00:00
  • 2524c5f861 Added translation using Weblate (Bulgarian) Ralitsa Bozhkova 2018-02-13 17:22:45 +00:00
  • db5f4193ec Fix typo rbozhkova 2018-02-13 18:22:01 +01:00
  • 11b0cc8211 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu Luke Barnard 2018-02-13 17:00:19 +00:00
  • a34fea8af8 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu Luke Barnard 2018-02-13 16:51:00 +00:00
  • 8ae62b8526 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 16:15:55 +00:00
  • e0d598fb19 Merge pull request #1748 from matrix-org/luke/fix-manually-ordered-custom-tagged-rooms Luke Barnard 2018-02-13 16:15:49 +00:00
  • f16bc93fee If a tag is unrecognised, assume manual ordering Luke Barnard 2018-02-13 16:09:17 +00:00
  • 285c4f91d3 Fix TagPanel from collapsing to < 60px when LP collapsed Luke Barnard 2018-02-13 15:17:51 +00:00
  • 5af560f625 Make removedTags a Set for perf Luke Barnard 2018-02-13 14:43:34 +00:00
  • 084ebe6e16 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 14:18:56 +00:00
  • 1cdb1d841d Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 14:18:52 +00:00
  • e67147213b Merge pull request #6096 from vector-im/luke/room-list-flux David Baker 2018-02-13 14:18:50 +00:00
  • a0aa3df893 Merge pull request #1719 from matrix-org/luke/room-list-flux David Baker 2018-02-13 14:18:46 +00:00
  • 85c0b8dea3 Adjust CSS to prevent scrollbars on message panel spinner Luke Barnard 2018-02-13 14:15:22 +00:00
  • 36e8bf1f20 Change CSS class for message panel spinner Luke Barnard 2018-02-13 14:13:47 +00:00
  • 8377abcd19 Store component state for editors Luke Barnard 2018-02-13 11:49:59 +00:00
  • 493116b17e Give the login page its spinner back Luke Barnard 2018-02-13 11:43:22 +00:00
  • db0ea9eb0e Merge branch 'develop' into luke/room-list-flux Luke Barnard 2018-02-13 10:18:24 +00:00
  • aec3c9961c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 10:00:58 +00:00
  • c7aafd8410 Translated using Weblate (Latvian) Oskars 2018-02-11 23:18:58 +00:00
  • c0720d5d24 Translated using Weblate (Japanese) lighthawk 2018-02-10 02:21:19 +00:00
  • d28d7d8768 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-13 10:00:56 +00:00
  • ec0dd63470 Merge pull request #6130 from vector-im/luke/move-groups-button-tp David Baker 2018-02-13 11:00:53 +01:00
  • 03921bad79 Merge pull request #1744 from matrix-org/luke/move-groups-button-tp David Baker 2018-02-13 11:00:49 +01:00
  • 2269c94579 Move groups button to TagPanel Luke Barnard 2018-02-13 09:44:25 +00:00
  • 6d3634a06c Move groups button to TagPanel Luke Barnard 2018-02-13 09:44:00 +00:00
  • 5e9368e794 Add comments explaining our non standard usage of aria-described-by Peter Vágner 2018-02-12 21:13:53 +01:00
  • e36baa8c3a Fix quotes on import Luke Barnard 2018-02-12 18:47:29 +00:00
  • 322012cf88 Add comment to explain hacky optimism Luke Barnard 2018-02-12 18:46:36 +00:00
  • 3eeef064bf Remove unused asyncId Luke Barnard 2018-02-12 18:37:54 +00:00
  • 7a4c1994c3 Use Boolean() instead of assuming filter is based on truthiness Luke Barnard 2018-02-12 18:35:13 +00:00
  • d47c9d8b6e Add context menu to TagPanel Luke Barnard 2018-02-12 18:02:55 +00:00
  • e3f68f12c8 Add context menu to TagTile Luke Barnard 2018-02-12 18:01:08 +00:00
  • 66de16e31f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-12 10:23:14 +00:00
  • 0f5dc5a7e4 Translated using Weblate (Latvian) Oskars 2018-02-12 00:54:12 +00:00
  • b4aa9f37f6 Merge pull request #1738 from tulir/timestamp-hover-seconds David Baker 2018-02-12 11:23:08 +01:00
  • aeedf48d84 fix weird in op behaviour with null Michael Telatynski 2018-02-11 11:45:13 +00:00
  • 0fd9b3e9b2 Avoid doubling up username in read receipt view Aidan Gauland 2018-02-11 16:27:07 +13:00
  • 97ce84c8e3 Add display name to the read receipt view Aidan Gauland 2018-02-11 16:14:17 +13:00
  • f2da24533c Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-10 18:38:48 +00:00
  • e141075560 Translated using Weblate (Latvian) Oskars 2018-02-10 16:38:14 +00:00
  • 40cee9bb02 Merge pull request #1739 from matrix-org/luke/fix-autocomplete-truncated-users Matthew Hodgson 2018-02-10 18:38:43 +00:00
  • 7bf05b0715 add unmounted guard Michael Telatynski 2018-02-10 16:01:19 +00:00
  • 25bc9cfbe7 make spinner size more appropriate Michael Telatynski 2018-02-10 15:47:32 +00:00
  • 7425d01b21 tidy, improve error handling and improve Replies, run gen-i18n Michael Telatynski 2018-02-10 15:45:42 +00:00
  • 23c0daa83a pass onWidgetLoad to fix console err for e2e Michael Telatynski 2018-02-10 12:41:31 +00:00
  • fbb950e064 mass s/Quote/Reply Michael Telatynski 2018-02-10 12:38:25 +00:00
  • 93a381218c Translated using Weblate (Latvian) Oskars 2018-02-10 12:34:39 +00:00
  • 18145460b2 fix Replies for e2e Michael Telatynski 2018-02-10 12:31:22 +00:00
  • a15d024ad3 Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to Michael Telatynski 2018-02-10 11:23:51 +00:00
  • 1c3d8cbe6e initial refactor of Replies to use B explicit over-the-wire format Michael Telatynski 2018-02-10 11:19:43 +00:00
  • 095130a569 Hide apps drawer Richard Lewis 2018-02-09 13:23:56 +00:00
  • 55593416fa Hide apps drawer when viewining room settings. Richard Lewis 2018-02-09 13:23:34 +00:00
  • 5472dc78d7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-09 12:46:37 +00:00
  • 1d2f5bafda Merge branch 'master' into develop David Baker 2018-02-09 12:46:28 +00:00
  • 9e614a54da v0.13.5 v0.13.5 David Baker 2018-02-09 12:43:45 +00:00
  • 30087e5c73 Prepare changelog for v0.13.5 David Baker 2018-02-09 12:43:45 +00:00
  • 1d222e3507 v0.13.5 David Baker 2018-02-09 12:38:23 +00:00
  • b20dea58c6 Bump react-sdk version David Baker 2018-02-09 12:36:19 +00:00
  • 70be1f4596 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-02-09 12:34:56 +00:00