Commit Graph

  • 15bb819c8a Instead of encrypting, pass the HS an opaque token which we locally resolve in a map to our profile data Michael Telatynski 2020-04-09 21:17:37 +01:00
  • c0b4ab9f67 Merge pull request #13095 from vector-im/t3chguy/app_load2 Michael Telatynski 2020-04-09 21:11:16 +01:00
  • efbc688862 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-09 19:57:23 +00:00
  • 474e46fcca Translated using Weblate (Finnish) Tuomas Hietala 2020-04-09 16:51:44 +00:00
  • 0cd8d06742 Translated using Weblate (Basque) Osoitz 2020-04-09 17:51:21 +00:00
  • 74291e8c2d Merge pull request #4370 from matrix-org/t3chguy/clear_event_line Michael Telatynski 2020-04-09 20:57:12 +01:00
  • e1a496f231 Pass along key backup for bootstrap J. Ryan Stinnett 2020-04-09 17:30:10 +01:00
  • 034d7860d7 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-09 16:23:05 +00:00
  • 75a665ec2e Translated using Weblate (French) Kévin C 2020-04-09 06:49:35 +00:00
  • 197a2145b6 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-04-09 03:00:58 +00:00
  • a9a253f27f Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee Michael Telatynski 2020-04-09 17:22:58 +01:00
  • 5dfcfb2147 Merge pull request #4372 from matrix-org/dbkr/search_fail_logging David Baker 2020-04-09 16:27:08 +01:00
  • 4afd29f62c add comment Michael Telatynski 2020-04-09 16:23:41 +01:00
  • 6fdeca93b6 Make the riot-desktop callback args more generic and encrypt the args Michael Telatynski 2020-04-09 16:21:52 +01:00
  • 53b753789a Fix logging for failed searches David Baker 2020-04-09 16:04:14 +01:00
  • 90eb472e50 package.json: Bump the Seshat version. Damir Jelić 2020-04-09 16:33:33 +02:00
  • c1dcb690b3 Merge pull request #4369 from matrix-org/bwindels/fixresetkeys Bruno Windels 2020-04-09 13:34:40 +00:00
  • 928d4acd31 Merge pull request #4371 from matrix-org/dbkr/retry_master_key_fetch David Baker 2020-04-09 14:20:36 +01:00
  • 003ae18038 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-register-auth-with-new-spec Marcel Radzio 2020-04-09 15:03:02 +02:00
  • b6ef30af8f Retry the request for the master key from SSSS on login David Baker 2020-04-09 13:40:46 +01:00
  • 60808ef6d2 apply clear:both to fix automatic margins for continuation events Michael Telatynski 2020-04-09 13:36:53 +01:00
  • 282577cefb recalculate toasts when cross-signing gets en/disabled Bruno Windels 2020-04-09 13:43:51 +02:00
  • 291fae6493 update room trust when cross-signing gets en/disabled Bruno Windels 2020-04-09 13:43:30 +02:00
  • c67dcae35e improve comments Michael Telatynski 2020-04-09 11:25:40 +01:00
  • 942ca3b525 make error translatable Michael Telatynski 2020-04-09 11:19:40 +01:00
  • 83653b3a22 assert rageshake loaded successfully Michael Telatynski 2020-04-09 11:14:38 +01:00
  • e1bdcf2d9e remove debug statement Michael Telatynski 2020-04-09 10:49:50 +01:00
  • 8c88e9f0f4 delint and i18n Michael Telatynski 2020-04-09 10:42:58 +01:00
  • 0572d62c88 extract app load error handler from app.js Michael Telatynski 2020-04-09 10:32:04 +01:00
  • 121728ba2e Merge pull request #13080 from vector-im/jryans/upgrade-2020-04-08 J. Ryan Stinnett 2020-04-09 10:19:34 +01:00
  • d4ba8103b6 Merge pull request #4365 from matrix-org/jryans/upgrade-2020-04-08 J. Ryan Stinnett 2020-04-09 10:19:16 +01:00
  • 120e2201ad Merge pull request #4367 from matrix-org/t3chguy/app_load2 Michael Telatynski 2020-04-09 10:16:19 +01:00
  • 343d4ea641 small tweaks Michael Telatynski 2020-04-08 21:49:27 +01:00
  • cef9dbe254 Analytics.js gets executed during times where localStorage is not ensured to exist Michael Telatynski 2020-04-08 21:42:58 +01:00
  • 68608c2bcb Fix gen-i18n.js script for .ts files Michael Telatynski 2020-04-08 21:42:12 +01:00
  • cc939f9645 extract browser compatibility error handling out of app.js Michael Telatynski 2020-04-08 21:41:22 +01:00
  • f6ad5bf54c let settled accept multiple proms + i18n Michael Telatynski 2020-04-08 20:12:05 +01:00
  • e30e245bc7 Merge pull request #4366 from matrix-org/travis/encode-widgets Travis Ralston 2020-04-08 13:12:03 -06:00
  • 2837c41ca4 factor out config error handling Michael Telatynski 2020-04-08 20:03:45 +01:00
  • b5aaae1c27 Fix encoding of widget arguments Travis Ralston 2020-04-08 12:58:52 -06:00
  • a6fc235461 Merge remote-tracking branch 'origin/fix-register-auth-with-new-spec' into fix-register-auth-with-new-spec Marcel 2020-04-08 20:55:19 +02:00
  • 69c1e117a3 Fix submitAuthDict(null) being null in places where it actually should be auth: {} Marcel 2020-04-08 20:55:02 +02:00
  • 9820400680 Update src/components/structures/auth/Registration.js Marcel 2020-04-08 20:53:05 +02:00
  • 4954c732ee extract config error handling out of app.js Michael Telatynski 2020-04-08 19:47:52 +01:00
  • 6a5268f09b fix loadConfig Michael Telatynski 2020-04-08 19:36:06 +01:00
  • 7633009ddb clean up loadConfig Michael Telatynski 2020-04-08 19:35:16 +01:00
  • e267086a17 Parallelize loadSkin Michael Telatynski 2020-04-08 19:21:39 +01:00
  • b3780445d3 fix typescript types Michael Telatynski 2020-04-08 16:31:58 +01:00
  • 7113fe7e31 comments Michael Telatynski 2020-04-08 16:24:40 +01:00
  • 719865c033 parallel load language and theme Michael Telatynski 2020-04-08 16:17:46 +01:00
  • 2c5664b76e move config loading into index for parallelism Michael Telatynski 2020-04-08 16:12:36 +01:00
  • 43357fe842 reorder Michael Telatynski 2020-04-08 16:10:44 +01:00
  • 6222546e20 prepare platform earlier Michael Telatynski 2020-04-08 16:09:47 +01:00
  • 0b032d7434 loadOlm earlier Michael Telatynski 2020-04-08 16:08:39 +01:00
  • a1ef707065 yarn upgrade J. Ryan Stinnett 2020-04-08 14:55:46 +01:00
  • c87d6c22df yarn upgrade J. Ryan Stinnett 2020-04-08 14:49:52 +01:00
  • ffecf03b2a Update margins to improve grouping Michael Telatynski 2020-04-08 14:48:50 +01:00
  • 4041c030a5 Apply changes from Figma Michael Telatynski 2020-04-08 14:44:34 +01:00
  • 8b6ec2c50b v1.5.16-rc.1 v1.5.16-rc.1 RiotRobot 2020-04-08 14:10:59 +01:00
  • f9647ed48d Prepare changelog for v1.5.16-rc.1 RiotRobot 2020-04-08 14:10:59 +01:00
  • c8e284e26f v1.5.16-rc.1 RiotRobot 2020-04-08 14:06:05 +01:00
  • 48018b33cc Upgrade matrix-react-sdk to 2.4.0-rc.1 RiotRobot 2020-04-08 14:06:02 +01:00
  • 83af795358 Upgrade matrix-js-sdk to 5.3.0-rc.1 RiotRobot 2020-04-08 14:03:43 +01:00
  • 0d1b7b9963 v2.4.0-rc.1 RiotRobot 2020-04-08 13:59:23 +01:00
  • 9a1ac39f49 Prepare changelog for v2.4.0-rc.1 RiotRobot 2020-04-08 13:59:22 +01:00
  • 6095a00703 Upgrade matrix-js-sdk to 5.3.0-rc.1 RiotRobot 2020-04-08 13:52:46 +01:00
  • eec28ce38a Update styling and copy to match Figma Michael Telatynski 2020-04-08 13:47:15 +01:00
  • a26a3f5862 Merge branch 'poljar/eventindex-log-improvement' into develop Damir Jelić 2020-04-08 14:23:54 +02:00
  • ee5d39a001 Merge pull request #13078 from RiotTranslateBot/weblate-riot-web-riot-web J. Ryan Stinnett 2020-04-08 13:15:31 +01:00
  • 5d65da12c2 Merge pull request #4364 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk J. Ryan Stinnett 2020-04-08 13:15:01 +01:00
  • b0d2c3fd98 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-08 11:20:01 +00:00
  • 3a05d74ae8 Translated using Weblate (Albanian) Besnik Bleta 2020-04-08 10:52:33 +00:00
  • 8ffc206358 Merge pull request #4356 from matrix-org/travis/deactivate-sso J. Ryan Stinnett 2020-04-08 12:19:53 +01:00
  • a0ecfdd786 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-08 10:32:16 +00:00
  • a5f6a07ed6 Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format J. Ryan Stinnett 2020-04-08 11:32:11 +01:00
  • ada860f163 Add toggle for e2ee when creating private room in x-signing world Michael Telatynski 2020-04-08 10:50:22 +01:00
  • 0310e5ec93 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-08 09:45:42 +00:00
  • 4d7f3ba109 Merge pull request #4361 from matrix-org/t3chguy/fix_composer_placeholder1 Michael Telatynski 2020-04-08 10:45:35 +01:00
  • 4447370764 Fix composer placeholder not updating Michael Telatynski 2020-04-08 10:19:52 +01:00
  • c6fcaf86ff EventIndex: Log if we had all events in a checkpoint but are continuing. Damir Jelić 2020-04-08 11:15:13 +02:00
  • 23e1e6f27a Merge branch 'origin/develop' into Weblate. Weblate 2020-04-08 09:00:45 +00:00
  • f61c888f0c Merge pull request #4358 from matrix-org/t3chguy/fix_complete_security Michael Telatynski 2020-04-08 10:00:39 +01:00
  • f2ddb96c1b Merge branch 'origin/develop' into Weblate. Weblate 2020-04-08 08:47:08 +00:00
  • 7553747433 Translated using Weblate (Lithuanian) MamasLT 2020-04-07 22:44:40 +00:00
  • b9d28f09c8 Translated using Weblate (French) Kévin C 2020-04-08 06:43:37 +00:00
  • 23ccd6de1c Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-04-08 05:24:57 +00:00
  • 17f3b92726 Merge pull request #4345 from matrix-org/foldleft/12982-notifications Zoe 2020-04-08 09:46:56 +01:00
  • aeb3e55a10 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-07 21:34:38 +00:00
  • fc28492a2a Merge pull request #4360 from matrix-org/travis/fix-share-dialog Travis Ralston 2020-04-07 15:34:33 -06:00
  • 900a05366e Fix share dialog correctly Travis Ralston 2020-04-07 15:22:38 -06:00
  • 3196c1a031 Update i18n J. Ryan Stinnett 2020-04-07 19:24:07 +01:00
  • e91f51af3b Merge branch 'origin/develop' into Weblate. Weblate 2020-04-07 18:13:44 +00:00
  • 7044eed82f Merge pull request #4357 from matrix-org/travis/sso-devices Travis Ralston 2020-04-07 12:13:38 -06:00
  • c21dccc397 Add debug status for cached backup key format J. Ryan Stinnett 2020-04-07 19:11:06 +01:00
  • 712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js Michael Telatynski 2020-04-07 19:03:12 +01:00
  • 3ab9634249 Pluralize more differently Travis Ralston 2020-04-07 11:46:53 -06:00
  • 3be197cf86 Use singular copy when only deleting one device Travis Ralston 2020-04-07 11:19:56 -06:00
  • b58f197b54 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-07 16:10:47 +00:00
  • 24a5d8355f Merge pull request #4288 from matrix-org/t3chguy/react_stickers Michael Telatynski 2020-04-07 17:10:42 +01:00
  • f950d3b365 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-07 16:08:43 +00:00