Commit Graph

36117 Commits

Author SHA1 Message Date
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
Germain
84af29a7f1
Merge pull request #6452 from SimonBrandner/fix/bubble-bg-color/18081 2021-08-04 07:55:59 +01:00
Šimon Brandner
ca94518de5
Improve bubble colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:46:09 +02:00
Šimon Brandner
050e260655
Fix weird spacing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:45:58 +02:00
Šimon Brandner
7fc632d0cf
Put font names into "" so that stylelint shuts up about them
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:42:07 +02:00
Šimon Brandner
8f3bdf7dad
Merge remote-tracking branch 'upstream/develop' into fix/bubble-bg-color/18081 2021-08-04 08:12:27 +02:00
Šimon Brandner
372cbbfe8e
Increase snapping speed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:11:05 +02:00
David Baker
82c6445648 Add release_config for changelogging 2021-08-03 18:08:25 +01:00
David Baker
612384a6a3 Switch to new changelog generator
allchange is typescript so has a 'prepare' script to tsc it into
javascript so it can be a binscript - hopefully this won't cause
it to make too much of a pain of itself causing tsc to run on every
yarn add/install
2021-08-03 18:03:46 +01:00
David Baker
8c5cfe6c2a
Merge pull request #6536 from matrix-org/dbkr/argh_the_linting
Update eslint plugin & fix silly indenting
2021-08-03 17:18:20 +01:00
David Baker
28f5dc483b Update eslint plugin & fix silly indenting
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
Šimon Brandner
65451805a2
Merge remote-tracking branch 'upstream/develop' into fix/mirroring/5633
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 16:06:12 +02:00
Šimon Brandner
a18f41ceed
Fix tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:43:56 +02:00
Šimon Brandner
2a378f30b7
Attempt to fix tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:38:12 +02:00
Šimon Brandner
75948587e4
Avoid calling with undefined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:13:40 +02:00
Šimon Brandner
e787d14cde
Set silenced state as soon as we get the call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 14:58:50 +02:00
Šimon Brandner
37f51c7536
Don't ring if it's disabled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 14:48:39 +02:00
Germain
b51fb0cb94
Merge pull request #6533 from matrix-org/gsouquet/fix-logoutdialog-warning 2021-08-03 12:59:54 +01:00
Germain Souquet
54c685bfa8 Migrate LogoutDialog to TypeScript 2021-08-03 13:52:46 +02:00
Germain Souquet
81b45f8aa9 Make defaultProps a static property of LogoutDialog 2021-08-03 13:44:14 +02:00
James Salter
c66d0017de Patch posthog's type definitions using patch-package
Remove definitions for sentry and rrweb-snapshot
2021-08-03 11:59:54 +01:00
James Salter
dc7aad1abf Revert "Revert "Add support for Posthog Analytics under a labs flag""
This reverts commit c5ea253181.
2021-08-03 11:55:02 +01:00
James Salter
1b87ffb7cb
Merge pull request #6527 from SimonBrandner/fix/font-topic/18339
Fix the wrong font being used in the room topic field
2021-08-03 10:06:58 +01:00
James Salter
0b369b6ee6
Merge pull request #6531 from matrix-org/revert-6495-posthog-analytics
Revert "Add support for Posthog Analytics under a labs flag"
2021-08-03 07:36:18 +01:00
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
Dariusz Niemczyk
7fd14c9ccc
Add data-mx-theme to theme css for hot-reload 2021-08-02 22:31:38 +02:00
David Baker
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
Šimon Brandner
2dc13dedf0
Fix font
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 15:38:45 +02:00
Michael Telatynski
152c7dc865
Merge pull request #6523 from aaronraimist/fix-mjolnir 2021-08-02 13:48:43 +01:00
David Baker
9f8eb22c33
Merge pull request #6526 from SimonBrandner/fix/call-notif-fire
Fix broken call notification regression
2021-08-02 13:42:18 +01:00
Šimon Brandner
fd3bb2712a
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 14:35:12 +02:00
Šimon Brandner
2bdb7e64a3
Revert removing textForCallInvite
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-02 14:34:18 +02:00
James Salter
1ca547802f lint 2021-08-02 13:28:56 +01:00
RiotRobot
e2ef5d1737 Resetting package fields for development 2021-08-02 13:08:10 +01:00
RiotRobot
81b767ed89 Merge branch 'master' into develop 2021-08-02 13:08:09 +01:00
RiotRobot
e77f7319f2 v3.27.0 2021-08-02 13:06:29 +01:00
RiotRobot
d1e7c48125 Upgrade matrix-js-sdk to 12.2.0 2021-08-02 13:05:48 +01:00
David Baker
83674aad66 Changelog for v3.27.0 2021-08-02 12:55:33 +01:00
David Baker
cb00796a25
Merge pull request from GHSA-f69q-vrfp-27g2
Sanitize untrusted variables from message previews before translation
2021-08-02 12:49:07 +01:00
James Salter
2cee2b5fd6 Update comment 2021-08-02 12:26:18 +01:00
James Salter
4755a81403 Disable analytics when user hasn't opted in or out 2021-08-02 12:23:42 +01:00
James Salter
ce11e6c981
Update src/PosthogAnalytics.ts
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-08-02 11:45:49 +01:00
Andrew Morgan
645c128e44
Prevent backspace and delete functionality in the in-call dial pad. (#6522)
Just as one cannot do when there inputting number while
on a call on their phone, it doesn't make much sense to
be able to do so while on a call in Element. The DTMF
tone history should be preserved.
2021-08-02 10:18:35 +01:00
Andrew Morgan
442992b30e
Fix symbol entry in the in-call dialpad (#6521)
The field had RTL direction set on it, which meant symbols, like *,
appeared at the beginning of the field instead of the end.

RTL was introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/5786,
however its removal seems to have had no adverse affects
from testing.
2021-08-02 10:18:17 +01:00
Travis Ralston
711210d16e
Merge pull request #6437 from matrix-org/travis/voice-messages/delabs
Remove voice messages labs flag
2021-08-02 02:02:36 -06:00
Travis Ralston
9e0ec63ea7 Use correct variable 2021-07-31 11:50:25 -06:00
Travis Ralston
0923dd37ab Sanitize untrusted variables from message previews before translation
Fixes https://github.com/vector-im/element-web/issues/18314
2021-07-31 11:43:05 -06:00
Aaron Raimist
cf2a4ddde7
Fix typo which broke feature_mjolnir
Regressed in b2d9dd7214

Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-07-31 02:11:49 -05:00
Jano Garcia
59a86bc0e7
Merge pull request #6515 from matrix-org/janogarcia/fix-contributing-url
Fix wrong URL in README.md
2021-07-30 19:28:22 +02:00