36123 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Travis Ralston	280c017238	Merge pull request #6530 from matrix-org/travis/voice-messages/uploading ... Improve voice messages uploading state	2021-08-05 08:36:53 -06:00
Travis Ralston	51bd740936	Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21 ... Polish up more of the voice messages UI	2021-08-05 08:34:31 -06:00
Michael Telatynski	c7560a25e9	Merge pull request #6558 from matrix-org/t3chguy/null-guard-space-inviter	2021-08-05 12:45:40 +01:00
Michael Telatynski	a9d7d01014	Null guard space inviter to prevent the app exploding	2021-08-05 12:30:22 +01:00
Michael Telatynski	58575c335d	Merge pull request #5510 from SimonBrandner/feature-surround-with ... Add surround with feature	2021-08-05 09:33:52 +01:00
Germain	b5a708127a	Merge pull request #6554 from robintown/pin-icon-seams ... Remove seams from pin icon	2021-08-05 09:22:51 +01:00
Robin Townsend	5e3b79eeca	Remove seams from pin icon ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-08-04 18:42:47 -04:00
Dariusz Niemczyk	7d06507a9c	Merge pull request #6534 from SimonBrandner/fix/ringing-sound/15591 ... Make the ringing sound mutable/disablable	2021-08-05 00:02:44 +02:00
Travis Ralston	b4b4fb9702	Merge pull request #6553 from matrix-org/travis/voice-messages/worklet ... Fix worklet reference for new webpack pipeline	2021-08-04 15:38:04 -06:00
Travis Ralston	9b32a1c609	Appease Jest	2021-08-04 15:23:35 -06:00
Travis Ralston	4d5bdf70b7	Fix worklet reference for new webpack pipeline	2021-08-04 15:08:22 -06:00
Šimon Brandner	b9b98c6a81	i18n ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 18:15:11 +02:00
Šimon Brandner	b99e39e011	Merge remote-tracking branch 'upstream/develop' into feature-surround-with	2021-08-04 18:14:38 +02:00
Šimon Brandner	ee500ad684	Update copy ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 18:14:32 +02:00
Germain	7b8a43bd2b	Merge pull request #6551 from SimonBrandner/fix/pip-cursor/18383 ... Fix wrong cursor being used in PiP	2021-08-04 16:41:49 +01:00
Šimon Brandner	91b4b50969	Fix wrong cursor being used in PiP ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 17:25:12 +02:00
Germain	724c67bc21	Merge pull request #6548 from robintown/fix-fallback-fonts ... Fix fallback fonts	2021-08-04 16:00:22 +01:00
Šimon Brandner	74e1342fa8	Wrap cases in {} ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 16:35:46 +02:00
Šimon Brandner	023d874949	Add missing ? ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 16:34:59 +02:00
Šimon Brandner	881cac0d21	Merge remote-tracking branch 'upstream/develop' into fix/ringing-sound/15591 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 16:30:03 +02:00
Šimon Brandner	79e4a95b13	Move stuff out of if statement for better readability ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 16:25:44 +02:00
Germain	4dda4b241a	Merge pull request #6542 from matrix-org/gsouquet/fix-18354 ... Fix right margin for events on IRC layout	2021-08-04 15:15:06 +01:00
Dariusz Niemczyk	dc88686f9d	Merge pull request #6539 from SimonBrandner/feature/increase-anim-speed/18371 ... Increase PiP snapping speed	2021-08-04 16:02:47 +02:00
Dariusz Niemczyk	139a4028a3	Merge pull request #6545 from SimonBrandner/feature/update-tile-copy/18376 ... Improve call event tile wording	2021-08-04 15:55:26 +02:00
Šimon Brandner	a04a8006fc	Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376	2021-08-04 15:48:53 +02:00
Dariusz Niemczyk	c848b8f486	Merge pull request #6524 from matrix-org/palid/feature-css/hmr ... Add data-mx-theme to theme css for hot-reload	2021-08-04 15:35:15 +02:00
Robin Townsend	5877e936c0	Fix fallback fonts ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-08-04 09:24:18 -04:00
David Baker	9845dcb08c	Merge pull request #6546 from matrix-org/dbkr/codeowners ... Add CODEOWNERS	2021-08-04 14:22:56 +01:00
David Baker	a5b43ca7ca	Merge pull request #6226 from SimonBrandner/feature/re-pin-jitsi/17679 ... Re-pin Jitsi if the widget already exists	2021-08-04 14:01:13 +01:00
David Baker	d0b295f1a7	Add CODEOWNERS	2021-08-04 13:28:31 +01:00
Šimon Brandner	f97f410d09	Unused import ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 13:16:01 +02:00
Šimon Brandner	9681e0e441	Merge remote-tracking branch 'upstream/develop' into feature/re-pin-jitsi/17679 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 13:15:20 +02:00
David Baker	972e34516d	Merge pull request #6544 from matrix-org/dbkr/use_node_14 ... Declare node 14 requirement	2021-08-04 12:13:08 +01:00
Š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	6350cecb5e	emoty commit to try & wake netlify up	2021-08-04 12:02:14 +01:00
David Baker	c31f9335dc	Declare node 14 requirement ... Mostly for netlify (we need node 14 now because element-web's webpack config uses the `??` operator).	2021-08-04 11:51:55 +01:00
Germain Souquet	b4b788e8d5	Fix right margin for events on IRC layout ... Fixes vector-im/element-web#18354	2021-08-04 11:21:52 +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