Commit Graph

  • f24d8a32f5 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 14:46:25 +00:00
  • d6dbe5596a Merge pull request #5581 from matrix-org/travis/widgets/sticker-picker Travis Ralston 2021-01-28 07:46:17 -07:00
  • d28521123e Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 12:50:00 +00:00
  • 4920614ca5 Merge pull request #5529 from SimonBrandner/hide-local-feed J. Ryan Stinnett 2021-01-28 12:49:52 +00:00
  • e5d3784d93 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 12:44:43 +00:00
  • 5758cd8bcc Merge pull request #5518 from blattersturm/pr/irc-layout-width J. Ryan Stinnett 2021-01-28 12:44:36 +00:00
  • 5f5fc6acea Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 12:42:55 +00:00
  • 60eade5008 Merge pull request #5554 from czeidler/code-style-update J. Ryan Stinnett 2021-01-28 12:42:50 +00:00
  • 8336cbda71 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 12:35:30 +00:00
  • 6cbff674d3 Merge pull request #5569 from SimonBrandner/fix-czech-letters J. Ryan Stinnett 2021-01-28 12:35:22 +00:00
  • 4f96064a1d Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 12:33:38 +00:00
  • 5431dc7331 Merge pull request #5548 from SimonBrandner/add-search-shortcut J. Ryan Stinnett 2021-01-28 12:33:32 +00:00
  • 1499f9a209 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 12:25:56 +00:00
  • 08d495eee8 Merge pull request #5584 from 2580ayush2580/ayush25805 J. Ryan Stinnett 2021-01-28 12:25:47 +00:00
  • fd4109b8ad fix tests by reverting if removal Michael Telatynski 2021-01-28 11:00:04 +00:00
  • 1761a4ec80 Improve SSO UIA Michael Telatynski 2021-01-28 10:45:29 +00:00
  • 60bbcf6f11 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-28 03:37:21 +00:00
  • 317b370b59 Translated using Weblate (Hebrew) MusiCode1 2021-01-27 22:05:25 +00:00
  • 41068c7849 Merge pull request #5568 from SimonBrandner/fix-15221 Travis Ralston 2021-01-27 20:37:11 -07:00
  • 41682fa8d2 Update src/components/views/elements/PersistedElement.js Travis Ralston 2021-01-27 20:37:04 -07:00
  • f01511cfd4 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-27 21:59:42 +00:00
  • 6f7d4833fe Merge branch 'origin/develop' into Weblate. Weblate 2021-01-27 21:59:37 +00:00
  • 14caa2f0a1 Translated using Weblate (Hebrew) MusiCode1 2021-01-27 21:57:34 +00:00
  • dd5911e7e5 Translated using Weblate (French) c-cal 2021-01-27 17:15:10 +00:00
  • 61f6fa0633 Merge pull request #5582 from matrix-org/travis/widgets/fix-jitsi-unpin Travis Ralston 2021-01-27 14:59:34 -07:00
  • 3229b1fb4e Merge pull request #5583 from matrix-org/travis/widgets/jitsi-crash Travis Ralston 2021-01-27 14:59:27 -07:00
  • c1b33d3e2c Fix Jitsi widgets causing localized tile crashes Travis Ralston 2021-01-27 14:40:04 -07:00
  • 2c11f0bb7c Added condition to hide the 'find a room' UI unless the user is explicitly filtering the list Ayush Kumar 2021-01-28 03:09:52 +05:30
  • 08b067fd68 Remove check that prevents Jitsi widgets from being unpinned Travis Ralston 2021-01-27 14:31:48 -07:00
  • edb363b751 Allow stickerpickers the legacy "visibility" capability Travis Ralston 2021-01-27 14:22:55 -07:00
  • db346d129b Run a UI refresh over the OIDC Exchange confirmation dialog Travis Ralston 2021-01-27 13:13:44 -07:00
  • 34ae766893 Wire up MSC2858 brand attribute Michael Telatynski 2021-01-27 14:27:41 +00:00
  • b6d1342ab6 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-27 16:01:13 +00:00
  • 33a86f6cbe Merge pull request #5573 from matrix-org/dbkr/callstats David Baker 2021-01-27 16:01:06 +00:00
  • 4517e6512e Merge branch 'origin/develop' into Weblate. Weblate 2021-01-27 14:59:39 +00:00
  • 86310a4de0 Merge pull request #16294 from vector-im/jryans/upgrade-deps-2021-01 J. Ryan Stinnett 2021-01-27 14:59:31 +00:00
  • 8140a9618e Explicitly enable ES proposals already in use J. Ryan Stinnett 2021-01-27 14:50:00 +00:00
  • 0f3623393f Fix typing errors after upgrades J. Ryan Stinnett 2021-01-27 14:35:02 +00:00
  • c34a36a9e2 Nested upgrades via yarn upgrade J. Ryan Stinnett 2021-01-27 14:33:53 +00:00
  • d03edb91ea Apply somple major version upgrades J. Ryan Stinnett 2021-01-27 14:31:17 +00:00
  • ab0677530b Nested upgrades via yarn upgrade J. Ryan Stinnett 2021-01-27 14:17:53 +00:00
  • e7c722bb99 Pin React types to 16.x for now J. Ryan Stinnett 2021-01-27 14:14:25 +00:00
  • 48613027fc Upgrade to latest minor deps J. Ryan Stinnett 2021-01-27 14:10:51 +00:00
  • d2036e93c9 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-27 14:01:58 +00:00
  • 4975e0245b Translated using Weblate (Serbian) Slobodan Simić 2021-01-27 08:42:46 +00:00
  • de507b80f7 Merge pull request #5579 from matrix-org/jryans/upgrade-deps-2021-01 J. Ryan Stinnett 2021-01-27 14:01:47 +00:00
  • 51aab9ca08 Fix import style for commonmark J. Ryan Stinnett 2021-01-27 13:06:59 +00:00
  • d47948fb7b Improve SSO auth flow Michael Telatynski 2021-01-27 12:50:14 +00:00
  • e6673bca1b Improve SSO auth flow Michael Telatynski 2021-01-27 12:50:12 +00:00
  • d78bc98521 Resolve linting errors after upgrades J. Ryan Stinnett 2021-01-20 13:49:15 +00:00
  • 84b1f2e6c6 Resolve typing errors after TypeScript upgrade J. Ryan Stinnett 2021-01-20 13:40:46 +00:00
  • ea706189a2 Nested upgrades via yarn upgrade J. Ryan Stinnett 2021-01-20 13:10:01 +00:00
  • 0cb266eda2 lolex renamed to @sinonjs/fake-timers J. Ryan Stinnett 2021-01-20 13:07:52 +00:00
  • ca08475498 Apply all simple major version upgrades J. Ryan Stinnett 2021-01-20 13:04:41 +00:00
  • f8816e0bda Pin React types to 16.x for now J. Ryan Stinnett 2021-01-20 12:36:28 +00:00
  • 12c671045d Upgrade to latest minor versions of deps J. Ryan Stinnett 2021-01-20 11:11:22 +00:00
  • fa3ace8473 Rework message pilling to ignore event permalinks J. Ryan Stinnett 2021-01-27 11:46:20 +00:00
  • 27724a93d2 new strings Will Hunt 2021-01-27 11:42:36 +00:00
  • 5de92b68d9 Show a specific error for hs_disabled Will Hunt 2021-01-27 11:39:57 +00:00
  • 9ac31747f6 This was missing a break somehow David Baker 2021-01-27 10:36:40 +00:00
  • 075d03227c Merge branch 'origin/develop' into Weblate. Weblate 2021-01-27 00:02:33 +00:00
  • 048a3f6ec8 Merge pull request #5566 from 2580ayush2580/ayush25803 J. Ryan Stinnett 2021-01-27 00:02:26 +00:00
  • 71921ad705 Remove unused isPillUrl J. Ryan Stinnett 2021-01-26 14:11:09 +00:00
  • 501c73ae4b Remove outdated comment J. Ryan Stinnett 2021-01-26 14:08:39 +00:00
  • 554c18cabd i18n Šimon Brandner 2021-01-26 13:36:47 +01:00
  • 030fe38834 Merge branch 'master' into develop RiotRobot 2021-01-26 12:31:31 +00:00
  • 70c3446339 v1.7.18 RiotRobot 2021-01-26 12:31:13 +00:00
  • de0e7483a9 Prepare changelog for v1.7.18 RiotRobot 2021-01-26 12:31:13 +00:00
  • 7efbd50e31 Handle migration from useIRCLayout to layout Šimon Brandner 2021-01-26 13:30:34 +01:00
  • a47be2236b Merge branch 'origin/develop' into Weblate. Weblate 2021-01-26 12:29:40 +00:00
  • 49b2f37dc8 Translated using Weblate (German) @a2sc:matrix.org 2021-01-26 09:44:26 +00:00
  • 089afaad93 Reset matrix-react-sdk back to develop branch RiotRobot 2021-01-26 12:29:29 +00:00
  • 86b0f898ec Reset matrix-js-sdk back to develop branch RiotRobot 2021-01-26 12:29:16 +00:00
  • e66d500b02 Merge branch 'master' into develop RiotRobot 2021-01-26 12:26:47 +00:00
  • 9a1b667c27 v1.7.18 v1.7.18 origin/release-v1.7.17 RiotRobot 2021-01-26 12:17:44 +00:00
  • b04f76dc27 Prepare changelog for v1.7.18 RiotRobot 2021-01-26 12:17:44 +00:00
  • cd8a9e44b3 Upgrade matrix-react-sdk to 3.12.1 RiotRobot 2021-01-26 12:13:51 +00:00
  • 5052f9bc43 Upgrade matrix-js-sdk to 9.5.1 RiotRobot 2021-01-26 12:12:41 +00:00
  • 831443a0d6 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-26 12:12:03 +00:00
  • 4dbdeb46ad Reset matrix-js-sdk back to develop branch RiotRobot 2021-01-26 12:11:47 +00:00
  • e21514cea0 Merge branch 'master' into develop RiotRobot 2021-01-26 12:08:24 +00:00
  • 982c3ceca1 v3.12.1 RiotRobot 2021-01-26 12:04:37 +00:00
  • 1ecd3836da Prepare changelog for v3.12.1 RiotRobot 2021-01-26 12:04:37 +00:00
  • c001d8c58e Merge branch 'origin/develop' into Weblate. Weblate 2021-01-26 11:59:12 +00:00
  • 1181489cbf Translated using Weblate (Finnish) Samu Voutilainen 2021-01-26 04:50:03 +00:00
  • 36a34008c0 Translated using Weblate (Ukrainian) Ihor Hordiichuk 2021-01-25 23:20:13 +00:00
  • e327551399 Merge pull request #5574 from matrix-org/jryans/verify-require-reg J. Ryan Stinnett 2021-01-26 11:58:59 +00:00
  • 709fc2e004 Upgrade matrix-js-sdk to 9.5.1 RiotRobot 2021-01-26 11:57:46 +00:00
  • 52bc36fc79 Require registration for verification actions J. Ryan Stinnett 2021-01-26 11:00:56 +00:00
  • e43adef438 firefox uses 'address' instead of 'ip' David Baker 2021-01-26 10:52:35 +00:00
  • c4c51945f0 Translated using Weblate (German) Dellle 2021-01-26 09:43:56 +00:00
  • ec0266d82b Log candidates for calls David Baker 2021-01-26 09:41:57 +00:00
  • e8e0d808d4 Remove out-dated comment about flow annotation Clemens Zeidler 2021-01-26 21:24:54 +13:00
  • 662d89659f Update code_style.md czeidler 2021-01-26 21:23:11 +13:00
  • cd78d88863 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-25 16:39:52 +00:00
  • 303694754b Merge pull request #5572 from matrix-org/dbkr/dont_play_hangup_sound_when_answered_elsewhere David Baker 2021-01-25 16:39:44 +00:00
  • 8783765ce3 Don't play the hangup sound when the call is answered from elsewhere David Baker 2021-01-25 16:18:14 +00:00
  • 4ab84d3b59 Merge branch 'origin/develop' into Weblate. Weblate 2021-01-25 13:14:58 +00:00
  • 851d8e4265 Translated using Weblate (Latvian) Andrejs 2021-01-24 16:19:24 +00:00
  • 151c365fd8 Translated using Weblate (Malayalam) vachan-maker 2021-01-24 12:26:49 +00:00