Šimon Brandner
3232552715
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376
2021-08-04 13:11:36 +02:00
Šimon Brandner
d05be44113
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:07:54 +02:00
Šimon Brandner
4a1789be53
Update copy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:04:23 +02:00
David Baker
72654f24dc
Merge pull request #6541 from SimonBrandner/fix/indent
...
Fix indent in HTMLUtils
2021-08-04 10:06:38 +01:00
David Baker
15d42a2fd2
Merge pull request #6537 from matrix-org/dbkr/allchange
...
Switch to new changelog generator
2021-08-04 10:02:48 +01:00
James Salter
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
...
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
Andrew Morgan
c9c8177f58
Start a call immediately after creating a room via the dial pad ( #6529 )
2021-08-04 09:46:39 +01:00
Šimon Brandner
7cb21c845f
Fix indent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 10:34:48 +02:00
James Salter
17b935cbc4
Add @sentry/types and rrweb-snapshot as dev dependencies
...
This is neccessary to resolve re-exported types referred to by posthog-js' type definitions.
This isn't ideal, but
* We intend to start using sentry anyway
* Discussion with posthog maintainers about rrweb-snapshot at https://github.com/PostHog/posthog-js/issues/252 , perhaps we can find another solution soon
2021-08-04 09:34:12 +01:00
James Salter
4b78edd652
Remove patch-package and postinstall-postinstall
2021-08-04 09:32:01 +01:00
Germain
a07df5e9d8
Merge pull request #6512 from SimonBrandner/fix/mirroring/5633
2021-08-04 08:51:22 +01:00
Germain
94e77e70c6
Merge pull request #6470 from SimonBrandner/feature/incoming-call-toast
2021-08-04 08:42:09 +01:00
Germain
d2aa7a3bd6
Merge pull request #6457 from aaronraimist/more-url-schemes
...
Allow all of the URL schemes that Firefox allows
2021-08-04 08:32:08 +01:00
Š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
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
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
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
