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

Commit Graph

  • c5927af11f Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-09-05 01:48:58 +00:00
  • db1eb89552 MSC numbers are hard to remember Travis Ralston 2020-09-05 15:10:28 -06:00
  • 355d8f5843 Update openid_credentials Widget API action for MSC1960 updates Travis Ralston 2020-09-05 15:06:31 -06:00
  • 590e2b70f9 Merge remote-tracking branch 'upstream/develop' into develop Nigel Mansell 2020-09-05 16:51:13 -04:00
  • d25cb36bab Translated using Weblate (Swedish) Robert Swain 2020-09-05 11:58:32 +00:00
  • b7ef80cd50 Translated using Weblate (Swedish) LinAGKar 2020-09-04 18:03:00 +00:00
  • 2fa8b0f8b2 Make the types happy Travis Ralston 2020-09-04 22:02:18 -06:00
  • 69745bbd40 Switch to using the Widget API SDK for Jitsi widgets Travis Ralston 2020-09-04 21:55:50 -06:00
  • 999b5afa0a Acknowledge the visibility request Travis Ralston 2020-09-04 21:41:14 -06:00
  • 217f145910 Switch to imports in backup panel J. Ryan Stinnett 2020-09-04 13:55:25 +01:00
  • b484bc5e09 Rearrange backup status to always have advanced J. Ryan Stinnett 2020-09-04 13:52:14 +01:00
  • cc2c179a0f Set default text colour for Settings tabs J. Ryan Stinnett 2020-09-04 13:18:57 +01:00
  • 19e9e0137c Reorganise backup panel so feature description is always present J. Ryan Stinnett 2020-09-04 13:05:30 +01:00
  • e3f47525e5 Rename backup CSS classes J. Ryan Stinnett 2020-09-04 11:37:56 +01:00
  • 46bc6b1d14 Rename key backup to secure backup J. Ryan Stinnett 2020-09-04 11:37:06 +01:00
  • 12c42ef3c2 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-04 11:51:31 +00:00
  • 7b1031d6a6 Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup J. Ryan Stinnett 2020-09-04 12:51:25 +01:00
  • bbba4c71ff Merge branch 'origin/develop' into Weblate. Weblate 2020-09-04 11:25:52 +00:00
  • a713c9763b Merge pull request #5168 from matrix-org/t3chguy/dpsah/6785.2 Michael Telatynski 2020-09-04 12:25:46 +01:00
  • f28c396b1e Fix HeaderButtons handler bindings Michael Telatynski 2020-09-04 12:14:43 +01:00
  • 5108697ac8 Add support for Jitsi openidtoken-jwt auth Jason Robinson 2020-09-04 13:14:52 +03:00
  • 13dbfa6b85 Remove debug statement Jason Robinson 2020-09-04 12:44:43 +03:00
  • baa6d8a294 Correctly template in Jitsi widget auth if such exists Jason Robinson 2020-09-04 12:42:46 +03:00
  • 75a0178dad Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering Tulir Asokan 2020-09-04 12:41:38 +03:00
  • e803788956 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-04 08:46:08 +00:00
  • 9ff8c172ef Translated using Weblate (Swedish) LinAGKar 2020-09-03 16:34:26 +00:00
  • 7c65c59238 Translated using Weblate (Russian) Nikita Epifanov 2020-09-03 21:06:43 +00:00
  • 4b748b41ca Merge pull request #5170 from matrix-org/t3chguy/fix/15091 Michael Telatynski 2020-09-04 09:46:00 +01:00
  • 6d811734f4 Fix soft crash from TruncatedList in the createReactClass conversion Michael Telatynski 2020-09-04 09:24:12 +01:00
  • a511ad6633 Add (potential) Jitsi auth type to widget data Jason Robinson 2020-09-04 10:20:58 +03:00
  • 680de2af95 Create Jitsi "openidtoken-jwt" auth compatible conference ID's Jason Robinson 2020-09-04 10:05:47 +03:00
  • db2e1a9cd0 Add rfc4648 (base64/32/16) encoder to dependencies Jason Robinson 2020-09-04 10:04:18 +03:00
  • 5d8a082eb1 Add Jitsi auth check Jason Robinson 2020-09-04 10:03:30 +03:00
  • 4398f1eb94 support setting up dehydration from blank account, SSO support, and other fixes Hubert Chathi 2020-09-03 16:28:42 -04:00
  • 39652b0916 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-03 16:22:03 +00:00
  • 9b937ecf23 Translated using Weblate (Swedish) LinAGKar 2020-09-03 16:16:22 +00:00
  • e624ce11b4 Merge pull request #5157 from matrix-org/t3chguy/crc1 Michael Telatynski 2020-09-03 17:21:58 +01:00
  • 05c3f5c381 remove redundant key Michael Telatynski 2020-09-03 17:05:33 +01:00
  • 4ef3ef40db Change to import J. Ryan Stinnett 2020-09-03 16:47:56 +01:00
  • bdfb77077a Fix RightPanel propTypes Michael Telatynski 2020-09-03 16:08:10 +01:00
  • 368571bcff Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.2 Michael Telatynski 2020-09-03 16:07:37 +01:00
  • 85674f5c31 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-03 14:54:53 +00:00
  • cbbaae48fc Translated using Weblate (Swedish) LinAGKar 2020-09-02 18:28:01 +00:00
  • 6dafbea5ca Translated using Weblate (Hungarian) Szimszon 2020-09-02 18:07:48 +00:00
  • 31aead1527 Translated using Weblate (Estonian) Priit Jõerüüt 2020-09-02 16:53:01 +00:00
  • bba4d8ec62 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-09-03 05:11:31 +00:00
  • 97ebfa02c3 Merge pull request #5162 from matrix-org/t3chguy/lodash Michael Telatynski 2020-09-03 15:54:43 +01:00
  • da6cc5c2e9 Tweak Security settings section headers J. Ryan Stinnett 2020-09-03 15:20:46 +01:00
  • 280690cf3c use useIsEncrypted hook in UserInfo Michael Telatynski 2020-08-28 10:59:52 +01:00
  • 3a8499259e factor out the useIsEncrypted hook Michael Telatynski 2020-08-28 10:47:30 +01:00
  • 6d4de4d22b tidy up ScrollPanel comments Michael Telatynski 2020-09-03 11:48:29 +01:00
  • ad9be61477 Move HeaderButtons to an abstract class Michael Telatynski 2020-09-03 15:01:32 +01:00
  • c7e40d0751 Fix MemberAvatar props interface Michael Telatynski 2020-09-03 15:00:14 +01:00
  • 8b4250c142 expose RightPanelStore in window Michael Telatynski 2020-08-28 10:46:29 +01:00
  • 1479690ac4 RightPanel use room instead of roomId Michael Telatynski 2020-08-28 10:45:20 +01:00
  • fb2bde94fa Rename CrossSigningManager to SecurityManager J. Ryan Stinnett 2020-09-03 14:50:49 +01:00
  • 18d25acf4f Organise cross-signing / secret storage rageshake details J. Ryan Stinnett 2020-09-03 13:43:14 +01:00
  • 7efa9ba77d Fix DOM nesting error in cross-signing panel J. Ryan Stinnett 2020-09-03 13:23:50 +01:00
  • 24006588d5 iterate PR Michael Telatynski 2020-09-03 10:34:19 +01:00
  • be8dfe9925 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-02 16:50:13 +00:00
  • 03588f8450 Merge pull request #5161 from matrix-org/travis/communities/proto/userinfo Travis Ralston 2020-09-02 10:50:07 -06:00
  • 5b55ca03ee Merge branch 'origin/develop' into Weblate. Weblate 2020-09-02 16:45:39 +00:00
  • b72f0f4d92 Translated using Weblate (Portuguese (Brazil)) Marcelo Filho 2020-09-02 16:29:06 +00:00
  • e3f971a3d0 Translated using Weblate (Estonian) Priit Jõerüüt 2020-09-02 16:32:16 +00:00
  • 8484422c55 Merge pull request #5165 from matrix-org/t3chguy/fix/15080 Michael Telatynski 2020-09-02 17:45:34 +01:00
  • 9eb6932f11 Merge pull request #137 from vector-im/dependabot/npm_and_yarn/bl-4.0.3 Travis Ralston 2020-09-02 10:39:57 -06:00
  • 6d62d85ad2 Merge branch 'develop' into travis/communities/proto/userinfo Travis Ralston 2020-09-02 10:33:52 -06:00
  • 451f5f45e7 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-02 16:27:02 +00:00
  • 0aafce5ee4 Translated using Weblate (Swedish) LinAGKar 2020-09-02 14:43:30 +00:00
  • 9351f949cb Translated using Weblate (Portuguese (Brazil)) Marcelo Filho 2020-09-02 16:15:33 +00:00
  • c849f56458 Merge pull request #5153 from matrix-org/travis/copy2 Travis Ralston 2020-09-02 10:26:56 -06:00
  • beb77799f6 Respect user preference for whether pills should have an avatar or not Michael Telatynski 2020-09-02 17:26:23 +01:00
  • d1883aa2e8 Bump bl from 4.0.2 to 4.0.3 dependabot[bot] 2020-09-02 16:24:05 +00:00
  • 9b12355b2a Appease the linter Travis Ralston 2020-09-02 08:59:24 -06:00
  • 05084b57c6 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-02 14:07:42 +00:00
  • 156291d151 Translated using Weblate (Swedish) LinAGKar 2020-09-01 19:08:16 +00:00
  • 129b9459a3 Merge pull request #5164 from matrix-org/jryans/cross-signing-verif-errors J. Ryan Stinnett 2020-09-02 15:07:34 +01:00
  • e608c92506 Translated using Weblate (German) @a2sc:matrix.org 2020-09-01 12:52:21 +00:00
  • 4262a99f67 Tune cross-signing toasts when 4S is missing J. Ryan Stinnett 2020-09-02 14:29:41 +01:00
  • dd87e9a2f1 During verification, only check user trust status J. Ryan Stinnett 2020-09-02 14:13:36 +01:00
  • cffe902504 Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling Michael Telatynski 2020-09-02 12:00:35 +01:00
  • 6178b3c0e2 Wire up resizeNotifier Michael Telatynski 2020-09-02 11:13:00 +01:00
  • 243af3c9f2 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 Michael Telatynski 2020-09-02 09:27:06 +01:00
  • fe7dbac1f8 Merge branch 'develop' of https://github.com/nigelrudolf/matrix-react-sdk into develop Nigel Mansell 2020-09-01 14:00:07 -04:00
  • 7550a92df9 Fixed 1px jump upwards on filter room members box Nigel Mansell 2020-09-01 13:58:48 -04:00
  • 4f8307605f Fixed 1px jump upwards on filter room members box nigelrudolf 2020-09-01 13:41:02 -04:00
  • 92c184385c Merge branch 'develop' into travis/communities/proto/userinfo Travis Ralston 2020-09-01 10:51:42 -06:00
  • e5a4092adc Reset matrix-react-sdk back to develop branch RiotRobot 2020-09-01 17:51:03 +01:00
  • afec470ec3 Merge branch 'develop' into travis/copy2 Travis Ralston 2020-09-01 10:50:58 -06:00
  • 3ed750a9ab Reset matrix-js-sdk back to develop branch RiotRobot 2020-09-01 17:50:49 +01:00
  • 7f8326e245 Merge branch 'master' into develop RiotRobot 2020-09-01 17:50:12 +01:00
  • a89661de44 v1.7.5 v1.7.5 origin/release-v1.7.5 RiotRobot 2020-09-01 17:46:13 +01:00
  • 9104a07324 Prepare changelog for v1.7.5 RiotRobot 2020-09-01 17:46:12 +01:00
  • a20b9c4c24 Upgrade matrix-react-sdk to 3.3.0 RiotRobot 2020-09-01 17:41:33 +01:00
  • a09ab52be3 Upgrade matrix-js-sdk to 8.2.0 RiotRobot 2020-09-01 17:40:19 +01:00
  • 41e2017fef Merge branch 'origin/develop' into Weblate. Weblate 2020-09-01 16:39:19 +00:00
  • 0d290c9bd2 Reset matrix-js-sdk back to develop branch RiotRobot 2020-09-01 17:39:09 +01:00
  • 36a96c7104 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-01 16:38:34 +00:00
  • 52691a1a42 Merge branch 'master' into develop RiotRobot 2020-09-01 17:38:21 +01:00
  • 9df5371dca Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop RiotRobot 2020-09-01 17:37:52 +01:00