Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 76baf33461 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 22:13:34 +00:00
  • c6a827995f Merge pull request #3965 from matrix-org/t3chguy/members_button_regression Michael Telatynski 2020-01-28 22:13:29 +00:00
  • 7b5a8856a4 Passing refireParams actually prevented this from working Michael Telatynski 2020-01-28 22:06:04 +00:00
  • 3d816e3042 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 22:02:25 +00:00
  • 8c471d6713 Merge pull request #3964 from matrix-org/dbkr/start_key_backup_in_bootstrap David Baker 2020-01-28 22:02:20 +00:00
  • ae8a4b678d Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 21:53:55 +00:00
  • 463bddb7e9 Merge pull request #3958 from mstange/fix-unread-scroll-button-hittarget-and-alignment J. Ryan Stinnett 2020-01-28 21:53:50 +00:00
  • a58f9a6b07 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 20:36:28 +00:00
  • 68a22a4d64 Translated using Weblate (Hungarian) Szimszon 2020-01-28 20:06:25 +00:00
  • 793ff2cccc Hide pre-join UTDs (#3881) Hubert Chathi 2020-01-28 15:36:24 -05:00
  • 624ea505c3 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 20:05:48 +00:00
  • 02ba548a62 Merge pull request #3963 from matrix-org/jryans/user-info-device-id J. Ryan Stinnett 2020-01-28 20:05:43 +00:00
  • 32cb3b8ccb onClick to separate line J. Ryan Stinnett 2020-01-28 19:55:53 +00:00
  • 39c8a9d204 Start new key backup in security setup flow David Baker 2020-01-28 19:42:09 +00:00
  • 85d929f694 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 18:05:14 +00:00
  • d1cbec98b7 Merge pull request #3962 from matrix-org/dbkr/better_flow_for_upgrade_on_login David Baker 2020-01-28 18:05:09 +00:00
  • 6fb8f6eef1 Add device IDs in user info tooltips J. Ryan Stinnett 2020-01-28 18:03:47 +00:00
  • de295cc350 Merge remote-tracking branch 'origin/develop' into dbkr/better_flow_for_upgrade_on_login David Baker 2020-01-28 17:49:57 +00:00
  • b002806639 Use DialogButtons because reusability :(( Michael Telatynski 2020-01-28 17:42:39 +00:00
  • 61b198d7f8 Merge branch 'develop' into travis/update-qr-code Travis Ralston 2020-01-28 17:27:17 +00:00
  • 5e1b42b350 unused component David Baker 2020-01-28 17:21:42 +00:00
  • 76e61b9948 Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration Michael Telatynski 2020-01-28 17:19:59 +00:00
  • e1e35a53e4 i18n David Baker 2020-01-28 17:18:09 +00:00
  • 546acb696d Add confirmation to skip button David Baker 2020-01-28 17:15:50 +00:00
  • 58df4127d3 Update propTypes and remove todo Michael Telatynski 2020-01-28 17:14:48 +00:00
  • 0a67fb9a6b Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 16:54:21 +00:00
  • 6c10c1b76d Translated using Weblate (Hungarian) Szimszon 2020-01-28 16:16:03 +00:00
  • dc1405c3b3 Merge pull request #3961 from matrix-org/travis/legacy-decorators Travis Ralston 2020-01-28 16:54:13 +00:00
  • 4affaaf309 Merge pull request #12110 from vector-im/travis/legacy-decorators Travis Ralston 2020-01-28 16:54:10 +00:00
  • d3d6e4ae77 Switch back to legacy decorators Travis Ralston 2020-01-28 16:46:02 +00:00
  • 330b489fd5 Switch back to legacy decorators Travis Ralston 2020-01-28 16:44:30 +00:00
  • abfa593791 Make the 'encryption upgrade' flow better David Baker 2020-01-28 16:36:07 +00:00
  • 2dbb248598 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 16:15:54 +00:00
  • ab8fe80d6b Translated using Weblate (Hungarian) Szimszon 2020-01-28 16:11:15 +00:00
  • cf2538fbed Merge pull request #3894 from matrix-org/hs/bridge-info-pretty Will Hunt 2020-01-28 16:15:49 +00:00
  • bfaa9d56fb prefixes Half-Shot 2020-01-28 16:05:27 +00:00
  • ff532dd684 Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty Half-Shot 2020-01-28 16:01:50 +00:00
  • 5cabfb63a4 EventIndex: Don't mark the event listener method docs as jsdoc comments. Damir Jelić 2020-01-28 16:13:56 +01:00
  • e178135bff Merge branch 'develop' into travis/update-qr-code Travis Ralston 2020-01-28 15:02:50 +00:00
  • daf6aaaf30 Merge pull request #12102 from vector-im/travis/babel-skinning Travis Ralston 2020-01-28 14:50:25 +00:00
  • e812c9c986 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 14:50:24 +00:00
  • 145d2bb16b Merge pull request #3957 from matrix-org/travis/babel-skinning Travis Ralston 2020-01-28 14:50:19 +00:00
  • 85bcad0ea0 Styling for Nad Half-Shot 2020-01-28 14:42:58 +00:00
  • 720b9a92fe Merge branch 'develop' into travis/babel-skinning Travis Ralston 2020-01-28 14:41:51 +00:00
  • 9821e25e0b Tweak styling of unread indicator circle. Markus Stange 2020-01-28 15:12:07 +01:00
  • d50b52cdc5 Try to fix Jest Travis Ralston 2020-01-28 14:31:09 +00:00
  • cff4ad9e82 Remove legacy and stop using deprecated things Travis Ralston 2020-01-28 14:21:26 +00:00
  • 894568bf7a Stop using deprecated stuff Travis Ralston 2020-01-28 14:19:06 +00:00
  • a4778cc7e3 Remove legacy Travis Ralston 2020-01-28 14:18:12 +00:00
  • 79f3b44279 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 14:13:09 +00:00
  • a19cdc9077 Merge pull request #3956 from matrix-org/jryans/trigger-cs-lab-4s J. Ryan Stinnett 2020-01-28 14:13:04 +00:00
  • 948ec203c6 BaseEventIndexManager: Fix the type hints for the empty promises. Damir Jelić 2020-01-28 15:07:29 +01:00
  • 0b7f23fa54 EventIndex: Improve the documentation a bit. Damir Jelić 2020-01-28 15:06:43 +01:00
  • d0c28adfb1 Appease the linter Travis Ralston 2020-01-28 12:53:37 +00:00
  • e3e7a47aea Update babel targets Travis Ralston 2020-01-28 12:48:27 +00:00
  • 21405b8f25 Fix skinning and babel tagets Travis Ralston 2020-01-28 12:44:14 +00:00
  • 9cf59ab16d Enable cross-signing lab when key in storage J. Ryan Stinnett 2020-01-28 12:30:39 +00:00
  • e0ffedca45 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 11:50:09 +00:00
  • dea919f6ee Merge pull request #3953 from matrix-org/jryans/verif-toast-details-2 J. Ryan Stinnett 2020-01-28 11:50:03 +00:00
  • 71233a5aff liney liney come back we need you Half-Shot 2020-01-28 11:33:51 +00:00
  • 7c0a461cbb Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty Half-Shot 2020-01-28 11:22:02 +00:00
  • c93b080434 delint Michael Telatynski 2020-01-28 11:17:53 +00:00
  • 785277d4b8 Review bits for travis Half-Shot 2020-01-28 11:17:51 +00:00
  • 657457c14b Apply remainder of ux Michael Telatynski 2020-01-28 11:13:09 +00:00
  • f4842688f8 Add reciprocate to verification methods Travis Ralston 2020-01-28 11:10:15 +00:00
  • b628f23a6b Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 10:16:31 +00:00
  • 06f7842afa Merge pull request #3949 from matrix-org/foldleft/12079-fix-warnings-on-self Zoe 2020-01-28 10:16:27 +00:00
  • 67358e06bf Use annotations and imports J. Ryan Stinnett 2020-01-28 10:10:37 +00:00
  • bdaf9fd06d i18n Half-Shot 2020-01-28 10:05:42 +00:00
  • a155fa7576 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-28 10:01:20 +00:00
  • 23a6b44fe7 Translated using Weblate (French) Kévin C 2020-01-28 07:43:25 +00:00
  • 6a9786e202 Merge pull request #3951 from matrix-org/jryans/comp-sec-body J. Ryan Stinnett 2020-01-28 10:01:13 +00:00
  • d014c5239b Add new session verification details dialog J. Ryan Stinnett 2020-01-27 23:14:02 +00:00
  • c2c90a0fe5 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-27 22:39:53 +00:00
  • 7effd22f6b Translated using Weblate (Turkish) catborise 2020-01-27 20:05:38 +00:00
  • a168461e8b Merge pull request #3952 from matrix-org/travis/settings-unwatch Travis Ralston 2020-01-27 22:39:47 +00:00
  • 2a1407a531 Add more logging to settings watchers Travis Ralston 2020-01-27 15:36:12 -07:00
  • 89f110f60a Add separate component for post-auth security flows J. Ryan Stinnett 2020-01-27 22:27:11 +00:00
  • d87f9375cf Merge branch 'origin/develop' into Weblate. Weblate 2020-01-27 19:55:33 +00:00
  • 68bf646d03 Translated using Weblate (German) Joshua Dietz 2020-01-27 17:45:39 +00:00
  • dbf0c5b4c3 Translated using Weblate (Albanian) Besnik Bleta 2020-01-27 17:14:46 +00:00
  • f3fc95296e Merge pull request #3944 from stoically/develop J. Ryan Stinnett 2020-01-27 19:55:23 +00:00
  • ff195381e9 Use https for recaptcha for all non-http protocols stoically 2020-01-22 16:44:47 +01:00
  • db1d3c091e Error handle the no QR verif case better Michael Telatynski 2020-01-27 17:21:31 +00:00
  • ca5d4d88a2 Style the QR code Michael Telatynski 2020-01-27 17:17:05 +00:00
  • 1964e18315 Fix issue where we don't notice if our own devices shouldn't be trusted Zoe 2020-01-27 16:40:56 +00:00
  • 59be4313f4 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-27 16:17:38 +00:00
  • e2dd2bd950 Merge branch 'poljar/seshat-ui-pr' into develop Damir Jelić 2020-01-27 17:18:17 +01:00
  • 1d90600ee1 Translated using Weblate (Esperanto) Tirifto 2020-01-27 10:25:39 +00:00
  • 40ec6d47a6 Translated using Weblate (Albanian) Besnik Bleta 2020-01-27 10:26:19 +00:00
  • c30f901716 Merge pull request #12076 from vector-im/jryans/fetch-deps-lint J. Ryan Stinnett 2020-01-27 16:13:10 +00:00
  • 0ad0cbeb35 Install deps for linting J. Ryan Stinnett 2020-01-27 16:05:41 +00:00
  • 8ca6c2c433 Flip SDKs back to develop J. Ryan Stinnett 2020-01-27 16:01:12 +00:00
  • 805e9abb39 Flip back to develop J. Ryan Stinnett 2020-01-27 16:00:25 +00:00
  • ab8ea52266 EventIndexPanel: Make sure links get opened in a new tab. Damir Jelić 2020-01-27 16:50:33 +01:00
  • 50b491d7e5 post merge fix Michael Telatynski 2020-01-27 15:48:19 +00:00
  • ddb0f06005 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration Michael Telatynski 2020-01-27 15:46:38 +00:00
  • e38f1191a5 ManageEventIndex: Clarify that we're currently not downloading any messages. Damir Jelić 2020-01-27 15:50:14 +01:00
  • 5851b10f72 strings Half-Shot 2020-01-27 14:44:11 +00:00
  • 4d83288f4e linting Half-Shot 2020-01-27 14:42:46 +00:00