Commit Graph

  • 421fcb115f Give the jitsi wrapper its own external api script David Baker 2020-04-01 10:38:49 +01:00
  • ce8f7eaace Apply suggestions from code review Bruno Windels 2020-04-01 09:37:17 +00:00
  • 50bb556bc7 Update docs/settings.md Bruno Windels 2020-04-01 09:36:50 +00:00
  • 5087ff158b Merge branch 'origin/develop' into Weblate. Weblate 2020-04-01 09:30:59 +00:00
  • 1cc2162d47 Translated using Weblate (Norwegian Bokmål) Imre Kristoffer Eilertsen 2020-04-01 01:15:24 +00:00
  • cb176dd235 Translated using Weblate (Hebrew) Dvir Berebi 2020-04-01 02:09:29 +00:00
  • 6727024e46 Translated using Weblate (German) Peter Pan 2020-03-31 21:48:54 +00:00
  • 918309f4da Translated using Weblate (French) Kévin C 2020-04-01 07:29:12 +00:00
  • 79b8fd80c9 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-04-01 06:19:45 +00:00
  • d30db00cf1 Translated using Weblate (Basque) Osoitz 2020-03-31 17:38:55 +00:00
  • 7ba6462a5d Merge pull request #4317 from matrix-org/t3chguy/fix_kbd_finnish Michael Telatynski 2020-04-01 10:30:39 +01:00
  • 6dc7bf4bdf fix legacy verify user Bruno Windels 2020-04-01 10:32:27 +02:00
  • 6bb6dbc0ff Fix Ctrl+/ for Finnish keyboard where it includes Shift Michael Telatynski 2020-04-01 10:14:15 +01:00
  • 8bc54ae205 Only auto-scroll to RoomTile when clicking on RoomTile or via shortcuts Michael Telatynski 2020-04-01 10:08:26 +01:00
  • 538147f7fa Better support for widgets overriding their URLs David Baker 2020-04-01 10:00:33 +01:00
  • 6d0d77f98e Disable the linter on lines it complaints about UNSAFE_componentWillMount Travis Ralston 2020-03-31 14:21:12 -06:00
  • 0a6f54da33 Label and use UNSAFE_componentWillMount to minimize warnings Travis Ralston 2020-03-31 14:12:52 -06:00
  • 3f99332f4b Use componentDidMount in place of componentWillMount where possible Travis Ralston 2020-03-31 14:14:17 -06:00
  • c86d75693b Fix a number of minor code quality issues Travis Ralston 2020-03-31 14:05:56 -06:00
  • a0e5169b59 Added translation using Weblate (Estonian) Märt Põder 2020-03-31 19:48:13 +00:00
  • b85f1629b3 Added translation using Weblate (Estonian) Märt Põder 2020-03-31 19:33:19 +00:00
  • 13a7b71e08 Add a console warning that errors from Jitsi Meet are fine Travis Ralston 2020-03-31 12:19:17 -06:00
  • 9b8d4ebdbb Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 16:04:37 +00:00
  • 56dda3895c Merge pull request #4302 from matrix-org/t3chguy/cmds Michael Telatynski 2020-03-31 17:04:31 +01:00
  • 64c11c3565 Move ssoUrl to a class property Travis Ralston 2020-03-31 09:26:17 -06:00
  • 1e4fff5d51 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 15:18:21 +00:00
  • c75475f3f5 Merge pull request #4311 from matrix-org/t3chguy/fix_els Michael Telatynski 2020-03-31 16:18:16 +01:00
  • eb901441cd Fix alignment of e2e icon in userinfo and expose full displayname in title Michael Telatynski 2020-03-31 16:14:18 +01:00
  • 050921e1f2 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 15:00:16 +00:00
  • dcd75a801e Translated using Weblate (Italian) random 2020-03-31 14:33:01 +00:00
  • 6da01a9cf7 Merge pull request #4299 from JorikSchellekens/joriks/css-location Jorik Schellekens 2020-03-31 16:00:11 +01:00
  • 6596b7223a Merge branch 'develop' into uhoreg/check_sssss_passphrase Hubert Chathi 2020-03-31 10:39:56 -04:00
  • 4a9bc5e5bf Update src/components/views/auth/InteractiveAuthEntryComponents.js Travis Ralston 2020-03-31 08:29:42 -06:00
  • e2685b1cf0 Licensing info Jorik Schellekens 2020-03-31 15:29:40 +01:00
  • 6cf9166c4a Use variables for the rem values. Jorik Schellekens 2020-03-31 15:26:23 +01:00
  • 77f636c74b Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 13:21:48 +00:00
  • 9ed08e76f8 Merge pull request #4310 from matrix-org/t3chguy/fix_peeking Michael Telatynski 2020-03-31 14:21:42 +01:00
  • 2624017ab9 Also stop peeking on unmount Michael Telatynski 2020-03-31 12:51:03 +01:00
  • 9e8a401dc8 Fix EventListSummary when RR rendering is disabled Michael Telatynski 2020-03-31 12:29:58 +01:00
  • 80479195c8 iterate PR based on feedback. Remove newballsplease cmd alias Michael Telatynski 2020-03-31 11:53:26 +01:00
  • 6e61761012 Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds Michael Telatynski 2020-03-31 11:49:53 +01:00
  • 77e6cb7c6e Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 10:05:04 +00:00
  • 223a4e285d Merge pull request #4308 from matrix-org/jryans/4s-prompt-overload J. Ryan Stinnett 2020-03-31 11:04:58 +01:00
  • 24c09cc4c8 Convert secret storage key creation to object J. Ryan Stinnett 2020-03-31 10:45:53 +01:00
  • a2a9dc6cd0 Fix peeking keeping two timeline update mechanisms in play Michael Telatynski 2020-03-31 10:37:56 +01:00
  • 8340ac35cd Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 09:07:33 +00:00
  • 2455c5a850 Merge pull request #4303 from matrix-org/jryans/id-change-red J. Ryan Stinnett 2020-03-31 10:07:28 +01:00
  • 2d8b0ccb80 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 08:41:27 +00:00
  • b44c83aad7 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-31 06:05:09 +00:00
  • c094afbbe6 Merge pull request #4295 from matrix-org/t3chguy/a11y2 Michael Telatynski 2020-03-31 09:41:20 +01:00
  • 1c5b7bf132 Merge pull request #4279 from matrix-org/t3chguy/instant_sso Michael Telatynski 2020-03-31 09:39:40 +01:00
  • 1f8830e640 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-31 02:56:35 +00:00
  • 98c663a41d Translated using Weblate (German) Michael Albert 2020-03-30 19:05:47 +00:00
  • 2557875fd2 Merge pull request #4296 from waylon531/upstream Travis Ralston 2020-03-30 20:56:24 -06:00
  • d899576578 Appease the linter Travis Ralston 2020-03-30 20:24:53 -06:00
  • 8bc86deaaa Appease the style linter Travis Ralston 2020-03-30 20:23:34 -06:00
  • de79520150 Add SSO dialog copy for 3PID adding (email/phone) Travis Ralston 2020-03-30 20:18:52 -06:00
  • 6112d92f80 Remove debugging Travis Ralston 2020-03-30 20:11:23 -06:00
  • ffa75ef48c Wire up all the dialog parts for SSO, using device deletion as a POC Travis Ralston 2020-03-30 20:03:46 -06:00
  • bbb9a67ced use new method for checking key Hubert Chathi 2020-03-30 17:28:01 -04:00
  • b35356833f Merge branch 'develop' into travis/sso-uia Travis Ralston 2020-03-30 14:56:52 -06:00
  • 690b5945d0 Pass new secret storage key to bootstrap path J. Ryan Stinnett 2020-03-30 21:40:09 +01:00
  • 9cf82d8743 Updated strings waylon531 2020-03-29 13:10:53 -07:00
  • dd4331cd18 Added the /html command waylon531 2020-03-29 12:45:06 -07:00
  • f8051f9f6f Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 18:13:22 +00:00
  • 930f93b974 Merge branch 'poljar/event-index-log-skipped-events' into develop Damir Jelić 2020-03-30 20:12:51 +02:00
  • 1e2b175612 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 18:08:35 +00:00
  • 6517ed07bd Merge pull request #4307 from matrix-org/t3chguy/fixes1111 Michael Telatynski 2020-03-30 19:08:29 +01:00
  • 147e7bc57e Field: mark id as optional in propTypes Michael Telatynski 2020-03-30 18:42:47 +01:00
  • da34e6241d Make all 'font-size's and 'line-height's rem Jorik Schellekens 2020-03-30 18:18:10 +01:00
  • fd593280e0 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 17:20:54 +00:00
  • b5688ac2b6 Merge pull request #4254 from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button Travis Ralston 2020-03-30 11:20:49 -06:00
  • b5587ea853 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 17:08:55 +00:00
  • df60f9cd26 Merge pull request #4304 from matrix-org/travis/fix-confs Travis Ralston 2020-03-30 11:08:49 -06:00
  • ca5d540311 Remove underscore from Jitsi conference names Travis Ralston 2020-03-30 10:40:26 -06:00
  • 520b4c3e65 Add tests for was verified case J. Ryan Stinnett 2020-03-30 16:33:16 +01:00
  • 63853d9de1 Add download logs button to BugReportDialog Michael Telatynski 2020-03-30 16:12:28 +01:00
  • 2a45ccaef3 Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs Michael Telatynski 2020-03-30 15:52:36 +01:00
  • b53b5cc45d Add wasCrossSigningVerified in test J. Ryan Stinnett 2020-03-30 15:24:43 +01:00
  • a3555cacea Merge remote-tracking branch 'origin/develop' into jryans/id-change-red J. Ryan Stinnett 2020-03-30 14:52:22 +01:00
  • 28356345fc Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 13:23:19 +00:00
  • 4e8cec354d Merge pull request #4290 from matrix-org/foldleft/12484-user-shields Zoe 2020-03-30 14:23:13 +01:00
  • 559b8e174b undo accidental changes Michael Telatynski 2020-03-30 14:13:08 +01:00
  • c6d69f3d3f de-tslint Michael Telatynski 2020-03-30 14:09:10 +01:00
  • 8c2b910c03 rework SlashCommands to better expose aliases Michael Telatynski 2020-03-30 13:59:08 +01:00
  • 12968bec26 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 12:54:18 +00:00
  • d4f75e4e1b Reset matrix-react-sdk back to develop branch RiotRobot 2020-03-30 13:54:09 +01:00
  • 4a4df94339 Reset matrix-js-sdk back to develop branch RiotRobot 2020-03-30 13:53:58 +01:00
  • d7b278bc65 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 12:53:39 +00:00
  • 365041c6c3 Merge branch 'master' into develop RiotRobot 2020-03-30 13:52:20 +01:00
  • 836b348bff EventIndex: Add a trailing comma. Damir Jelić 2020-03-30 14:39:01 +02:00
  • 4371006c58 EventIndex: Better logging on how many events are added. Damir Jelić 2020-03-30 14:32:35 +02:00
  • 413b26d71b v1.5.14 v1.5.14 RiotRobot 2020-03-30 13:48:40 +01:00
  • 45ff2fdcde Prepare changelog for v1.5.14 RiotRobot 2020-03-30 13:48:39 +01:00
  • 5bd155c294 v1.5.14 RiotRobot 2020-03-30 13:45:32 +01:00
  • 51f4327ce1 Upgrade matrix-react-sdk to 2.3.0 RiotRobot 2020-03-30 13:45:21 +01:00
  • 37cebf38cc Upgrade matrix-js-sdk to 5.2.0 RiotRobot 2020-03-30 13:44:42 +01:00
  • 47783bd9b4 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 12:43:01 +00:00
  • 78fd8e4569 Reset matrix-js-sdk back to develop branch RiotRobot 2020-03-30 13:42:52 +01:00
  • 8a372778be Merge branch 'origin/develop' into Weblate. Weblate 2020-03-30 12:42:27 +00:00