Commit Graph

  • d9ea9b4ad3 Iterate to match design on Zeplin Michael Telatynski 2019-12-19 20:53:34 +00:00
  • 970f16df3d Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 20:32:18 +00:00
  • 24d0d0d596 Merge pull request #3743 from matrix-org/t3chguy/react16_contexts Michael Telatynski 2019-12-19 20:32:11 +00:00
  • 5914553718 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 20:18:34 +00:00
  • a21fdb17fd Merge pull request #3749 from matrix-org/dbkr/keybackup_migrate David Baker 2019-12-19 20:18:28 +00:00
  • b2249d0561 Initial rejig Michael Telatynski 2019-12-19 20:09:05 +00:00
  • b98058fc3c Add bug for removing temporary srceen David Baker 2019-12-19 19:54:44 +00:00
  • 822762f014 add todo David Baker 2019-12-19 19:49:36 +00:00
  • 443d3812d1 Merge pull request #11690 from vector-im/t3chguy/context_menu_accelerators Michael Telatynski 2019-12-19 19:27:24 +00:00
  • b622cd8e35 Merge pull request #19 from vector-im/t3chguy/context_menu_accelerators Michael Telatynski 2019-12-19 19:27:20 +00:00
  • 93c252fd02 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 19:25:57 +00:00
  • 372512b0c4 Translated using Weblate (French) Kévin C 2019-12-19 17:54:46 +00:00
  • a410cc004f Merge pull request #3745 from matrix-org/t3chguy/get_rid_of_emoji_stripped_data Michael Telatynski 2019-12-19 19:25:50 +00:00
  • 48b166f451 Pass the key backup into the right thing David Baker 2019-12-19 17:28:32 +00:00
  • f716f673a8 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 17:27:46 +00:00
  • 290df9f50e Merge pull request #3753 from matrix-org/dbkr/combine_cross_sig_dm_verif_feature_flags David Baker 2019-12-19 17:27:41 +00:00
  • a25bc94343 remove unused, commented line of code Michael Telatynski 2019-12-19 17:22:02 +00:00
  • 86af43da6d Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 17:16:15 +00:00
  • ba2078e262 Merge pull request #3754 from matrix-org/t3chguy/fuzzy_filter_room_list Michael Telatynski 2019-12-19 17:16:09 +00:00
  • 4ee879ec08 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 16:58:40 +00:00
  • f3802bfd05 Merge pull request #3746 from matrix-org/t3chguy/emoji_picker Michael Telatynski 2019-12-19 16:58:34 +00:00
  • 1c31fd3413 Apply new design to highlighted tags and add toggle mechanic Michael Telatynski 2019-12-19 16:54:30 +00:00
  • f80d6e2877 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 16:27:24 +00:00
  • a13ee490e8 Merge pull request #3750 from matrix-org/t3chguy/m_too_large Michael Telatynski 2019-12-19 16:27:17 +00:00
  • e54429680b tidy up Michael Telatynski 2019-12-19 15:28:11 +00:00
  • c5e7594fe9 i18n David Baker 2019-12-19 15:27:29 +00:00
  • 26980e2ad5 apply unhomoglyph when filtering room list to fuzzify it Michael Telatynski 2019-12-19 15:26:04 +00:00
  • 3d8422c88a Combine cross signing and verification over DM feature flags David Baker 2019-12-19 15:23:32 +00:00
  • 709b2eed7c Add bunch of null-guards and similar to fix React Errors/complaints Michael Telatynski 2019-12-19 15:10:54 +00:00
  • 07761c6813 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-19 14:39:24 +00:00
  • 00b66b4877 Translated using Weblate (Slovak) Peter Vágner 2019-12-19 10:03:51 +00:00
  • 1010c0a27b Translated using Weblate (Italian) random 2019-12-19 08:58:42 +00:00
  • 3f7ea3bc66 Translated using Weblate (Finnish) Samu Voutilainen 2019-12-19 07:39:57 +00:00
  • 29523000dc Merge pull request #3748 from matrix-org/t3chguy/avatar_userinfo Michael Telatynski 2019-12-19 14:39:11 +00:00
  • db069b9602 delint Michael Telatynski 2019-12-19 14:33:46 +00:00
  • 6c1944359e Add RoomTile online indicator to DMs Michael Telatynski 2019-12-19 14:29:46 +00:00
  • 3678e64f5d Internationalise M_TOO_LARGE error from Synapse Michael Telatynski 2019-12-19 13:25:43 +00:00
  • 66783dff9e Fix scaling of the avatar in UserInfo Michael Telatynski 2019-12-19 12:27:25 +00:00
  • 6ead268ef0 electron-main: Provide a better error message if Seshat isn't installed. Damir Jelić 2019-12-19 12:45:32 +01:00
  • 6851ad04b6 Migrate key backups to SSSS David Baker 2019-12-19 11:26:20 +00:00
  • 5fbe74e20d Add accelerators to context menu options like cut&paste in electron Michael Telatynski 2019-12-19 11:16:33 +00:00
  • 7d6ae5437a Add accelerators to context menu options like cut&paste in electron Michael Telatynski 2019-12-19 11:16:32 +00:00
  • 4fe0150944 Regen yarn.lock Michael Telatynski 2019-12-19 10:51:55 +00:00
  • affc8b8459 Merge branches 'develop' and 't3chguy/jest' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/jest Michael Telatynski 2019-12-19 10:50:14 +00:00
  • 3196655524 Replace UserInfo avatar with <MemberAvatar/> for fallback logic Michael Telatynski 2019-12-19 09:06:52 +00:00
  • 833dcbac64 Rewire the Sticker button to be an Emoji Picker Michael Telatynski 2019-12-19 09:25:51 +00:00
  • a1df87a375 Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed Michael Telatynski 2019-12-19 07:23:05 +00:00
  • a5d5569af4 Translated using Weblate (Japanese) David Baker 2019-12-17 21:40:17 +00:00
  • d35b01b63a Get rid of stripped-emoji.json in favour of an in-memory single truth source Michael Telatynski 2019-12-18 15:40:19 +00:00
  • 513ec30ef1 Fix tests v2 Michael Telatynski 2019-12-17 18:02:45 +00:00
  • f3ca4c0b7c fix tests Michael Telatynski 2019-12-17 17:54:19 +00:00
  • 38e75aaae0 Merge pull request #3722 from matrix-org/travis/babel7 Travis Ralston 2019-12-17 10:44:20 -07:00
  • ce995d1a1e Merge branch 'origin/develop' into Weblate. Weblate 2019-12-17 17:39:47 +00:00
  • f30e919f9e Merge pull request #3741 from matrix-org/t3chguy/dropdown_keyboard_propagation Michael Telatynski 2019-12-17 17:39:41 +00:00
  • da4d72b3c4 delint Michael Telatynski 2019-12-17 17:34:03 +00:00
  • b094f0fe47 delint Michael Telatynski 2019-12-17 17:31:29 +00:00
  • 937b32663c Migrate away from Legacy React Contexts Michael Telatynski 2019-12-17 17:26:12 +00:00
  • 7811bd8859 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-17 17:02:41 +00:00
  • 1a44f01f0a Merge pull request #3742 from matrix-org/travis/rp-memberinfo Travis Ralston 2019-12-17 10:02:35 -07:00
  • 2e8d66fa36 Null-guard member mention pills for rooms you have left (notif panel) Michael Telatynski 2019-12-17 16:54:59 +00:00
  • 16181ff0ed Fix right panel for multiple member info viewings Travis Ralston 2019-12-17 09:47:06 -07:00
  • 069129507f Merge branch 'origin/develop' into Weblate. Weblate 2019-12-17 16:45:54 +00:00
  • 3f5dc4fcdc Merge pull request #3740 from matrix-org/t3chguy/field_validation_async_tooltip_sticks Michael Telatynski 2019-12-17 16:45:48 +00:00
  • 1d9d812b04 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-17 15:14:04 +00:00
  • 7f78f55c94 Dropdown stop keyboard propagation if key handled Michael Telatynski 2019-12-17 15:14:01 +00:00
  • 0c89ab9fb5 Merge pull request #3738 from matrix-org/t3chguy/null-guard-useIsEncrypted Michael Telatynski 2019-12-17 15:13:59 +00:00
  • 4479018289 Merge pull request #11660 from vector-im/travis/babel7-reskindex Travis Ralston 2019-12-17 08:11:14 -07:00
  • d06f476a4d Merge pull request #3723 from matrix-org/travis/babel7-reskindex Travis Ralston 2019-12-17 08:09:59 -07:00
  • b4f9b88025 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-17 15:07:19 +00:00
  • 590ef79300 Merge pull request #3737 from matrix-org/travis/room-dir Travis Ralston 2019-12-17 08:07:12 -07:00
  • 0e86c2648d improve comment Michael Telatynski 2019-12-17 14:36:20 +00:00
  • 213bc4c3ac Fix Field validation tooltip sticking if blurred before async validation resolved Michael Telatynski 2019-12-17 14:28:18 +00:00
  • c1133ebfc6 null-guard useIsEncrypted Michael Telatynski 2019-12-17 14:05:51 +00:00
  • b9e22f8141 add delay Michael Telatynski 2019-12-17 13:11:30 +00:00
  • a2246374f1 correct testMatch so it doesn't try run js-sdk tests Michael Telatynski 2019-12-17 13:05:18 +00:00
  • 409a111b02 wait additional tick Michael Telatynski 2019-12-17 12:42:47 +00:00
  • bcba9a3e50 fix yarn test for bashy things v2 Michael Telatynski 2019-12-17 12:23:51 +00:00
  • f06a94388f fix yarn test for bashy things Michael Telatynski 2019-12-17 12:22:11 +00:00
  • 386d6ec055 we don't need to install riot-web for react-sdk unit tests Michael Telatynski 2019-12-17 12:16:40 +00:00
  • c3415d2121 delint Michael Telatynski 2019-12-17 12:09:01 +00:00
  • 802092bf9a All tests passing locally. We no longer need Chrome in buildkite Michael Telatynski 2019-12-17 11:53:18 +00:00
  • e6d8487302 Fix more tests Michael Telatynski 2019-12-17 11:47:01 +00:00
  • ab3fb6581b Down to 7 test failures Michael Telatynski 2019-12-17 11:24:37 +00:00
  • c0f3db1678 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-17 10:07:18 +00:00
  • 0140338ac5 Merge pull request #3735 from matrix-org/t3chguy/address_picker_dialog_tab_trap Michael Telatynski 2019-12-17 10:07:12 +00:00
  • 17463c401f post-merge fix Michael Telatynski 2019-12-17 09:58:04 +00:00
  • d7a411f588 Merge branch 'develop' into t3chguy/address_picker_dialog_tab_trap Michael Telatynski 2019-12-17 09:57:28 +00:00
  • 285667d653 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-17 09:55:22 +00:00
  • a7a7a9cb23 Translated using Weblate (Hungarian) Szimszon 2019-12-17 05:48:28 +00:00
  • 284a1fdde7 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2019-12-17 03:40:47 +00:00
  • 3a8ab6ec2b Merge pull request #3736 from matrix-org/t3chguy/stop_using_deprecated_keyCode Michael Telatynski 2019-12-17 09:55:13 +00:00
  • b2a1a40961 Fix room directory maintaining and error state Travis Ralston 2019-12-16 16:47:33 -07:00
  • 9865ce899b Add a bunch of docs Travis Ralston 2019-12-16 16:34:46 -07:00
  • 0a9985fb48 Rename decorator for clarity Travis Ralston 2019-12-16 16:10:11 -07:00
  • 434570eca9 Explain why MatrixClientPeg is the way it is Travis Ralston 2019-12-16 16:07:58 -07:00
  • b8faaa23c1 Remove irrelevant targets Travis Ralston 2019-12-16 16:06:43 -07:00
  • b7e2acc5f0 Merge branch 'origin/develop' into Weblate. Weblate 2019-12-16 17:25:34 +00:00
  • eb5ebaf754 Translated using Weblate (French) Kévin C 2019-12-16 12:19:22 +00:00
  • dd216d1b3a Merge pull request #3733 from matrix-org/t3chguy/remove_avatar_2.0 Michael Telatynski 2019-12-16 17:25:27 +00:00
  • eaabe351d9 Stop trapping tab in AddressPickerDialog Michael Telatynski 2019-12-16 17:23:56 +00:00