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

Commit Graph

  • 5022eaf483 Upgrade matrix-js-sdk to 5.3.1-rc.1 RiotRobot 2020-04-15 19:13:00 +01:00
  • 08ef4ff3b1 Merge branch 'release-v1.5.16' into release-v1.6.0 RiotRobot 2020-04-15 19:08:28 +01:00
  • a054ea0653 Merge branch 'release-v2.4.0' into release-v2.5.0 RiotRobot 2020-04-15 19:07:11 +01:00
  • 71267c65c1 Merge pull request #70 from vector-im/jryans/enable-cross-signing J. Ryan Stinnett 2020-04-15 18:54:12 +01:00
  • 93e147f2d2 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 17:54:07 +00:00
  • b5e8e5cf75 Merge pull request #13179 from vector-im/jryans/enable-cross-signing J. Ryan Stinnett 2020-04-15 18:54:02 +01:00
  • 554d2ee54e Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 17:46:27 +00:00
  • 4154acc9dd Merge pull request #4415 from matrix-org/t3chguy/wait4initialsync J. Ryan Stinnett 2020-04-15 18:46:23 +01:00
  • 68401a52f3 Enable cross-signing / E2EE by default for DM on release J. Ryan Stinnett 2020-04-15 18:37:48 +01:00
  • cd19af4003 Enable cross-signing / E2EE by default for DM on release J. Ryan Stinnett 2020-04-15 18:31:13 +01:00
  • 7b3a3ddaf1 Merge pull request #69 from vector-im/jryans/release-script J. Ryan Stinnett 2020-04-15 18:26:22 +01:00
  • dc8936ba87 Add a release script J. Ryan Stinnett 2020-04-15 18:12:02 +01:00
  • 5cf187e1cb Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 16:50:44 +00:00
  • 09e247b4f8 Merge pull request #4414 from matrix-org/bwindels/fixindexernotifs Bruno Windels 2020-04-15 16:50:38 +00:00
  • 49e1e6e59f null-guard MatrixClientPeg in RoomViewStore Michael Telatynski 2020-04-15 17:31:45 +01:00
  • 0f20f1555b Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 15:47:59 +00:00
  • 1a4fe2ac3b Merge pull request #13128 from dannycolin/inotify-watch-limit Travis Ralston 2020-04-15 09:47:54 -06:00
  • c3b1b9e964 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 15:46:57 +00:00
  • e921745c93 Translated using Weblate (Italian) random 2020-04-15 09:39:49 +00:00
  • 5932aab605 Translated using Weblate (French) Kévin C 2020-04-15 07:32:54 +00:00
  • abfc865c20 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-04-15 02:57:01 +00:00
  • 8ed8840b63 Merge pull request #13149 from xobs/labs-config-reference Travis Ralston 2020-04-15 09:46:50 -06:00
  • 8c2c777e2b disable reemitting on the client for events mapped from the indexer Bruno Windels 2020-04-15 17:37:32 +02:00
  • 74bcb95505 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 15:17:22 +00:00
  • 6d60784122 Translated using Weblate (Russian) Valex 2020-04-15 13:32:14 +00:00
  • f4c4fe7d12 Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync Michael Telatynski 2020-04-15 16:17:13 +01:00
  • 81f501e844 disable language dropdown too Michael Telatynski 2020-04-15 14:19:47 +01:00
  • 2ff0521f24 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 13:08:39 +00:00
  • 7efbae0470 Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling Michael Telatynski 2020-04-15 14:08:34 +01:00
  • ac26719b69 disable password reset button when spinning Michael Telatynski 2020-04-15 14:07:37 +01:00
  • b7caf93cd5 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-15 13:07:30 +00:00
  • 357dc504f5 Translated using Weblate (Italian) random 2020-04-15 09:40:20 +00:00
  • ebef7a2167 Translated using Weblate (French) Kévin C 2020-04-15 06:28:06 +00:00
  • 08d56e55d4 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-04-15 02:57:24 +00:00
  • fafe57624c Merge pull request #4412 from matrix-org/jryans/hide-e2e-info-opt J. Ryan Stinnett 2020-04-15 14:07:22 +01:00
  • 8b25223026 fix onLoggedIn getting called twice Michael Telatynski 2020-04-15 13:45:12 +01:00
  • 76ce4081cb i18n Michael Telatynski 2020-04-15 12:31:27 +01:00
  • 346b2e8588 Login block on initialSync with spinners Michael Telatynski 2020-04-15 12:21:49 +01:00
  • e9c755e73f Remove end-to-end message info option when cross-signing is used J. Ryan Stinnett 2020-04-15 10:25:05 +01:00
  • 9c1939b756 match all, not just first instance of tokens to escape Michael Telatynski 2020-04-15 02:31:30 +01:00
  • 4454db30d6 Escape opening square bracket too Michael Telatynski 2020-04-15 01:02:08 +01:00
  • cb10640eaf detslint Michael Telatynski 2020-04-15 00:53:35 +01:00
  • f1def8b0de delint Michael Telatynski 2020-04-15 00:50:28 +01:00
  • c72139fc3f Convert serialize and deserialize to TypeScript Michael Telatynski 2020-04-15 00:49:08 +01:00
  • 95eaf94cd8 Fix pills being broken by unescaped characters Michael Telatynski 2020-04-15 00:40:38 +01:00
  • 276b5b874c Convert ShareDialog to Typescript Michael Telatynski 2020-04-15 00:22:19 +01:00
  • 89bc3bdd5b consolidate and extract copyPlaintext, copyNode and selectText Michael Telatynski 2020-04-15 00:16:11 +01:00
  • 77bdde4021 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements Travis Ralston 2020-04-14 12:58:16 -06:00
  • 4fe16b1b84 Merge branch 'develop' into travis/moar-jitsi Travis Ralston 2020-04-14 12:57:28 -06:00
  • 6e83255b66 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 18:56:15 +00:00
  • 36fea4d487 Merge pull request #4378 from matrix-org/travis/expanding-widgets Travis Ralston 2020-04-14 12:56:10 -06:00
  • d252d7ac6f Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 18:55:54 +00:00
  • f0a2f5dd4f Merge pull request #4380 from matrix-org/travis/widget-complaints Travis Ralston 2020-04-14 12:55:49 -06:00
  • 769cf1c987 Allow network dropdown to be scrollable and fix context menu window padding calc Michael Telatynski 2020-04-14 17:34:39 +01:00
  • 15c64002c1 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 16:12:21 +00:00
  • 69e680da3c Merge pull request #4407 from matrix-org/bwindels/checkifxsignisdisabledforlegacyverif Bruno Windels 2020-04-14 16:12:16 +00:00
  • ce220fe548 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 16:09:19 +00:00
  • 98b77368de Translated using Weblate (Albanian) Besnik Bleta 2020-04-14 15:19:31 +00:00
  • 8c9d77ad53 Merge pull request #67 from vector-im/t3chguy/poc_riot_desktop_sso_multi_profile Michael Telatynski 2020-04-14 17:09:15 +01:00
  • 3cbc9997b9 Merge pull request #13028 from vector-im/t3chguy/poc_riot_desktop_sso_multi_profile Michael Telatynski 2020-04-14 17:09:14 +01:00
  • a77ed6e844 Merge branch 'develop' into t3chguy/poc_riot_desktop_sso_multi_profile Michael Telatynski 2020-04-14 17:03:00 +01:00
  • 5a7b976ff5 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 15:54:49 +00:00
  • aef6687931 Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner Bruno Windels 2020-04-14 15:54:44 +00:00
  • 24fe125cb6 dont try to enable 4S if cross-signing is disabled Bruno Windels 2020-04-14 17:53:33 +02:00
  • 368737cfd9 fix copyright Bruno Windels 2020-04-14 17:41:06 +02:00
  • 27c4404e23 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 15:21:55 +00:00
  • 861c449055 Merge pull request #4405 from matrix-org/bwindels/qrcodefix Bruno Windels 2020-04-14 15:21:47 +00:00
  • db09cadb66 remove spinner, change copy, add button placeholder Bruno Windels 2020-04-14 17:19:15 +02:00
  • ecd19175cf Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 15:12:30 +00:00
  • 24dbbfa002 Merge pull request #13133 from vector-im/t3chguy/electron-forward-back Michael Telatynski 2020-04-14 16:12:24 +01:00
  • b84e7a875f Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 15:03:30 +00:00
  • 4c7bc61174 Merge pull request #4392 from matrix-org/t3chguy/electron-forward-back Michael Telatynski 2020-04-14 16:03:24 +01:00
  • c2ea23293e Merge pull request #68 from vector-im/t3chguy/electron-forward-back Michael Telatynski 2020-04-14 16:03:09 +01:00
  • 7fa38933cb Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back Michael Telatynski 2020-04-14 15:54:58 +01:00
  • 7b3c34bd12 use js-sdk qr code generation Bruno Windels 2020-04-14 16:46:02 +02:00
  • 73e5f133fb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into esc-mark-as-read Michael Telatynski 2020-04-14 15:37:18 +01:00
  • 69382ff8e5 Fix handler to use react bubbling rather than a native global onKeyDown Michael Telatynski 2020-04-14 15:24:41 +01:00
  • 3c7eada6d1 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 14:08:09 +00:00
  • fc67d1d775 Merge pull request #4398 from matrix-org/t3chguy/liv Michael Telatynski 2020-04-14 15:08:04 +01:00
  • 855ffd7f83 Add riot-desktop shortcuts for forward/back matching browsers&slack Michael Telatynski 2020-04-14 15:04:58 +01:00
  • 98026b0ac6 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 14:02:33 +00:00
  • 8d3119ddb4 Merge pull request #4396 from matrix-org/t3chguy/fix_MVideoBody_FilePanel Michael Telatynski 2020-04-14 15:02:28 +01:00
  • 26569dea06 Revert "@replaceableComponent" Michael Telatynski 2020-04-14 14:59:20 +01:00
  • 4c7c1d1132 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 13:54:28 +00:00
  • f8d3073690 Merge pull request #4397 from matrix-org/t3chguy/deps1 Michael Telatynski 2020-04-14 14:54:24 +01:00
  • 1fb35c577b Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 13:51:15 +00:00
  • 4354c508c7 Merge pull request #13164 from vector-im/t3chguy/soft-fail-rageshake Michael Telatynski 2020-04-14 14:51:09 +01:00
  • 50d6551c86 @replaceableComponent Michael Telatynski 2020-04-14 14:50:09 +01:00
  • a7d95d396e fix copyright Michael Telatynski 2020-04-14 14:46:04 +01:00
  • 36f55c1630 Allow rageshake to fail in init Michael Telatynski 2020-04-14 14:44:12 +01:00
  • fc814293da Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 13:28:34 +00:00
  • f84c59dea7 Merge pull request #4395 from matrix-org/t3chguy/fix_emoji_tooltip_flicker Michael Telatynski 2020-04-14 14:28:29 +01:00
  • 9f4f145869 Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 13:08:32 +00:00
  • 34e2fd42ec Merge pull request #4374 from matrix-org/jryans/backup-dialog-hellscape J. Ryan Stinnett 2020-04-14 14:08:27 +01:00
  • b9da31fc15 Fix Electron SSO handling to support multiple profiles Michael Telatynski 2020-04-14 13:29:47 +01:00
  • 2d0953604e Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 12:17:36 +00:00
  • b969c4fd2e Merge branch 'origin/develop' into Weblate. Weblate 2020-04-14 12:17:32 +00:00
  • 8a1b8b9998 Translated using Weblate (Albanian) Besnik Bleta 2020-04-14 12:06:41 +00:00
  • 6416f404c6 Merge pull request #4403 from matrix-org/t3chguy/fix_e2ee_toggle Michael Telatynski 2020-04-14 13:17:31 +01:00
  • 3aa338f3a2 Merge pull request #4391 from matrix-org/t3chguy/sort_emoji_by_shortcodes Michael Telatynski 2020-04-14 13:17:26 +01:00