2440 Commits

Author	SHA1	Message	Date
Travis Ralston	da8a783ca0	lint	2021-06-30 14:51:18 -06:00
Travis Ralston	12d7be2b6a	Merge branch 'develop' into travis/new-audio	2021-06-30 13:25:41 -06:00
Germain Souquet	fdced3da1b	Remove reminescent references to the tinter	2021-06-30 08:09:55 +01:00
Michael Telatynski	26592da09f	Merge pull request #5671 from weeman1337/msg-context-menu	2021-06-29 08:18:07 +01:00
Travis Ralston	d6cf2346fe	Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240	2021-06-28 21:00:36 -06:00
Travis Ralston	964a97d59e	Merge remote-tracking branch 'origin/develop' into travis/new-audio	2021-06-28 20:52:44 -06:00
Travis Ralston	b6d9ecde8b	Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf ... Improve audio recording performance	2021-06-28 20:49:21 -06:00
J. Ryan Stinnett	52b578fb3f	Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 ... Fix IRC layout regressions	2021-06-28 16:10:02 +01:00
Michael Telatynski	494f4d3ab4	Merge pull request #6248 from matrix-org/t3chguy/fix/17731	2021-06-28 16:08:12 +01:00
Michael Telatynski	56514d51a6	Fix tiny scrollbar dot on chrome/electron in Forward Dialog	2021-06-28 15:37:28 +01:00
Germain Souquet	6cb86057c5	Merge branch 'develop' into gsouquet/voice-messages-waveform-perf	2021-06-28 09:29:11 +01:00
Michael Telatynski	1d374f6cbb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731	2021-06-25 14:50:24 +01:00
Michael Telatynski	1f27049a5d	Merge pull request #6257 from SimonBrandner/feature/pinned-click	2021-06-25 14:42:18 +01:00
Michael Telatynski	620e14eb4b	Fix space avatar management layout being broken	2021-06-25 11:10:37 +01:00
Travis Ralston	7a6ee7d918	I know how CSS works.	2021-06-25 00:22:05 -06:00
Travis Ralston	e0a73a583e	Increase clickable area of seek bar	2021-06-25 00:19:57 -06:00
Travis Ralston	dd53c25706	Fix right panel sizing	2021-06-24 20:37:34 -06:00
Travis Ralston	ebb6f1b602	Add seeking and notes about clock desync	2021-06-24 20:18:50 -06:00
Michael Weimann	086042f078	update message context texts and icons ... Signed-off-by: Michael Weimann <mail@michael-weimann.eu>	2021-06-24 22:20:53 +02:00
Michael Weimann	6ea79b297f	tweak message context icons ... Signed-off-by: Michael Weimann <mail@michael-weimann.eu>	2021-06-24 22:20:51 +02:00
Michael Weimann	8f6904ec1b	tweak the message menu cancel icon size ... Signed-off-by: Michael Weimann <mail@michael-weimann.eu>	2021-06-24 22:20:50 +02:00
Michael Weimann	74f61795eb	add _MessageContextMenu.scss license header ... Signed-off-by: Michael Weimann <mail@michael-weimann.eu>	2021-06-24 22:20:50 +02:00
Michael Weimann	62efea7e19	add message context menu icons ... Signed-off-by: Michael Weimann <mail@michael-weimann.eu>	2021-06-24 22:20:50 +02:00
Michael Weimann	e4eeafd485	migrate the message context menu to IconizedContextMenu ... Signed-off-by: Michael Weimann <mail@michael-weimann.eu>	2021-06-24 22:20:49 +02:00
Travis Ralston	9c752680ba	Tile styling and early behaviour	2021-06-24 13:56:11 -06:00
Travis Ralston	ffef2e58cb	Unify audio message types to new media body	2021-06-24 11:38:35 -06:00
Travis Ralston	8ce77e618f	Reduce pointless CSS vars by 2	2021-06-24 11:38:35 -06:00
Travis Ralston	470778cbb8	Move voice message components to audio-generic directory	2021-06-24 11:38:35 -06:00
Travis Ralston	9f2eba4351	Fix class identifiers	2021-06-24 11:38:35 -06:00
Šimon Brandner	430ae0e79f	Merge remote-tracking branch 'upstream/develop' into feature/pinned-click	2021-06-24 16:59:18 +02:00
Michael Telatynski	6d3e7730ef	Fix two PRs duplicating the css attribute	2021-06-24 11:40:49 +01:00
Michael Telatynski	71414904fc	Merge pull request #6201 from matrix-org/t3chguy/fix/15051	2021-06-24 11:20:12 +01:00
Michael Telatynski	26d8c4d2e6	Improve design of the multi inviter error dialog	2021-06-24 10:03:32 +01:00
Germain Souquet	09c22c37ff	Add comment to specify variable origin	2021-06-24 10:01:44 +01:00
Šimon Brandner	0fe6a28853	Merge remote-tracking branch 'upstream/develop' into feature/pinned-click	2021-06-24 10:57:09 +02:00
Germain Souquet	56467485f5	Merge branch 'develop' into gsouquet/voice-messages-waveform-perf	2021-06-24 09:42:47 +01:00
Šimon Brandner	8d47ea63c2	Make pinned message text clickable ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-24 10:41:55 +02:00
Michael Telatynski	0e2f617d94	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051	2021-06-24 09:33:39 +01:00
Michael Telatynski	47be728eb2	Fix invite dialog being cut off when it has limited results	2021-06-24 09:21:52 +01:00
Michael Telatynski	5d93216c94	Decrease e2e shield fill mask size so that it doesn't overlap	2021-06-23 16:10:47 +01:00
Michael Telatynski	cdb97d5494	Fix trashcan.svg by exporting it with its viewbox ... then fix sizing and alignment of consumers	2021-06-23 12:30:23 +01:00
David Baker	f0ad70f0e7	Merge pull request #5786 from DantrazTrev/DialPad ... Dial Pad UI bug fixes	2021-06-23 11:41:41 +01:00
Michael Telatynski	1286be1ffb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/room_settings/AliasSettings.tsx	2021-06-22 22:02:09 +01:00
Michael Telatynski	b3b9135b1f	Merge pull request #6134 from matrix-org/t3chguy/fix/17529	2021-06-22 21:28:51 +01:00
Michael Telatynski	e3e6b74272	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 ... Conflicts: src/stores/SpaceStore.tsx	2021-06-22 17:38:05 +01:00
Germain Souquet	27d255f30e	Reduce audio waveform layout trashing	2021-06-22 12:27:54 +01:00
Germain Souquet	adb42b7927	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
Šimon Brandner	21a960acc7	Fix timestamp issues ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-19 17:53:00 +02:00
Šimon Brandner	c0f34c9a01	Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648	2021-06-19 17:24:30 +02:00
Germain	71ff5248fe	Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591	2021-06-17 16:41:00 +01:00