Commit Graph

  • 3371506960 Merge pull request #1697 from matrix-org/t3chguy/nvl/rich_quoting David Baker 2018-01-12 09:41:14 +00:00
  • e82a95a0b5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-12 09:32:21 +00:00
  • b023cc790b Translated using Weblate (German) Klaus Marx 2018-01-11 11:06:29 +00:00
  • d3811e3287 Merge pull request #5653 from vector-im/t3chguy/analytics_info David Baker 2018-01-12 09:32:15 +00:00
  • 5aec6840bf Add cursor:pointer so that it actually looks clickable Michael Telatynski 2018-01-11 19:33:21 +00:00
  • 23bd612730 Focus composer when clicking Reply (quote event) Michael Telatynski 2018-01-11 19:29:00 +00:00
  • 192cba2b79 allow text&onSenderProfileClick for tileShape===quote Michael Telatynski 2018-01-11 19:25:43 +00:00
  • 17c4839029 only show reply button on REAL (not pending) m.room.message events Michael Telatynski 2018-01-11 19:21:02 +00:00
  • 90b7cb3760 Consistent popover size Richard Lewis 2018-01-11 13:41:55 +00:00
  • 9df4dae975 Used forked version of react-popover Richard Lewis 2018-01-11 13:41:20 +00:00
  • 1ab71f6f50 Load stickers in AppTile Richard Lewis 2018-01-11 13:20:58 +00:00
  • 26f377decf Translated using Weblate (Basque) Osoitz 2018-01-01 10:32:49 +00:00
  • 004ccc47b3 Translated using Weblate (Hungarian) Szimszon 2017-12-08 17:49:56 +00:00
  • 4f3670941d Bind functions Richard Lewis 2018-01-11 12:33:02 +00:00
  • 3163673705 Translated using Weblate (Hungarian) Szimszon 2018-01-11 12:30:29 +00:00
  • 3b4e233535 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-11 12:06:52 +00:00
  • 0ad84f4ab5 Translated using Weblate (Russian) Andrey 2018-01-11 11:24:36 +00:00
  • da562e015c Translated using Weblate (German) Klaus Marx 2018-01-11 11:16:26 +00:00
  • e187ec6a2f Merge pull request #1696 from matrix-org/t3chguy/fix_missing_negation Matthew Hodgson 2018-01-11 12:06:48 +00:00
  • 8ad4da54cb Fix missing negation Michael Telatynski 2018-01-11 12:04:53 +00:00
  • d0c16fa7a1 Convert to ES6 class. Richard Lewis 2018-01-11 11:49:46 +00:00
  • 78bd25eff0 Sticker popover styling Richard Lewis 2018-01-11 11:36:19 +00:00
  • 8f26155c16 Translated using Weblate (French) Kévin C 2018-01-11 11:19:52 +00:00
  • 2cf9da8c95 Load user stickerpacks Richard Lewis 2018-01-11 11:12:46 +00:00
  • 52607c4122 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-11 11:02:40 +00:00
  • b152bd4ab9 Merge pull request #1625 from matrix-org/t3chguy/analytics_info David Baker 2018-01-11 11:02:34 +00:00
  • b2bc506b36 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-11 11:01:08 +00:00
  • 84da19c544 Merge pull request #1668 from turt2live/travis/re-register-scalar-token David Baker 2018-01-11 11:01:04 +00:00
  • 62ced91356 Translated using Weblate (Russian) Andrey 2018-01-11 10:51:03 +00:00
  • 8ccc53088f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-11 10:49:44 +00:00
  • 0ce043ab12 Translated using Weblate (Russian) Andrey 2018-01-11 10:49:04 +00:00
  • 292a6c5767 Merge pull request #1674 from aidalgol/rebase-dialogs David Baker 2018-01-11 10:49:40 +00:00
  • fbd7860a9b Translated using Weblate (Russian) Andrey 2017-12-08 19:02:48 +00:00
  • 5e7fab1e15 Translated using Weblate (French) Kévin C 2018-01-11 10:39:19 +00:00
  • 586533d6ea Translated using Weblate (French) Kévin C 2017-11-16 16:04:45 +00:00
  • c8bd89ce4c Translated using Weblate (German) Bamstam 2017-11-16 12:38:22 +00:00
  • f845071f91 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-11 10:35:01 +00:00
  • efb96cdd2a Merge pull request #1695 from matrix-org/dbkr/send_without_verifying David Baker 2018-01-11 10:34:56 +00:00
  • 1a9b86b27f Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-11 10:34:48 +00:00
  • 070114d911 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-11 10:34:44 +00:00
  • 56300f9578 Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting David Baker 2018-01-11 10:34:43 +00:00
  • 4524e227d2 Merge pull request #1660 from matrix-org/t3chguy/nvl/rich_quoting David Baker 2018-01-11 10:34:39 +00:00
  • 1a994b88f5 Move widget utility functions in to their own file. Richard Lewis 2018-01-11 10:32:37 +00:00
  • 57e11cea1c Fix jsdoc David Baker 2018-01-11 10:27:15 +00:00
  • 77e2ceba9e switch to new ES6 DateUtils imports Michael Telatynski 2018-01-10 21:50:32 +00:00
  • 50271b7123 Remove padding on last component of MessageComposer (sticker toggle icons) Richard Lewis 2018-01-10 20:48:22 +00:00
  • 52f28d09e0 Stickerpack styling Richard Lewis 2018-01-10 20:44:14 +00:00
  • 2bb51bafe1 Content placeholder. Richard Lewis 2018-01-10 20:29:36 +00:00
  • 53b590f55e Add stickers popover. Richard Lewis 2018-01-10 20:27:43 +00:00
  • 007715aeaa Run prune-i18n.js Michael Telatynski 2018-01-10 12:54:00 +00:00
  • 94167e2b8b Run gen-i18n.js and embed the ellipsis into the base string Michael Telatynski 2018-01-10 12:52:20 +00:00
  • f5bad8bb10 Regenerate ESLintIgnore file Michael Telatynski 2018-01-10 12:50:12 +00:00
  • 1a7dc22a8d make wantsDateSeparator generic and throw into DateUtils Michael Telatynski 2018-01-10 12:06:24 +00:00
  • e45fcf10c7 Refactor DateUtils to ES6 Michael Telatynski 2018-01-10 12:00:11 +00:00
  • 9e2238e884 remove unused imports Michael Telatynski 2018-01-10 11:56:36 +00:00
  • 1bc9d344ae Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting Michael Telatynski 2018-01-10 11:54:58 +00:00
  • 454fd23f25 fix typo shsape->shape Michael Telatynski 2018-01-10 11:51:48 +00:00
  • a977ab9be4 change handler name to suit convention Michael Telatynski 2018-01-10 11:51:23 +00:00
  • e2b2818555 Empty to force re-test David Baker 2018-01-10 11:03:38 +00:00
  • 9dd9a5be4b Wording tweak David Baker 2018-01-09 17:59:49 +00:00
  • dbb8f878cb Tidy up imports David Baker 2018-01-09 17:57:18 +00:00
  • 9abb160120 Replace apps button with stickers button in message composer. Richard Lewis 2018-01-09 16:02:17 +00:00
  • 6b0b25c2d2 Translations Richard Lewis 2018-01-09 16:01:53 +00:00
  • 409bb5ff4d Improved icons. Richard Lewis 2018-01-09 16:01:33 +00:00
  • fa1059e202 Show / hide stickers icon styling Richard Lewis 2018-01-09 15:59:28 +00:00
  • f8e00e43e3 Show / hide sitckers icons Richard Lewis 2018-01-09 15:59:04 +00:00
  • 9e9de765dc Handle user widgets. Richard Lewis 2018-01-09 14:37:45 +00:00
  • 4c101628b5 Add 'send without verifying' to status bar David Baker 2018-01-09 13:52:37 +00:00
  • 9365860075 Update copyright line Aidan Gauland 2018-01-09 18:40:12 +13:00
  • 89c5be39d1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-08 21:33:27 +00:00
  • c8e87cb5a2 Merge pull request #5950 from vector-im/t3chguy-patch-1 Matthew Hodgson 2018-01-08 21:33:22 +00:00
  • 627ebb848d Change author Michael Telatynski 2018-01-08 21:32:25 +00:00
  • 60e7646f92 Save user widgets in accountData Richard Lewis 2018-01-08 16:47:49 +00:00
  • adebf71a1d Set user widgets on application data. Richard Lewis 2018-01-08 15:38:01 +00:00
  • 54cafec57a Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-08 15:18:08 +00:00
  • 1405859d2c Merge pull request #5944 from vector-im/revert-3046-patch-1 David Baker 2018-01-08 15:18:03 +00:00
  • 24e16e5c18 Revert "Add a   after timestamp" David Baker 2018-01-08 15:17:05 +00:00
  • 9c7783b439 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-08 15:00:51 +00:00
  • a21bbd15c5 Merge pull request #3046 from rubo77/patch-1 David Baker 2018-01-08 15:00:45 +00:00
  • b6c002b587 Fix merge David Baker 2018-01-08 14:35:39 +00:00
  • 9c3e4a1202 Merge branch 'develop' into patch-1 David Baker 2018-01-08 14:31:21 +00:00
  • 0577316c86 Fix duplicate event registration. Richard Lewis 2018-01-08 13:40:33 +00:00
  • d0897dc8f3 update wording to not imply exhaustiveness Michael Telatynski 2018-01-08 13:29:27 +00:00
  • 5df9a01e64 Use m.room.sticker event. Richard Lewis 2018-01-08 12:06:32 +00:00
  • 486b2cf102 Handle sticker message event. Richard Lewis 2018-01-08 11:32:38 +00:00
  • dc1423052f De-register listener. Richard Lewis 2018-01-08 11:32:23 +00:00
  • 97cc7f88ef Translated using Weblate (Chinese (Simplified)) Iru Cai (vimacs) 2018-01-08 02:01:47 +00:00
  • 275c960337 Translated using Weblate (Chinese (Simplified)) Iru Cai (vimacs) 2018-01-08 02:00:48 +00:00
  • 5a5b0568f2 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-07 20:34:24 +00:00
  • bddab533a3 Merge pull request #5938 from osoitz/master Matthew Hodgson 2018-01-07 20:34:19 +00:00
  • c8797a1347 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-07 20:33:13 +00:00
  • 76ce40715d bump commonmark dep to try to fix https://github.com/vector-im/riot-web/issues/3428 better Matthew Hodgson 2018-01-07 20:32:41 +00:00
  • eae95fce61 Merge remote-tracking branch 'origin/develop' into develop Weblate 2018-01-07 20:31:12 +00:00
  • f6851101cc Translated using Weblate (Basque) Osoitz 2018-01-07 17:33:13 +00:00
  • bcc3a4870a Merge pull request #1694 from matrix-org/revert-1270-luke/fix-md-unescaped-tokens Matthew Hodgson 2018-01-07 20:31:07 +00:00
  • a88f92c3e3 Revert "MD-escape URLs/alises/user IDs prior to parsing markdown" Matthew Hodgson 2018-01-07 20:30:18 +00:00
  • 5106809394 Update copy-res.js osoitz 2018-01-07 20:39:24 +01:00
  • 290bf54d4f pluralise properly Michael Telatynski 2018-01-05 23:55:32 +00:00
  • c68c54618f delint Michael Telatynski 2018-01-05 23:19:43 +00:00
  • 3788fde711 Add a tooltip to members button and badge with actual count Michael Telatynski 2018-01-05 23:16:21 +00:00