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

Commit Graph

  • adead76882 Merge branch 'develop' into bwindels/selfverifux Bruno Windels 2020-04-03 17:53:07 +02:00
  • 2cf55fb2a0 adjust start options styling Bruno Windels 2020-04-03 17:32:09 +02:00
  • 37289bc832 i18n Bruno Windels 2020-04-03 17:05:20 +02:00
  • 364421b088 adjust self-verification copy in incoming verif req toast Bruno Windels 2020-04-03 17:04:58 +02:00
  • cdbd4da0e4 adjust copy for self-verification in verification panel Bruno Windels 2020-04-03 17:04:29 +02:00
  • 030d594e67 for self-verif, mention which device, not user we're verifying in panel Bruno Windels 2020-04-03 17:03:37 +02:00
  • a0805e8a55 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-03 12:28:46 +00:00
  • c15fa2ba0c Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate Bruno Windels 2020-04-03 12:28:41 +00:00
  • 62528253ec Merge branch 'origin/develop' into Weblate. Weblate 2020-04-03 12:23:18 +00:00
  • a377ca7b85 Merge pull request #13020 from vector-im/t3chguy/fix_mac_shortcut Michael Telatynski 2020-04-03 13:23:13 +01:00
  • c1da3bf537 Fix Electron mac-specific shortcut being registered on Web too. Michael Telatynski 2020-04-03 13:01:28 +01:00
  • 20c6dc208c Merge branch 'origin/develop' into Weblate. Weblate 2020-04-03 11:52:58 +00:00
  • 2698751429 Merge pull request #4339 from jungeonkim/develop Bruno Windels 2020-04-03 11:52:53 +00:00
  • 94236de637 Fix Hangul typing does not work properly JungEon Kim 2020-04-03 03:36:25 +09:00
  • 0102876e40 Re-request room keys after auth Zoe 2020-04-03 11:49:08 +01:00
  • c46358c4bb Merge branch 'origin/develop' into Weblate. Weblate 2020-04-03 10:27:37 +00:00
  • 9407df3da0 Merge pull request #4336 from matrix-org/bwindels/fixverifytoastaftercompletesecurity Bruno Windels 2020-04-03 10:27:32 +00:00
  • 257e2e7266 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-03 10:07:54 +00:00
  • 4b5e2198fd Translated using Weblate (French) Kévin C 2020-04-03 06:55:13 +00:00
  • cabaf36794 Merge pull request #4340 from matrix-org/jryans/read-marker-groupers J. Ryan Stinnett 2020-04-03 11:07:46 +01:00
  • 86f39ee0ee Fix read marker visibility for grouped events J. Ryan Stinnett 2020-04-02 15:07:50 +01:00
  • 171ffa5d1c Merge branch 'origin/develop' into Weblate. Weblate 2020-04-02 16:40:44 +00:00
  • 3ed457ea7d Merge pull request #4305 from JorikSchellekens/joriks/font-scaling Jorik Schellekens 2020-04-02 17:40:39 +01:00
  • 2ee780caa2 pass isSelf flag to sas component Bruno Windels 2020-04-02 18:28:14 +02:00
  • 6bb6885578 adjust sas copy to use device -> session Bruno Windels 2020-04-02 18:28:01 +02:00
  • cc9c5cabb3 adapt encryption info to self-verification Bruno Windels 2020-04-02 17:51:25 +02:00
  • 081baa2359 set dialog title for self-verification Bruno Windels 2020-04-02 17:12:10 +02:00
  • 009941a6ac Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux Bruno Windels 2020-04-02 16:57:44 +02:00
  • fffd5a4a5e fix stylelint Bruno Windels 2020-04-02 16:46:29 +02:00
  • 1baaafe7b9 some comments to explain the mess Bruno Windels 2020-04-02 16:44:42 +02:00
  • 0307361fa2 more polish for self-verification Bruno Windels 2020-04-02 16:42:39 +02:00
  • 2f0d409708 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-02 14:30:06 +00:00
  • 63ed6c3dac Translated using Weblate (Norwegian Nynorsk) Nils J. Haugen 2020-04-02 11:14:09 +00:00
  • 2b7bbe7013 Translated using Weblate (Japanese) call_xz 2020-04-02 11:29:01 +00:00
  • 9944ce71b6 Merge pull request #4337 from matrix-org/dbkr/fix_inhibit_login_case David Baker 2020-04-02 15:29:55 +01:00
  • 1ae370b97e Pull feature_presence_in_room_list out of labs. Michael Telatynski 2020-04-02 15:20:35 +01:00
  • a28aa4c0b4 Tweak user online dot in room tile, make it occupy same space and inverse behaviour of the context menu button Michael Telatynski 2020-04-02 15:13:19 +01:00
  • 3612073852 Nuke the icon_person.svg DM Indicator as it causes more confusion than it solves. Michael Telatynski 2020-04-02 15:12:19 +01:00
  • 705fd57a4b Fix spurious extra devices on registration David Baker 2020-04-02 15:09:33 +01:00
  • ee61a3aff6 dismiss setup encryption toast if cross-signing is ready Bruno Windels 2020-04-02 16:07:55 +02:00
  • 202ad9f98a Remove sort and include new scss file in components Jorik Schellekens 2020-04-02 13:42:59 +01:00
  • df1a8b288b Change copyright Jorik Schellekens 2020-04-02 13:35:12 +01:00
  • 31ca52dede fix stylelint Bruno Windels 2020-04-02 13:10:04 +02:00
  • 1f65cfb7f6 polish design and disable buttons after click Bruno Windels 2020-04-02 13:00:45 +02:00
  • ccf6c9efdc fixup: more i18n Bruno Windels 2020-04-02 12:54:14 +02:00
  • a4f448d4ca update i18n Bruno Windels 2020-04-02 11:36:05 +02:00
  • 119fd2f519 fixup: these are actually on the verifier Bruno Windels 2020-04-02 11:27:00 +02:00
  • fd04f248c4 fix proptype typo Bruno Windels 2020-04-01 09:42:24 +02:00
  • 00b1afe0fa first go at reciprocate UX Bruno Windels 2020-03-31 15:46:41 +02:00
  • 1353ddaa96 move qr code data generation to js-sdk Bruno Windels 2020-03-31 15:46:11 +02:00
  • ed3642f9b2 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-02 10:59:59 +00:00
  • a327cf9d60 Translated using Weblate (Japanese) call_xz 2020-04-02 09:49:46 +00:00
  • 43bfa3127e Translated using Weblate (Italian) random 2020-04-02 09:01:54 +00:00
  • 5cce31b39e Merge pull request #4333 from matrix-org/dbkr/fix_edit_composer David Baker 2020-04-02 11:59:51 +01:00
  • 74186740ee Fix the edit messager composer David Baker 2020-04-02 11:30:43 +01:00
  • 90b749b02c Merge branch 'origin/develop' into Weblate. Weblate 2020-04-02 08:51:07 +00:00
  • 0f1ebb0107 Translated using Weblate (Norwegian Nynorsk) Nils J. Haugen 2020-04-02 00:56:47 +00:00
  • 87ba5f4c8a Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-04-02 03:16:02 +00:00
  • 6db51cf9aa Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon Michael Telatynski 2020-04-02 09:50:57 +01:00
  • 1f8bb54a2b Merge branch 'origin/develop' into Weblate. Weblate 2020-04-02 00:56:47 +00:00
  • d19ef7cddd Translated using Weblate (Norwegian Nynorsk) Nils J. Haugen 2020-04-01 23:51:42 +00:00
  • f7fa86f3ac Merge pull request #4331 from matrix-org/travis/react-warnings/5-misc-cases Travis Ralston 2020-04-01 18:56:38 -06:00
  • 9754947147 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 23:51:06 +00:00
  • ec49dccadc Translated using Weblate (Norwegian Nynorsk) Nils J. Haugen 2020-04-01 23:51:05 +00:00
  • 9d33d16104 Translated using Weblate (Norwegian Nynorsk) Nils J. Haugen 2020-04-01 20:59:44 +00:00
  • 4402398d90 Translated using Weblate (Dutch) J. A. Durieux 2020-04-01 21:24:27 +00:00
  • 9ff587520c Merge pull request #4332 from matrix-org/t3chguy/userinfo_regression Michael Telatynski 2020-04-02 00:50:51 +01:00
  • faa4f54c97 Only apply padding to standard textual buttons (kind buttons) Michael Telatynski 2020-04-02 00:12:48 +01:00
  • c5cf04f6d2 More appeasing of the linter Travis Ralston 2020-04-01 16:25:59 -06:00
  • 8e405dda2e Fix soft crash when editing message Travis Ralston 2020-04-01 16:22:42 -06:00
  • 31ec984c86 Actually appease the linter Travis Ralston 2020-04-01 14:49:39 -06:00
  • 5c2841323e Appease the linter by turning it off Travis Ralston 2020-04-01 14:45:54 -06:00
  • f2c41a5da7 Silence another console.warn that should have been a log Travis Ralston 2020-04-01 14:40:51 -06:00
  • 47e5cfecf2 Silence usages of componentWillReceiveProps Travis Ralston 2020-04-01 14:35:39 -06:00
  • ab6bd4104f Flag componentWillUpdate as UNSAFE in MatrixChat Travis Ralston 2020-04-01 14:32:35 -06:00
  • 0bb8973ee6 Move rendering of PersistedElements into other lifecycle stages Travis Ralston 2020-04-01 14:30:57 -06:00
  • 65c7ec92a8 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 20:14:56 +00:00
  • 05b58dc81d Merge pull request #4330 from matrix-org/travis/react-warnings/4-false-positives Travis Ralston 2020-04-01 14:14:51 -06:00
  • 703c67cceb Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 20:13:45 +00:00
  • 9e14e2d77b Merge pull request #4329 from matrix-org/travis/fix-breadcrumbs Travis Ralston 2020-04-01 14:13:39 -06:00
  • c742d7b919 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 20:02:11 +00:00
  • 8680e50dd1 Merge pull request #4309 from matrix-org/uhoreg/check_sssss_passphrase Hubert Chathi 2020-04-01 16:02:06 -04:00
  • ba0a9c8439 Use console.log in place of console.warn for less warnings Travis Ralston 2020-04-01 13:59:48 -06:00
  • 620c2effda Appease the linter by turning it off Travis Ralston 2020-04-01 13:52:49 -06:00
  • e741d0d577 Revert componentDidMount changes on breadcrumbs Travis Ralston 2020-04-01 13:41:24 -06:00
  • 1d000230ee Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 17:32:26 +00:00
  • c0ffa8b59a Fix merge conflict between react warnings and SSO Travis Ralston 2020-04-01 11:32:13 -06:00
  • 329762d6a2 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 17:14:31 +00:00
  • 36ccb7e752 Merge pull request #4315 from matrix-org/travis/react-warnings/3-componentCannotDidMount Travis Ralston 2020-04-01 11:14:26 -06:00
  • 07030a9466 Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount Travis Ralston 2020-04-01 11:14:19 -06:00
  • c157f02fef Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 17:13:51 +00:00
  • 0fcbe40bec Merge pull request #4314 from matrix-org/travis/react-warnings/2-code-quality Travis Ralston 2020-04-01 11:13:46 -06:00
  • 1f00ddff43 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 17:13:09 +00:00
  • 72badf3b6a Translated using Weblate (Russian) rkfg 2020-04-01 16:56:53 +00:00
  • 59a99bbad8 Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount Travis Ralston 2020-04-01 11:13:04 -06:00
  • 8f04746e4e Revert to UNSAFE_componentWillMount where componentDidMount will not work Travis Ralston 2020-04-01 11:05:49 -06:00
  • a8911e7f85 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 16:54:11 +00:00
  • ab29ec123e Merge pull request #12968 from vector-im/travis/jitsi-errors Travis Ralston 2020-04-01 10:54:06 -06:00
  • 7010b5599c Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 16:52:56 +00:00
  • 47ee7e6ec2 Merge branch 'poljar/eventindex-initial-full-crawl' into develop Damir Jelić 2020-04-01 18:52:35 +02:00