3098 commits

Author	SHA1	Message	Date
Šimon Brandner	8c1721fc35	Remove the old codeblock code ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-07 09:22:50 +02:00
Michael Telatynski	eb9f4c609a	Make CreateRoomDialog capable of creating restricted rooms in spaces	2021-07-06 10:10:47 +01:00
Michael Telatynski	c5ca98a3ad	Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog	2021-07-06 10:10:25 +01:00
Michael Telatynski	82100df9ea	Bring dropdown styling into closer line with rest of our styling	2021-07-06 10:08:57 +01:00
Germain Souquet	de875bbe1d	fix avatar position and outline	2021-07-05 16:22:18 +02:00
Michael Telatynski	1b25ab930e	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/dialogs/AddExistingToSpaceDialog.tsx	2021-07-05 13:06:22 +01:00
Germain	1b95762910	Merge pull request #6310 from matrix-org/gsouquet/faster-animations	2021-07-05 12:21:49 +01:00
David Baker	0cee0db9df	Fix icon size in passphrase prompt	2021-07-02 20:38:07 +01:00
Germain Souquet	df64a076d9	Deprecate unused PulsedAvatar	2021-07-02 15:24:30 +01:00
Germain Souquet	a093ea6357	Move RightPanel animation to compositor	2021-07-02 15:23:03 +01:00
Germain Souquet	aac0989005	Make beta dot animation run on the compositor	2021-07-02 14:58:59 +01:00
Michael Telatynski	e8f0412fe3	Add way to manage Restricted join rule in Room Settings	2021-07-02 14:51:55 +01:00
Šimon Brandner	0d8f84c769	Delete lozenge effect ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-02 15:35:52 +02:00
Šimon Brandner	e582b1559b	Fix redacted messages (again) ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-02 15:09:02 +02:00
Šimon Brandner	0fe10e4502	Fix replies to deleted messages ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-02 14:22:46 +02:00
Šimon Brandner	b014763cd2	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-02 13:14:14 +02:00
Tulir Asokan	5240209529	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-07-02 12:39:51 +03:00
Jaiwanth	190ccb6f00	Merge and add export support for the modified MAudioBody	2021-07-02 10:41:04 +05:30
Michael Telatynski	1f337b28ac	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash ... Conflicts: src/ContentMessages.tsx src/components/structures/UploadBar.tsx src/components/views/messages/MImageBody.js src/components/views/messages/MStickerBody.js src/components/views/messages/MVideoBody.tsx	2021-07-01 20:48:34 +01:00
David Baker	5e3c8fae5c	put this just on the buttons	2021-07-01 15:22:44 +01:00
Germain Souquet	d90d1ca8db	event list summary alignment in bubble layout	2021-07-01 14:56:34 +01:00
David Baker	66d95ed7b2	Fix button styling in verification bubbles	2021-07-01 14:51:20 +01:00
Germain Souquet	223b40c9d6	Add dark theme support	2021-07-01 14:23:00 +01:00
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	209344d443	improvements to bubble layout	2021-06-30 17:06:51 +01:00
Germain Souquet	d1c6cfe6b9	Improved message bubble layout (no reply)	2021-06-30 12:06:16 +01:00
Germain Souquet	d9eec1c03b	Merge branch 'develop' into gsouquet/message-bubbles-4635	2021-06-30 08:58:20 +01:00
Germain Souquet	fdced3da1b	Remove reminescent references to the tinter	2021-06-30 08:09:55 +01:00
Jaiwanth	551639811b	Merge and resolve conflicts	2021-06-30 12:29:13 +05:30
Michael Telatynski	26592da09f	Merge pull request #5671 from weeman1337/msg-context-menu	2021-06-29 08:18:07 +01:00
Jaiwanth	637e3afa48	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations	2021-06-29 11:31:30 +05:30
Jaiwanth	025a7eb9a5	Iterate PR	2021-06-29 10:36:24 +05:30
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
Jaiwanth	398d49245f	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations	2021-06-26 23:42:42 +05:30
Jaiwanth	e505646f21	Finish dialog implementation of export settings	2021-06-26 21:54:10 +05:30
Šimon Brandner	ed78bd9096	Remove explicitly set font-family in place where comments talk about FF ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-26 09:12:51 +02:00
Šimon Brandner	ffc6f96d45	Remove explicitly set font-family ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-26 09:12:45 +02:00
Šimon Brandner	fbe3eb7726	Remove unused class ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-26 09:00:42 +02:00
Jaiwanth	4d6ad91e52	Add export option to right panel	2021-06-25 22:45:14 +05:30
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
Šimon Brandner	202cb0f5d8	Fix styling of buttons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-21 17:05:36 +02:00
Germain Souquet	adb42b7927	Deprecate FormButton to use AccessibleButton everywhere	2021-06-21 14:16:37 +01:00
Šimon Brandner	b3ac0c71e1	Fix access token copy button ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-21 12:17:51 +02:00
Šimon Brandner	401fe1d05b	Add call silencing to CallEvent ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-19 20:03:09 +02: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
Tulir Asokan	c1bc4b0027	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-06-19 16:11:53 +03:00
Germain Souquet	6271c5c3d8	first iteration for message bubble layout	2021-06-18 18:59:22 +01:00
Šimon Brandner	6fb3bdbcd0	Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip	2021-06-18 19:02:56 +02:00
Šimon Brandner	f96c366aa4	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-18 17:07:43 +02:00
Šimon Brandner	707ecd8786	Don't highlight bubble events ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-18 17:03:48 +02:00
Šimon Brandner	62de75ab00	Increase height ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-18 16:19:57 +02:00
Šimon Brandner	9b6195317e	Improve padding ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-18 16:14:54 +02:00
Šimon Brandner	88ba24f362	Fix bugs ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-17 18:34:58 +02:00
Šimon Brandner	a781d6f128	Adjust padding and line-height a bit ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-17 18:13:52 +02:00
Šimon Brandner	512c054656	Add call type icon ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-17 17:55:18 +02:00
Germain	71ff5248fe	Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591	2021-06-17 16:41:00 +01:00
Michael Telatynski	7d90612371	Iterate PR	2021-06-17 16:22:40 +01:00
Šimon Brandner	02e6559330	Set text color to secondary-fg-color ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-17 17:04:56 +02:00
Šimon Brandner	7b6c3aec63	Change some styling to better match the designs ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-17 16:33:00 +02:00
Šimon Brandner	949532c297	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile	2021-06-17 15:53:25 +02:00
Šimon Brandner	d89392a1d9	Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip	2021-06-17 15:41:19 +02:00
Šimon Brandner	dbdb61c820	Improve the mxid overlap situation ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-16 17:21:29 +02:00
Michael Telatynski	384bb3af2e	Fix layout regression in the invite dialog for few results	2021-06-16 10:37:34 +01:00
Michael Telatynski	b4fbc791bb	Add experimental options to the Spaces beta	2021-06-16 09:01:13 +01:00
Šimon Brandner	5dc87869eb	Also override mx_SenderProfile_mxid ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-15 17:22:47 +02:00
Tulir Asokan	cdd2773aa6	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-06-15 17:37:49 +03:00
Michael Telatynski	a52dd57eb2	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529 ... Conflicts: package.json yarn.lock	2021-06-15 13:59:54 +01:00
Michael Telatynski	660a849cdd	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash ... Conflicts: package.json src/ContentMessages.tsx yarn.lock	2021-06-15 12:58:29 +01:00
Michael Telatynski	83c30b2280	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx	2021-06-15 12:24:26 +01:00
Šimon Brandner	d08495bde6	Fix display name overlap ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-15 06:30:22 +02:00
Michael Telatynski	539465ecb4	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 ... Conflicts: src/components/views/dialogs/InviteDialog.tsx	2021-06-14 22:22:30 +01:00
Michael Telatynski	91df392a2a	Merge pull request #5880 from SimonBrandner/show-username	2021-06-14 21:34:01 +01:00
Šimon Brandner	60ab7aaed5	Support hiding sidebar ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 17:20:13 +02:00
Šimon Brandner	9a67851479	Hide feeds with muted video in certain cases and fix colors ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 14:01:09 +02:00
Šimon Brandner	6ae1f533e9	Add min-width ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 13:50:25 +02:00
Šimon Brandner	c5ee2a6b32	Add share button and refoctor ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 13:43:42 +02:00
Šimon Brandner	e5188a5258	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-06-12 13:32:49 +02:00
Šimon Brandner	0c55a6c5bf	Add presenting text ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 11:50:16 +02:00
Šimon Brandner	e431f41e11	Fix feeds misbehaving ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 10:48:32 +02:00
Šimon Brandner	97b976b171	Adjust for sidebar ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 08:15:26 +02:00
Šimon Brandner	5608e92885	Add styling for CallViewSidebar ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-12 08:09:51 +02:00
Šimon Brandner	5343be7814	Fix buggy hovering/selecting of event tiles ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-10 18:53:56 +02:00
Šimon Brandner	8174973cfe	Use the same styling as for mx_TextualEvent ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-10 15:31:27 +02:00
Šimon Brandner	fdda534053	Merge branch 'develop' into feature/call-event-tile ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-09 19:23:14 +02:00
Germain Souquet	15132074e2	Restore copy button icon when sharing permalink	2021-06-09 13:44:31 +01:00
Šimon Brandner	fccd71f82e	Update styling based on review ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-09 06:23:51 +02:00
Michael Telatynski	f34a2e61bc	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365	2021-06-08 16:54:49 +01:00
Michael Telatynski	34cc494a8e	Merge pull request #6140 from matrix-org/t3chguy/fix/17553	2021-06-08 16:45:35 +01:00
Michael Telatynski	90bb7c1482	Switch Space Settings for a tabbed view with a bunch more settings exposed	2021-06-08 16:33:47 +01:00
Šimon Brandner	bf77a4a2ab	Merge remote-tracking branch 'upstream/develop' into show-username	2021-06-08 17:14:42 +02:00
Robin Townsend	372f24ff99	Hide download links from forward dialog preview ... since trying to interact with them is pointless. Signed-off-by: Robin Townsend <robin@robin.town>	2021-06-07 19:19:14 -04:00
Robin Townsend	b97867271b	Merge branch 'develop' into improved-forwarding-ui	2021-06-07 19:09:36 -04:00
Šimon Brandner	025148d9fc	Merge branch 'develop' into show-username ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-07 19:37:22 +02:00
Tulir Asokan	059241b5cc	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-06-07 19:26:12 +03:00
Michael Telatynski	6d2a7390d7	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244	2021-06-07 14:15:49 +01:00
Michael Telatynski	bd8fd77d54	Merge pull request #6148 from robintown/fix-timestamps	2021-06-07 13:12:11 +01:00
Michael Telatynski	8c34a8461e	Add way to specify address during public space creation	2021-06-07 08:57:39 +01:00
Robin Townsend	ea2120bdfd	Fix timestamps ... 7f83590846 changed timestamps to be hidden at the DOM level, not the CSS level. We can keep that approach, we just need to ensure they still get shown at the right times. Signed-off-by: Robin Townsend <robin@robin.town>	2021-06-06 01:55:01 -04:00
Robin Townsend	e891d18fa2	Add my email to my copyright notices ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-06-05 21:41:28 -04:00
Robin Townsend	17edfec3aa	Make it easier to pan images in the lightbox ... Previously, if you were dragging an image and your cursor outpaced the edge of the image as it was moving, panning would abruptly stop. This moves a few of the lightbox event listeners one level up to the image wrapper to ensure that all drag movements are detected, even if they don't end over the image's current position. Signed-off-by: Robin Townsend <robin@robin.town>	2021-06-05 21:08:44 -04:00
Robin Townsend	a06306d560	Merge branch 'develop' into improved-forwarding-ui	2021-06-05 11:04:17 -04:00
Michael Telatynski	93f41ce0ab	Actually finish the empty state for the pinned messages card	2021-06-04 11:35:17 +01:00
Šimon Brandner	1d3bf91e83	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-04 08:19:29 +02:00
Šimon Brandner	629201a074	Merge branch 'develop' into fix/mute-incoming-call/15591	2021-06-04 07:59:28 +02:00
Šimon Brandner	6eb33ac730	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-04 07:49:05 +02:00
Michael Telatynski	93010d34fd	Merge branch 'develop' into t3chguy/fix/6606	2021-06-03 19:33:09 +01:00
Michael Telatynski	0c97d90fb9	Iterate PR based on feedback	2021-06-03 16:44:28 +01:00
Germain	a36063704d	Merge pull request #6138 from matrix-org/gsouquet/containment-event ... Fix mx_Event containment rules and empty read avatar row	2021-06-03 16:38:55 +01:00
Germain Souquet	5ef78f43a4	fix containment rule to keep height when resizing vertically	2021-06-03 16:26:20 +01:00
Michael Telatynski	f2643151c6	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 ... Conflicts: src/components/views/dialogs/InviteDialog.tsx	2021-06-03 16:22:59 +01:00
Germain	7f83590846	Merge pull request #6079 from matrix-org/gsouquet/switch-rooms	2021-06-03 08:44:01 +01:00
Michael Telatynski	4f50727010	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 ... Conflicts: src/components/structures/RoomView.tsx src/components/views/right_panel/UserInfo.tsx	2021-06-03 08:42:05 +01:00
Germain	430cfa9c06	Merge pull request #6127 from matrix-org/gsouquet/css-containment ... Add CSS containment rules for shorter reflow operations	2021-06-03 08:10:29 +01:00
Germain Souquet	bc50028f70	Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash	2021-06-02 13:57:33 +01:00
Germain	9d126c51e4	Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering	2021-06-02 11:41:59 +01:00
J. Ryan Stinnett	2d50325836	Merge pull request #6133 from matrix-org/jryans/event-tile-radius ... Tweak event border radius to match action bar	2021-06-02 11:39:54 +01:00
Michael Telatynski	bc3c759feb	Add temporary mechanism for managing communities without dnd	2021-06-02 11:33:25 +01:00
J. Ryan Stinnett	234c65b331	Tweak event border radius to match action bar ... This adjusts the `border-radius` used when hovering on an event to match the recently changed value for the action bar (changed to `8px` in https://github.com/matrix-org/matrix-react-sdk/pull/6066).	2021-06-02 10:25:29 +01:00
Robin Townsend	8efbdd0406	Match forward dialog send failed indicator color with button ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-06-01 17:56:46 -04:00
Robin Townsend	56714525f2	Merge branch 'develop' into improved-forwarding-ui	2021-06-01 17:28:55 -04:00
Šimon Brandner	70a5715b3d	Support hangup reasons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-01 14:46:41 +02:00
Šimon Brandner	2a22f03a6a	Support InfoTooltip kinds ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-01 14:40:27 +02:00
Germain Souquet	ebd7cd6212	Add CSS containement rules for shorter reflow operations	2021-06-01 11:26:32 +01:00
Šimon Brandner	0785997983	Handle missed calls ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-01 11:28:45 +02:00
Šimon Brandner	86402e9788	Add some styling ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-01 10:03:23 +02:00
Germain Souquet	d894cc6f7a	Merge branch 'develop' into gsouquet/switch-rooms	2021-06-01 09:02:28 +01:00
Šimon Brandner	5e4a10ab84	Reorganize HTML ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-01 07:55:55 +02:00
Šimon Brandner	f94230c292	Fix css ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-30 19:44:17 +02:00
Šimon Brandner	5e8df03724	Fix styling a bit ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-30 19:44:17 +02:00
Šimon Brandner	4ae92d8adc	Hook up TimelineCallEventStore and add Avatar ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-30 19:44:17 +02:00
Šimon Brandner	cd67d50a85	Add basic CallEvent styling ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-30 19:44:17 +02:00
Germain Souquet	18188538f6	Move the read receipt animation to the compositing layer	2021-05-28 14:59:54 +01:00
Michael Telatynski	caaef63077	delint1	2021-05-28 13:11:48 +01:00
Michael Telatynski	36e43270ca	Apply suggestions from code review	2021-05-28 13:08:05 +01:00
Michael Telatynski	e41645795c	Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365	2021-05-28 13:05:41 +01:00
Nique Woodhouse	ea26393709	Styling amends to accommodate the invite dialog footer	2021-05-28 13:00:18 +01:00
Michael Telatynski	2c750fcb7a	Fix overflow issue in suggestion tiles	2021-05-28 12:48:12 +01:00
Germain Souquet	1a51ed9ffd	Make breadcrumb animation run on the compositing layer	2021-05-28 09:34:08 +01:00
Michael Telatynski	f75fb3b349	Add footer and privacy note to the start dm dialog	2021-05-27 15:51:25 +01:00
Germain Souquet	aaca71b316	Reintroduce sticky header width	2021-05-27 12:44:53 +01:00
Michael Telatynski	54d8953024	delint	2021-05-26 14:00:53 +01:00
Michael Telatynski	27ad90760d	Iterate pinned messages	2021-05-26 13:51:17 +01:00
Germain Souquet	c7c6a818f0	Merge branch 'develop' into gsouquet/switch-rooms	2021-05-26 09:51:27 +01:00
Michael Telatynski	59f4c728c9	Initial cut of Pinned event card in the right panel	2021-05-25 16:10:44 +01:00
Germain Souquet	36dddea338	remove CSS out of sync comment	2021-05-25 14:57:07 +01:00
Germain Souquet	7303166924	fix sticky headers when results num get displayed	2021-05-25 13:53:20 +01:00
Michael Telatynski	13427aaf07	Add a pulse animation to the pinned messages indicator and move it	2021-05-25 13:07:39 +01:00
Robin Townsend	400917623c	Make myself the copyright holder for forward dialog code ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-24 08:33:28 -04:00
Nique Woodhouse	153d0ae66d	Merge pull request #6066 from matrix-org/niquewoodhouse-message-action-bar-refine-ui ... Improve styling of the message action bar	2021-05-24 13:30:27 +01:00
Germain Souquet	ecff5bd65c	Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash	2021-05-24 09:20:12 +01:00
Šimon Brandner	c678211a42	Add styling for silencing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-22 20:24:20 +02:00
Michael Telatynski	3f9b6caacd	fix missing rounded corners on blurhash placeholder	2021-05-21 21:46:18 +01:00
Robin Townsend	7a04502151	Iterate on forward dialog design feedback ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-21 12:41:29 -04:00
Robin Townsend	f34d61cf5d	Merge branch 'develop' into improved-forwarding-ui	2021-05-21 08:15:09 -04:00
Travis Ralston	767c7a1e38	Merge pull request #5680 from robintown/better-spinners ... Vectorize spinners	2021-05-20 13:31:35 -06:00
Germain Souquet	f058fd8869	Reduce amount of DOM nodes	2021-05-20 15:39:25 +01:00
Germain Souquet	d362321706	Simplify SenderProfile DOM structure	2021-05-20 15:25:20 +01:00
Šimon Brandner	340bbeec4f	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-05-20 15:50:49 +02:00
Robin Townsend	6cb6c7f3d0	Combine forward dialog room and DM lists ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-19 13:33:48 -04:00
Robin Townsend	83224dc7b6	Ensure forward list room decorations are aligned ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-19 13:32:27 -04:00
Robin Townsend	678b298bab	Merge branch 'develop' into improved-forwarding-ui	2021-05-19 12:39:48 -04:00
Michael Telatynski	abd290938a	Fix room name not wrapping in summary card	2021-05-19 17:12:25 +01:00
Nique Woodhouse	8d072cedff	Update _MessageActionBar.scss ... Correct error on css hover for message action button background colour change	2021-05-19 12:11:24 +01:00
Nique Woodhouse	5daca41bfb	Update _MessageActionBar.scss ... Increase size of buttons	2021-05-19 11:17:34 +01:00
Nique Woodhouse	8a3db3b40a	Update _MessageActionBar.scss ... Refine UI of message action bar to increase usability and focus on bar content.	2021-05-19 10:25:54 +01:00
Šimon Brandner	17fad0e9b2	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-05-19 08:46:33 +02:00
Michael Telatynski	f0a0d7f998	Fix add reactions prompt button jumping timeline if font set lower than default	2021-05-17 10:01:24 +01:00
Robin Townsend	e798b36f1d	Decorate forward dialog room avatars ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-16 08:39:22 -04:00
Robin Townsend	64e828d069	Merge branch 'develop' into improved-forwarding-ui	2021-05-16 08:13:59 -04:00
Robin Townsend	555b2e3266	Reuse Spinner styles for InlineSpinner ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-16 08:00:54 -04:00
Robin Townsend	74cc00b319	Merge branch 'develop' into better-spinners	2021-05-16 07:47:34 -04:00
Michael Telatynski	c7c61bf26a	Merge pull request #6030 from matrix-org/t3chguy/fix/17276 ... Decorate room avatars with publicity in add existing to space flow	2021-05-14 11:23:46 +01:00
Michael Telatynski	4f55ac1fa6	Merge pull request #6025 from matrix-org/t3chguy/fix/16674 ... Improve Spaces "Just Me" wizard	2021-05-14 10:58:55 +01:00
Michael Telatynski	bdeb4b3bae	Merge pull request #6037 from matrix-org/niquewoodhouse-room-sublist-button-feedback ... Increase hover feedback on room sub list buttons	2021-05-14 10:55:32 +01:00
Nique Woodhouse	486350cba2	Update _RoomSublist.scss	2021-05-14 10:41:32 +01:00
Nique Woodhouse	6acf2543f0	Update _RoomSublist.scss ... Fix indentation and remove random spurious blank line	2021-05-14 10:38:37 +01:00
Nique Woodhouse	b71bc88514	Update _RoomSublist.scss ... Alter border radius of RoomSublist buttons to reflect shape of other buttons in room list. Add background color on hover to RoomSublist buttons to provide more visual feedback.	2021-05-14 09:22:40 +01:00
Michael Telatynski	5feb9e85d7	Merge branch 'develop' into t3chguy/fix/16622	2021-05-13 16:12:42 +01:00
Michael Telatynski	6aa477f0f5	Decorate room avatars with publicity in add existing to space flow	2021-05-13 14:23:28 +01:00
Michael Telatynski	76afc1100a	Convert to Typescript and move from ClientPeg to Context	2021-05-13 14:13:00 +01:00
Michael Telatynski	87ae47bd61	tweak reactions row some more, third try lucky	2021-05-13 13:59:10 +01:00
Michael Telatynski	36633ec025	Tweak alignment of reactions row, move add reaction to right and only show on hover	2021-05-13 13:32:38 +01:00
Michael Telatynski	b5fa4d88bf	Add extra add reactions button to encourage more diverse reactions to content	2021-05-13 10:56:51 +01:00
Michael Telatynski	3af0138e9d	Update emoji icons to new style	2021-05-13 10:28:35 +01:00
Michael Telatynski	423c515708	Consolidate AddExistingToSpace between Dialog and Just Me integrated flow	2021-05-13 09:46:45 +01:00
Michael Telatynski	565e41c3df	Extract UntrustedDeviceDialog and fix e2ee icon	2021-05-12 17:04:24 +01:00
Michael Telatynski	607ca17971	Iterate beta feedback dialog	2021-05-12 16:11:38 +01:00
Michael Telatynski	03bd30d125	Fix colours used for the back button in space create menu	2021-05-12 10:48:06 +01:00
Michael Telatynski	ea9be0dd4c	Merge pull request #6012 from matrix-org/t3chguy/fix/17238 ... Add feedback mechanism for beta features, namely Spaces	2021-05-11 17:46:21 +01:00
Michael Telatynski	7396ce76e5	Tweak the feedbacks a tad	2021-05-11 17:30:33 +01:00
Travis Ralston	b1d5dc1194	Merge pull request #5993 from matrix-org/travis/voicemessages/scale ... Scale voice message clock with user's font size	2021-05-11 10:25:36 -06:00
Michael Telatynski	bf4c8f048f	Add feedback mechanism for beta features	2021-05-11 15:58:19 +01:00
Michael Telatynski	df72fbb22a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 ... Conflicts: src/i18n/strings/en_EN.json	2021-05-11 14:07:47 +01:00
Michael Telatynski	2e19c7fd24	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx	2021-05-11 13:40:28 +01:00
Robin Townsend	7efbd2d930	Hide unencrypted badge from ForwardDialog preview ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-10 13:57:47 -04:00
Robin Townsend	503301aa89	Make rooms in ForwardDialog clickable ... …so that you can jump to a room easily once you've forwarded a message there. Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-10 13:00:06 -04:00
Robin Townsend	bfba2b0b6f	Push ForwardDialog scrollbar into the gutter ... …to give more space between it and the buttons. Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-10 11:16:51 -04:00
Šimon Brandner	228b2ccf2d	Increase z-index of call controls ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-10 13:06:25 +02:00
Robin Townsend	b9b237fc9a	Replace forwarding UI with dialog ... Replaces the old forwarding UI with a dialog based on designs from https://github.com/vector-im/element-web/issues/14690. Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-08 21:11:06 -04:00
Šimon Brandner	430808ae2e	Simplifie CSS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-08 16:49:47 +02:00
Travis Ralston	b56d7c9ae8	Scale voice message clock with user's font size ... Fixes https://github.com/vector-im/element-web/issues/17185	2021-05-07 19:27:52 -06:00
Šimon Brandner	1f27354439	Add support for up to 4 feeds ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-07 21:34:56 +02:00
Šimon Brandner	198722eb41	Add classes for screensharing buttons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-07 20:29:45 +02:00
Travis Ralston	04d566e247	Merge pull request #5988 from matrix-org/travis/voicemessages/glitch-1 ... Fix voice message playback being squished up against send button	2021-05-07 08:00:45 -06:00
Michael Telatynski	a8c4aabb52	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: src/components/structures/SpaceRoomView.tsx src/i18n/strings/en_EN.json	2021-05-07 11:50:49 +01:00
Michael Telatynski	9205b74641	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176	2021-05-07 10:25:06 +01:00
Travis Ralston	d270e232fd	Fix voice message playback being squished up against send button ... In the style shuffle of https://github.com/matrix-org/matrix-react-sdk/pull/5970 the playback bar got squished up against the send button. This just fixes the selector to actually hit the composer-based recorder all the time, not just when recording.	2021-05-06 21:41:04 -06:00
Tulir Asokan	cc919452b5	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-05-07 00:07:51 +03:00
Travis Ralston	d531e3d59f	Merge pull request #5971 from matrix-org/travis/files/visual ... Update visual style of plain files in the timeline	2021-05-06 10:57:22 -06:00
Michael Telatynski	d9912651d6	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 ... Conflicts: src/components/structures/SpaceRoomDirectory.tsx	2021-05-06 13:06:50 +01:00
J. Ryan Stinnett	683aec1066	Merge pull request #5833 from SimonBrandner/feed ... Support for multiple streams (not MSC3077)	2021-05-06 11:20:09 +01:00
Michael Telatynski	90538c95aa	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-05-06 08:05:14 +01:00
Travis Ralston	60e3a8ac77	Merge branch 'develop' into travis/files/visual	2021-05-05 13:47:33 -06:00
Travis Ralston	3e1265b9bb	Merge pull request #5970 from matrix-org/travis/voicemessages/colors ... Update colours and sizing for voice messages	2021-05-05 11:09:18 -06:00
Michael Telatynski	70087b30bf	Add disclaimer about subspaces being experimental in add existing dialog	2021-05-05 17:53:31 +01:00
Michael Telatynski	81b97590f6	fix styling of the disabled danger_outline button	2021-05-05 16:51:46 +01:00
Michael Telatynski	7cae566011	Merge pull request #5975 from matrix-org/t3chguy/fix/16891 ... Add retry mechanism and progress bar to add existing to space dialog	2021-05-05 16:32:31 +01:00
J. Ryan Stinnett	4bc5990071	Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal ... Warn on access token reveal	2021-05-05 16:32:12 +01:00
Michael Telatynski	acce9a4548	Fix rounded progress bars	2021-05-05 11:50:55 +01:00
Michael Telatynski	07f5b6e8c4	Add retry mechanism and progress bar to add existing to space dialog	2021-05-05 11:45:12 +01:00
Travis Ralston	ccdc9fbef6	Fix issue where composer styles were being applied to the timeline	2021-05-04 21:15:22 -06:00
Travis Ralston	b0cb996cac	Update visual style of plain files in the timeline	2021-05-04 21:13:37 -06:00
Travis Ralston	a94c1a90c1	Update colours and sizing for voice messages ... Fixes https://github.com/vector-im/element-web/issues/17162	2021-05-04 20:45:15 -06:00
Travis Ralston	54931cb43e	Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline	2021-05-04 09:05:04 -06:00
Travis Ralston	ba2da6826f	Support a dark theme for voice messages ... Fixes https://github.com/vector-im/element-web/issues/17137	2021-05-03 16:08:38 -06:00
Travis Ralston	3f4ee9742a	Simple rendering of voice messages in the timeline ... Fixes https://github.com/vector-im/element-web/issues/17138	2021-05-03 11:41:14 -06:00
Šimon Brandner	fe5fb1885f	Add styling for CallPreview and make it fixed ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-03 15:39:24 +02:00
Šimon Brandner	b8cb72345c	Remove unnecessary margin ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-03 15:39:00 +02:00
Ayush PS	b42872daa4	Fixed the Dial Pad and finalized the changes	2021-05-02 22:10:15 +05:30
Tulir Asokan	09f9916916	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-05-01 15:37:32 +03:00
Jaiwanth	f766f985e4	Change cursor to not-allowed	2021-04-30 08:25:58 +05:30
Michael Telatynski	279654cc9e	Design iterations based on PR feedback	2021-04-29 16:08:59 +01:00
Michael Telatynski	a4f02937cb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: res/css/structures/_SpaceRoomView.scss src/components/structures/SpaceRoomView.tsx	2021-04-29 09:52:21 +01:00
Michael Telatynski	9f8955fb6c	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 ... Conflicts: src/components/views/dialogs/AddExistingToSpaceDialog.tsx	2021-04-28 22:49:36 +01:00
Michael Telatynski	1802adb4d2	Iterate styling and decoration for the beta prompts	2021-04-28 22:47:08 +01:00
Travis Ralston	6764b8d645	Change symbol names	2021-04-28 09:29:31 -06:00
Michael Telatynski	5a921bf38a	Add beta pill to space create menu	2021-04-28 12:10:03 +01:00
Šimon Brandner	551e8ecb8d	Merge branch 'develop' into feed ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-28 10:52:23 +02:00
Michael Telatynski	18a01d9271	Show spaces beta prompt when viewing a space without the beta	2021-04-28 08:41:31 +01:00
Michael Telatynski	505b200a87	fix beta pill styling	2021-04-28 08:05:25 +01:00
Travis Ralston	c4d85c457b	Add progress effect to playback waveform	2021-04-27 22:59:16 -06:00
Travis Ralston	c2d37af1cb	Move playback to its own set of classes ... This all started with a bug where the clock wouldn't update appropriately, and ended with a whole refactoring to support later playback in the timeline. Playback and recording instances are now independent, and this applies to the <Playback* /> components as well. Instead of those playback components taking a recording, they take a playback instance which has all the information the components need. The clock was incredibly difficult to do because of the audio context's time tracking and the source's inability to say where it is at in the buffer/in time. This means we have to track when we started playing the clip so we can capture the audio context's current time, which may be a few seconds by the first time the user hits play. We also track stops so we know when to reset that flag. Waveform calculations have also been moved into the base component, deduplicating the math a bit.	2021-04-27 22:23:57 -06:00
Ayush PS	8660ab000e	Merge branch 'develop' into DialPad	2021-04-28 08:55:44 +05:30
Aaron Raimist	31ff05a862	Merge branch 'develop' into warn-on-access-token-reveal	2021-04-27 19:25:38 -05:00
Aaron Raimist	6754a0b483	Switch to <details> ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-04-27 19:12:22 -05:00
Ayush PS	7509481bb9	Added the LTR support for the dialpad	2021-04-28 02:46:43 +05:30
Travis Ralston	c1bb0bb0b8	Add a delete button	2021-04-27 15:02:15 -06:00
Travis Ralston	30e120284d	Add simple play/pause controls	2021-04-27 15:02:15 -06:00
Travis Ralston	e079f64a16	Adjust pixel dimensions	2021-04-27 15:02:15 -06:00
Travis Ralston	32e3ce3dea	Handle basic state machine of recordings	2021-04-27 15:02:15 -06:00
Michael Telatynski	4f02dc9050	delint	2021-04-27 17:19:34 +01:00
Michael Telatynski	46d35411b4	Add animated mx_BetaDot atop the legacy Communities button	2021-04-27 17:01:22 +01:00
Michael Telatynski	c5f653245a	Show Spaces beta card in Labs & My Communities view ... the image is temporary	2021-04-27 16:29:42 +01:00
J. Ryan Stinnett	33617b0375	Merge pull request #5701 from SimonBrandner/fix-pip-color ... Fix VoIP PIP frame color	2021-04-27 14:42:20 +01:00
Šimon Brandner	9b2eb8ebc0	Set box-shadow opacity to 20% ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-27 15:27:11 +02:00
Šimon Brandner	dacb161a64	Fix the look of video feeds ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-27 12:03:01 +02:00
Šimon Brandner	e79f94d01e	Somewhat fix the local video issues ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-26 20:49:11 +02:00
Robin Townsend	3a62f6cdaa	Merge branch 'develop' into better-spinners	2021-04-26 14:12:44 -04:00
Robin Townsend	d3db5fe77f	Vectorize mini avatar uploader spinner ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-04-26 14:10:09 -04:00
J. Ryan Stinnett	9401a6d6dc	Merge pull request #5916 from SimonBrandner/image-view-zoom ... Dynamic max and min zoom in the new ImageView	2021-04-26 15:46:26 +01:00
Michael Telatynski	8656212eb9	Space creation prompt user to add existing rooms instead of creating new ones	2021-04-26 12:41:04 +01:00
Ayush PS	3201ed2f0f	Added color scheme for the numbers	2021-04-26 01:40:10 +05:30
Šimon Brandner	1a906c95da	Merge branch 'develop' into image-view-zoom	2021-04-24 09:14:30 +02:00
Šimon Brandner	dad7a22055	Initial code for dynamic minZoom ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-24 08:03:39 +02:00
Travis Ralston	82119ad595	Merge branch 'develop' into travis/error-states	2021-04-23 15:53:37 -06:00
Šimon Brandner	fbb8cfb188	Rework how media element are handled ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-23 19:41:55 +02:00
Šimon Brandner	c54aa86532	Merge branch 'develop' into feed	2021-04-23 18:32:05 +02:00
Šimon Brandner	cf21658e30	Use suggested box-shadow ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-23 18:29:10 +02:00
Robin Townsend	3d7842d696	Remove old FormButton CSS ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-04-23 10:25:04 -04:00
Robin Townsend	0f84b3dff3	Align checkboxes with names in add rooms to space dialog ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-04-23 10:25:04 -04:00
Robin Townsend	024cf7f66c	Cut off long names in add rooms to space dialog ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-04-23 10:24:50 -04:00
Šimon Brandner	2d17ba445a	Increase drop shadow alpha to 0.45 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-23 15:33:10 +02:00
Šimon Brandner	ec908bc8be	Merge branch 'develop' into fix-pip-color	2021-04-23 14:40:58 +02:00
Šimon Brandner	d757b7d788	Merge branch 'develop' into fix-pip-color	2021-04-23 14:10:29 +02:00
Michael Telatynski	d9dac7b261	Merge pull request #5898 from matrix-org/t3chguy/fix/16976 ... Iterate the spaces face pile design	2021-04-22 09:29:00 +01:00
Michael Telatynski	ca07b1ed04	Update res/css/views/elements/_FacePile.scss ... Co-authored-by: Germain <germain@souquet.com>	2021-04-22 09:06:53 +01:00
Michael Telatynski	60828913d2	Iterate the spaces face pile design	2021-04-22 08:13:03 +01:00
Travis Ralston	c5dd6b4dfb	Update action bar to incorporate sending states ... This moves most of them out of the context menu.	2021-04-21 16:24:17 -06:00
Šimon Brandner	951fda4c3d	Merge branch 'develop' into show-username	2021-04-21 18:08:50 +02:00
Šimon Brandner	9658a760c8	Use timestamp color ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-21 17:41:21 +02:00
Šimon Brandner	eee1294374	Make both have the same baseline ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-21 17:37:25 +02:00
Germain Souquet	c5a1bb2d2c	fix sticky tags header in room list	2021-04-21 10:44:20 +01:00
Germain	68fb9a78c4	Merge pull request #5874 from matrix-org/gsouquet-room-events	2021-04-21 09:09:01 +01:00
Šimon Brandner	faca498523	Don't use gap ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-20 11:12:16 +02:00
Michael Telatynski	542890f5e8	Merge pull request #5885 from SimonBrandner/dumb-change ... A tiny change to make the Add existing rooms dialog a little nicer	2021-04-20 08:53:33 +01:00
Šimon Brandner	910a3e5f31	A little nicer spacing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-19 20:59:54 +02:00
Šimon Brandner	b52d6e3d97	A tiny change to make the dialog a little nicer ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-19 20:52:40 +02:00
Tulir Asokan	b8ef67e447	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-04-19 13:37:27 +03:00
Šimon Brandner	61a260cd40	Format mxid	2021-04-18 20:02:22 +02:00
Travis Ralston	a821ece128	Merge pull request #5869 from matrix-org/travis/voice/pulse-2 ... Pulse animation for voice messages recording state	2021-04-16 09:41:33 -06:00
Travis Ralston	7878e1cd57	Merge pull request #5870 from matrix-org/travis/voice/disable-composer ... Properly disable composer access when recording a voice message	2021-04-16 07:36:53 -06:00
Šimon Brandner	2cfd4659e1	Add separate mx_CallView_content class ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-16 12:50:23 +02:00
Travis Ralston	3e24d6f8ac	Change animation speed	2021-04-15 10:49:39 -06:00
Travis Ralston	f0d1e7c565	Document the lamp effect	2021-04-15 10:04:15 -06:00
Travis Ralston	6b3ac20d76	Cleanup	2021-04-15 09:53:15 -06:00
Germain Souquet	02debd12f6	Hide RoomSublist when empty rather than unmounting them	2021-04-15 16:11:45 +01:00
Germain	36e729a626	Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation	2021-04-15 08:27:28 +01:00
Travis Ralston	fedb5b9f63	Fix disabled state of the composer	2021-04-14 20:12:10 -06:00
Travis Ralston	595225b98b	A different animation option for pulsing record icons	2021-04-14 15:14:52 -06:00
Travis Ralston	e77d3bea04	Pulse animation option for voice record button	2021-04-14 15:12:21 -06:00
Germain	87b87bfad4	Merge pull request #5855 from matrix-org/gsouquet-irc-layout	2021-04-14 09:21:34 +01:00
Germain Souquet	cd48a8f3ab	merge .mx_ReplyThread declaration in _IRCLayout.css	2021-04-14 08:15:32 +01:00
Travis Ralston	ac00c80efb	Merge pull request #5521 from SimonBrandner/improve-image-view ... Improve image view	2021-04-13 19:01:27 -06:00
Germain Souquet	e520f7462c	Fix emotes left spacing in replies for the IRC layout	2021-04-13 11:21:47 +01:00
Germain Souquet	2aebf103ed	always display message timestamp in IRC layout replies	2021-04-13 11:20:53 +01:00
Travis Ralston	106de5f7ba	Merge branch 'develop' into travis/reset-passphrase	2021-04-12 14:55:31 -06:00
RiotRobot	a008c3d4e6	Merge branch 'master' into develop	2021-04-12 14:56:05 +01:00
RiotRobot	8af81ea90f	Revert "Change to inset" ... Safari doesn't support `inset`. This reverts commit b3706b682e.	2021-04-12 14:37:11 +01:00
J. Ryan Stinnett	19d7ccac07	Rename toggle to view	2021-04-12 13:56:09 +01:00
J. Ryan Stinnett	b3706b682e	Change to inset	2021-04-12 13:56:09 +01:00
J. Ryan Stinnett	32049f849c	Remove blur effect	2021-04-12 13:56:09 +01:00
J. Ryan Stinnett	650421eefb	Tweak appearance of invite reason ... This adjusts the display of invite reasons to match design feedback. Fixes https://github.com/vector-im/element-web/issues/16869	2021-04-12 13:56:09 +01:00
J. Ryan Stinnett	8a1180bd50	Rename toggle to view	2021-04-12 13:19:13 +01:00
J. Ryan Stinnett	0e5e48584f	Change to inset	2021-04-12 13:18:03 +01:00
J. Ryan Stinnett	7f796640f6	Remove blur effect	2021-04-12 13:11:27 +01:00
J. Ryan Stinnett	798a891d83	Tweak appearance of invite reason ... This adjusts the display of invite reasons to match design feedback. Fixes https://github.com/vector-im/element-web/issues/16869	2021-04-12 12:28:42 +01:00
Šimon Brandner	7f496c7bf5	Add comment: same on all themes ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-09 08:04:07 +02:00
Travis Ralston	01c5f84f60	Merge branch 'develop' into travis/reset-passphrase	2021-04-08 18:07:46 -06:00
Germain Souquet	1d75726a75	Honour prefers reduced motion for read receipts	2021-04-08 11:05:45 +01:00
Germain Souquet	8d60d85570	replace velocity-animate with CSS transitions	2021-04-08 10:36:14 +01:00
Šimon Brandner	adb0877591	Merge branch 'develop' into feed	2021-04-07 19:17:35 +02:00
Travis Ralston	6e6a26f86a	Merge pull request #5710 from SimonBrandner/resizable-call-view ... Resizable CallView	2021-04-07 11:02:46 -06:00
Germain Souquet	7627ea13fe	Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash	2021-04-07 09:54:12 +01:00
J. Ryan Stinnett	5d027ffcf4	Merge pull request #5694 from robintown/show-invite-reasons ... Show invite reasons	2021-04-06 10:48:54 +01:00
Šimon Brandner	202ead40c4	Merge branch 'develop' into resizable-call-view	2021-04-04 11:35:26 +02:00
Šimon Brandner	27ec3af03a	Merge branch 'develop' into feed ... Looking forward to merging again! :D Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-03 09:15:55 +02:00
Šimon Brandner	12a36d1a30	This is hopefully not true anymore ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-02 10:44:40 +02:00
Šimon Brandner	535ae086b4	Make sender bold ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-02 08:31:42 +02:00
Šimon Brandner	9606297f7c	Merge branch 'develop' into improve-image-view ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-02 08:15:51 +02:00
Robin Townsend	2477258249	Merge branch 'develop' into show-invite-reasons	2021-03-31 16:13:29 -04:00
Robin Townsend	f0333b5b1c	Show invite reasons ... Displays the reason for invitation in the invitation dialog, requiring a click to reveal the message. Signed-off-by: Robin Townsend <robin@robin.town>	2021-03-31 15:46:09 -04:00
Germain Souquet	a308a54183	Clicking jump to bottom resets room hash	2021-03-31 12:28:24 +01:00
David Baker	299467c515	Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer	2021-03-31 10:14:48 +01:00
Travis Ralston	262475f96e	Add a button to reset personal encryption state during login	2021-03-30 15:37:06 -06:00
Travis Ralston	54412878a1	Merge branch 'develop' into travis/voice-messages/waveform	2021-03-29 22:59:51 -06:00
Tulir Asokan	c31967dc97	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-03-26 21:31:28 +02:00
Michael Telatynski	4341dfb314	Iterate facepiles, fix default avatar alignment and sort explicit avatars first	2021-03-26 11:55:22 +00:00
Michael Telatynski	09601f1071	Add display name tooltip to the facepile avatars	2021-03-26 00:05:05 +00:00
Travis Ralston	1419ac6b69	Hook up a clock and implement proper design	2021-03-25 17:12:26 -06:00
David Baker	82ba546142	WIP attended transfer	2021-03-25 19:56:21 +00:00
Michael Telatynski	5061db259a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12	2021-03-25 16:37:56 +00:00
Michael Telatynski	ea77ab125e	Show a face pile on a space preview	2021-03-25 16:15:34 +00:00
Michael Telatynski	b6a57f73c6	Tweak border colours in spaces	2021-03-25 12:17:39 +00:00
Michael Telatynski	760b11f214	Merge pull request #5789 from matrix-org/t3chguy/spaces4.11 ... Tweak and fix some space features	2021-03-25 09:02:11 +00:00
Travis Ralston	449e028bbd	Actually use a waveform instead of the frequency data	2021-03-24 23:31:02 -06:00
Travis Ralston	8ddd14e252	Early concept for rendering the frequency waveform	2021-03-24 22:17:45 -06:00
Ayush PS	1488457c33	Added the class -button-bg-color for all themes	2021-03-25 01:31:45 +05:30
Michael Telatynski	20ea1436fc	Update iconography for spaces	2021-03-24 19:43:33 +00:00
Travis Ralston	8587ec888b	Merge pull request #5769 from matrix-org/travis/voice-messages/exp ... Labs feature: Early implementation of voice messages	2021-03-24 09:56:34 -06:00
Michael Telatynski	65a7d0621d	Add invite to space button to room intro	2021-03-24 15:30:03 +00:00
Michael Telatynski	a2a1e37fa3	Add prompt to bottom of room list to invite to space	2021-03-24 14:18:06 +00:00
Michael Telatynski	6e0ab86168	Small usability tweaks to the add existing to space dialog	2021-03-24 14:10:26 +00:00
Michael Telatynski	fb46815b6a	Spaces move away from Form Buttons	2021-03-24 13:15:31 +00:00
Ayush PS	3df9557df2	Dial Pad UI fix	2021-03-24 14:00:09 +05:30
Germain Souquet	0db31dfeae	fix: CIDER formatting buttons on Safari	2021-03-22 15:05:22 +00:00
Michael Telatynski	128c7db28e	Merge pull request #5777 from matrix-org/t3chguy/spaces4.9 ... Spaces improve creation journeys	2021-03-22 13:24:10 +00:00
Šimon Brandner	4bb279b632	Merge branch 'develop' into resizable-call-view	2021-03-22 07:57:52 +01:00
Tulir Asokan	99717db762	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-03-19 21:58:30 +02:00
Jaiwanth	b2a72565d3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into add-invite-to-context-menu	2021-03-19 20:28:10 +05:30
Michael Telatynski	1fbbb67e74	Consolidate button styles in Space creation flows	2021-03-19 13:20:30 +00:00
Michael Telatynski	3718d550c5	Fix space creation menu shade width	2021-03-19 13:20:30 +00:00
Šimon Brandner	431a2c033d	Merge branch 'develop' into feed ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-17 16:13:40 +01:00
Travis Ralston	51dca8d13d	Fix positioning of stop square	2021-03-16 23:54:33 -06:00
Travis Ralston	9aa5348c7f	Show a stop button to stop the recording	2021-03-16 23:43:59 -06:00
Travis Ralston	b5d32d92f3	Wire up a simple record button	2021-03-16 22:58:44 -06:00
Šimon Brandner	c96d2621a0	Set max-width and MIN_ZOOM ... This might have some side effects but as far as I can tell they shouldn't be too problematic Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-16 19:57:14 +01:00
Šimon Brandner	787a62846e	Merge branch 'develop' into resizable-call-view ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-16 07:55:56 +01:00
Šimon Brandner	8f6f9cd6fa	Remove some unnecessary CSS and set MIN_ZOOM to 95 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-15 20:37:39 +01:00
Šimon Brandner	9c313854d0	Increase defautl size ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-15 19:23:40 +01:00
Šimon Brandner	b27a8e3c3a	Merge branch 'develop' into improve-image-view ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-14 08:30:28 +01:00
Tulir Asokan	8c8b46b984	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-03-12 14:18:12 +02:00
Travis Ralston	a9a4bd50ca	Merge branch 'develop' into travis/media-customization	2021-03-11 08:37:49 -07:00
Michael Telatynski	081e745417	Merge pull request #5751 from matrix-org/t3chguy/spaces4.7 ... Rebuild space previews with new designs	2021-03-11 14:06:31 +00:00
J. Ryan Stinnett	6a939c4de8	Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login ... Rework cross-signing login flow	2021-03-11 12:53:55 +00:00
Michael Telatynski	6d81634eec	Rebuild space previews with new designs	2021-03-11 11:49:43 +00:00
Travis Ralston	a7debdd946	Fix tinting for download icon ... As shown in https://github.com/vector-im/element-web/issues/16546	2021-03-10 12:32:18 -07:00
Šimon Brandner	bb13dc49a6	Make CallView use CallFeed ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-10 12:18:57 +01:00
Michael Telatynski	98338f1505	Merge pull request #5736 from matrix-org/t3chguy/spaces4.5 ... Spaces suggested rooms support	2021-03-10 10:56:17 +00:00
J. Ryan Stinnett	dffe0e93e3	Merge pull request #5717 from 2580ayush2580/ayush258013 ... Fix clicking on the avatar for opening member info requires pixel-perfect accuracy	2021-03-09 11:39:04 +00:00
Michael Telatynski	81e1f36c4b	Tidy up TemporaryTile now that it isn't temporary	2021-03-09 11:19:41 +00:00
Matthew Hodgson	72f28240aa	fix AccessibleButton layout some more	2021-03-08 23:28:54 +00:00
Matthew Hodgson	c543f0a2d0	fix AccessibleButton label positioning now they can wrap	2021-03-08 22:29:08 +00:00
Matthew Hodgson	b3cd6fcc9b	vertically align labels in AccessibleButtons if their height is pushed out by wrapped text elsewhere	2021-03-08 17:59:02 +00:00
Travis Ralston	52621946de	Merge pull request #5723 from matrix-org/travis/uploads ... Refresh UI for file uploads	2021-03-08 08:52:51 -07:00
Travis Ralston	761ced13f2	Merge pull request #5719 from matrix-org/travis/file-representation ... UI refresh for uploaded files	2021-03-08 08:52:43 -07:00
Travis Ralston	d35afe6fbb	Merge pull request #5699 from matrix-org/travis/message-states ... Improve message sending states to match new designs	2021-03-08 08:52:26 -07:00
Matthew Hodgson	c02d03cc5b	Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop	2021-03-08 04:57:10 +00:00
Matthew Hodgson	1427aa4203	fix mx_EncryptionInfo_spinner padding in dialogs	2021-03-08 04:41:51 +00:00
Travis Ralston	757597e55f	Fixed review concerns	2021-03-05 16:29:14 -07:00
Travis Ralston	711181cc69	Rough style for new upload bar ... This repurposes ProgressBar which was not used anywhere in code.	2021-03-05 14:14:43 -07:00
David Baker	e5b03488d8	Fix widget resizing ... There was a line of CSS that set pointer-events: none on widget iframes whilst they were being resized to stop iframes swallowing the mousemove/up events while dragging the resize handle, but a) all widgets are now in a persisted element wrapper and therefore not in the right place in the DOM to get that CSS and b) that only got set when resizing the whole aps drawer vertically, not dragging the handle between apps to change the width distribution. Add a pointer events prop to AppTile to allow the pointer-events style to be set by the parent, and set it when dragging either resize handle. Fixes https://github.com/vector-im/element-web/issues/16473	2021-03-05 17:52:51 +00:00
Travis Ralston	017c2af663	Merge branch 'develop' into travis/message-states	2021-03-05 09:29:39 -07:00
Travis Ralston	65ac063a09	Merge pull request #5715 from 2580ayush2580/ayush258012 ... Fix Bottom border of state counters is white on the dark theme	2021-03-04 20:28:52 -07:00
Travis Ralston	d7310bc5b3	Remove dead classes	2021-03-04 20:17:29 -07:00
Travis Ralston	5d6e3d5711	UI refresh for uploaded files ... Fixes https://github.com/vector-im/element-web/issues/16557 Fixes https://github.com/vector-im/element-web/issues/9482 (technically) There's two changes in this: 1. The actual file body in the timeline now has a placeholder thing. 2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.	2021-03-04 20:07:48 -07:00
Ayush Kumar	dd792c3d73	Fix Clicking on the avatar for opening member info requires pixel-perfect accuracy	2021-03-04 19:24:35 +05:30
Jason Robinson	f2d2a048e1	Ensure HostSignupDialog border colour matches light theme ... Ensure dialog borders are always white as the HostSignupDialog does not yet support dark mode or theming in general. In the future we might want to pass the theme to the called iframe, should some hosting provider have that need.	2021-03-04 11:07:14 +02:00
Ayush Kumar	1cb19554eb	Fix Bottom border of state counters is white on the dark theme	2021-03-04 14:03:02 +05:30
Šimon Brandner	0e5297fcb0	Fix local feed size ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-03 16:44:43 +01:00
Michael Telatynski	77cf4cf7a4	Merge pull request #5706 from matrix-org/t3chguy/spaces4.4 ... Space room hierarchies	2021-03-03 15:25:00 +00:00
Michael Telatynski	a8ff0fa75f	Merge pull request #5705 from matrix-org/t3chguy/spaces4.3 ... Iterate Space view and right panel	2021-03-03 13:37:40 +00:00
Michael Telatynski	85985db441	add comment	2021-03-03 11:50:41 +00:00
Šimon Brandner	2e535d2a99	Fix CSS to make it work with resizing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-02 20:33:34 +01:00
Šimon Brandner	f86e6fe643	Add resize CallViewForRoom CSS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-02 20:32:13 +01:00
Travis Ralston	c74224a1b7	Merge branch 'develop' into travis/message-states	2021-03-02 10:40:49 -07:00
Michael Telatynski	49fc053b94	Merge pull request #5704 from matrix-org/t3chguy/spaces4.2 ... Initial Space Room View and Creation UX	2021-03-02 17:17:39 +00:00
J. Ryan Stinnett	a5ee029c62	Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check ... Add multi language spell check	2021-03-02 14:38:21 +00:00
Michael Telatynski	ca1bd78921	Add space specific variant of the dropdown on "Rooms +" sublist	2021-03-02 14:20:29 +00:00
Michael Telatynski	e479edd47a	Add an add existing room to space CTA to Space View	2021-03-02 13:34:53 +00:00
Michael Telatynski	ab4b7b73ea	Add a basic Space Settings view	2021-03-02 13:26:00 +00:00
Michael Telatynski	8efe7dcaa1	Decorate Right Panel cards with Space header for when viewing it in that context	2021-03-02 09:54:32 +00:00
Michael Telatynski	7b7c89e854	Merge pull request #5702 from matrix-org/t3chguy/spaces4.1 ... Iterate Space Panel	2021-03-01 23:56:54 +00:00
Travis Ralston	9cec382865	Change sending->sent state to match new designs ... For https://github.com/vector-im/element-web/issues/16424	2021-03-01 16:25:19 -07:00
Michael Telatynski	c10512fd56	Initial SpaceRoomView work	2021-03-01 18:53:11 +00:00
Michael Telatynski	483d56320c	Beginning of space creation UX from space panel	2021-03-01 17:47:40 +00:00
Michael Telatynski	d679708058	Fix styling of disabled options in an Iconized menu	2021-03-01 15:40:46 +00:00
Šimon Brandner	9ffef8f072	Fix VoIP PIP frame color ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-01 13:44:22 +01:00
Šimon Brandner	188b728f53	Fix read receipts for compact layout ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-28 13:32:17 +01:00
Travis Ralston	678ec52035	Merge branch 'develop' into fix-4963	2021-02-26 14:41:28 -07:00
Travis Ralston	4e27b00cf3	Move call buttons to the room header ... This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.	2021-02-26 13:46:39 -07:00
Šimon Brandner	1955fff08c	CSS cleanup ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-25 11:50:50 +01:00
Šimon Brandner	dc283241aa	Remove wrapper ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-25 11:28:42 +01:00
Šimon Brandner	273753a42a	Fix hex formatting ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-25 08:25:34 +01:00
Šimon Brandner	5a9e1a1482	Fix close icon ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-25 08:10:54 +01:00
Šimon Brandner	d58c17ff3b	Show grabbing cursor ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-25 07:50:53 +01:00
Šimon Brandner	25873c8759	Remove rounded border	2021-02-24 20:41:20 +01:00
Šimon Brandner	983895289c	Update info ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 20:04:25 +01:00
Šimon Brandner	81698a2714	Fix pointer-events ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 19:31:19 +01:00
Travis Ralston	dee7c7b556	Merge pull request #5567 from SimonBrandner/fix-read-receipts ... Fix read receipts?	2021-02-24 11:21:42 -07:00
Šimon Brandner	83e1a7a707	Add more button ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 18:13:12 +01:00
Šimon Brandner	a6bb203a4b	Redo icons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 14:43:33 +01:00
Šimon Brandner	fafb8d43a3	Fix padding according to the design ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 14:16:58 +01:00
Šimon Brandner	6aac8f1735	Change padding a bit ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 11:20:28 +01:00
Šimon Brandner	899ce1f605	Partially fix overflow issues ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 11:15:59 +01:00
David Baker	bcc567cd86	Merge pull request #5676 from SimonBrandner/fix-portrait ... Fix portrait videocalls	2021-02-24 09:26:57 +00:00
Šimon Brandner	ab79deb88f	Update the looks a bit more ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 08:11:53 +01:00
Šimon Brandner	768d268189	Fix css ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-24 07:54:36 +01:00
Robin Townsend	40b684d7de	Vectorize spinners ... This replaces most of the GIF spinners used throughout the app with an SVG that respects the user's theme. However, spinner.gif is still retained for the room timeline avatar uploader component, since it is more difficult to replace. Signed-off-by: Robin Townsend <robin@robin.town>	2021-02-23 20:22:09 -05:00
Šimon Brandner	87d5d73025	Merge branch 'develop' into improve-image-view	2021-02-23 20:42:16 +01:00
Šimon Brandner	3f0e8e4afc	Delint ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-23 19:16:52 +01:00
Šimon Brandner	64945d4ccf	Add a comment and use rems ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-23 19:14:36 +01:00
Šimon Brandner	2f2c5c9081	Merge branch 'develop' into fix-read-receipts	2021-02-23 18:43:58 +01:00
J. Ryan Stinnett	667c94b387	Merge pull request #5643 from SimonBrandner/move-icons ... Tweak code block icon positions	2021-02-23 14:53:28 +00:00
J. Ryan Stinnett	3db6a45010	Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes" ... This reverts commit 5c1b38a48c, reversing changes made to ec4a39a694.	2021-02-23 12:03:08 +00:00
Šimon Brandner	effb9666f2	Fix portrait videocalls ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-22 20:10:30 +01:00
Tulir Asokan	dfcf701449	Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering	2021-02-19 21:47:10 +02:00
Travis Ralston	10b0051c02	Appease the linter	2021-02-18 15:30:03 -07:00
Travis Ralston	52c73a7a58	Add developer tool to explore and edit settings	2021-02-18 14:56:19 -07:00
Šimon Brandner	5de99c7708	Fix licenses ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-18 19:40:24 +01:00
Šimon Brandner	bd0e5446c5	Merge branch 'develop' into feature-multi-language-spell-check	2021-02-18 18:16:16 +01:00
J. Ryan Stinnett	5c1b38a48c	Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes ... Improve URL preview formatting and image upload thumbnail size	2021-02-17 11:37:37 +00:00
Jaiwanth	04d2bf1d6a	Check whether user has permission to invite ... Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>	2021-02-15 20:55:15 +05:30
Jaiwanth	f420c85985	Added invite option to room's context menu ... Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>	2021-02-15 19:21:26 +05:30
Šimon Brandner	7dc6029f19	Move icons ... This tweaks the icon positions to look a bit better. Espacially with a scrollbar on the side Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-13 15:29:38 +01:00
Šimon Brandner	8afb74d0e1	Fix border radius when the panel is collapsed ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-13 08:53:25 +01:00
Šimon Brandner	3983c15302	Delint ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-12 17:11:24 +01:00
Šimon Brandner	130e4f7bfd	Added some styling ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-12 17:06:02 +01:00
Šimon Brandner	2b4859a858	Merge branch 'develop' into fix-4963	2021-02-12 16:30:01 +01:00
J. Ryan Stinnett	a87e637666	Merge pull request #5630 from SimonBrandner/tweak-codeblock-colors ... Fix codeblock scrollbar colors	2021-02-11 12:41:12 +00:00
Jason Robinson	538272a827	Tweak the dialog dimensions ... Make height/width max (as per design wish) and actual based on viewport.	2021-02-10 15:13:01 +02:00
Jason Robinson	c92a930d0a	Fix positioning of minimize action and add titles	2021-02-09 12:40:12 +02:00
Jason Robinson	3ed6f1fe5d	Fix maximise and minimise icon references	2021-02-09 12:22:58 +02:00
Jason Robinson	5fe3c83f27	Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip	2021-02-09 11:18:51 +02:00
Šimon Brandner	e2bf0c84d7	Move icons to the left ... We do this because they would otherwise collide with the scrollbar Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-09 08:16:36 +01:00
William Kray	fec2309451	move cancel button to the right	2021-02-08 09:26:10 -08:00
William Kray	e6da146b21	pad url preview close button a bit	2021-02-08 09:26:10 -08:00
William Kray	9260b031e9	oops missed a semicolon	2021-02-08 09:26:10 -08:00
William Kray	03c30b0338	change link previews to vertical flow	2021-02-08 09:26:10 -08:00
William Kray	e72a7567f7	drop video preview max-height to 300px	2021-02-08 09:25:08 -08:00
J. Ryan Stinnett	6d9da1bad2	Merge pull request #5625 from SimonBrandner/fix-notif-jumpy-ui ... Fix jumpy notifications settings UI	2021-02-08 15:10:27 +00:00
Šimon Brandner	3b6790fbf1	Merge branch 'develop' into fix-notif-jumpy-ui	2021-02-08 15:42:06 +01:00
Šimon Brandner	c4a3906871	Fix positioning of spinner in a smarter way ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-08 15:38:43 +01:00
Šimon Brandner	84eba59afa	Merge branch 'develop' into improve-codeblock	2021-02-08 15:26:50 +01:00
Šimon Brandner	257b8819b3	Change icon size ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-08 15:22:30 +01:00
Šimon Brandner	cdb0d1c12e	Move and use icons from widget dir ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-08 15:22:10 +01:00
David Baker	cf5ec7720c	Merge pull request #5525 from SimonBrandner/fix-screen-sharing ... Fix desktop Matrix screen sharing and add a screen/window picker	2021-02-08 13:54:51 +00:00
Šimon Brandner	4a282759c3	Fixed jumpy UI ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-06 16:38:07 +01:00
Jason Robinson	03fe0f1f17	s not z	2021-02-04 23:17:48 +02:00
Jason Robinson	f5f8050172	Add minimize button to HostSignupDialog.tsx	2021-02-04 23:09:58 +02:00
Jason Robinson	b50ac0c096	Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip	2021-02-04 18:32:16 +02:00
J. Ryan Stinnett	a4318299ff	Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump ... Fix jumping timestamp if hovering a message with e2e indicator bar	2021-02-04 16:02:18 +00:00
Jason Robinson	6ccce7142c	Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip	2021-02-03 22:35:22 +02:00
Šimon Brandner	b73227eaca	Merge branch 'develop' into fix-icon-position	2021-02-03 18:46:45 +01:00
Šimon Brandner	b8ee23cdf4	Make consistent for all events ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-03 18:41:09 +01:00
Šimon Brandner	9a131efc1a	Fix avatar alignment ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-03 08:16:07 +01:00
Šimon Brandner	eee9cf153b	Fix trash alignment ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-03 08:15:59 +01:00
Ayush Kumar	af0b009600	Fix term_policy aligned to the center	2021-02-03 00:05:55 +05:30
J. Ryan Stinnett	388e23b40b	Fix flair height after accent changes ... The accent changes in https://github.com/matrix-org/matrix-react-sdk/pull/5569 led to a regression in flair display where the bottom edge was clipped. Fixes https://github.com/vector-im/element-web/issues/16350 Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5569	2021-02-02 17:57:22 +00:00
Michael Telatynski	0e94d08d9a	Update SSO Twitter social branding to match guidelines	2021-02-02 17:29:19 +00:00
Michael Telatynski	1ba0999915	Update SSO Facebook social branding to match guidelines	2021-02-02 17:19:18 +00:00
J. Ryan Stinnett	132057d4a7	Merge pull request #5549 from 2580ayush2580/ayush2580 ... Increase language search bar width	2021-02-01 13:50:42 +00:00
Michael Weimann	9b54aba4c0	fix timestamp width if there is a 2e2 indicator bar ... Signed-off-by: Michael Weimann <mail@michael-weimann.eu>	2021-01-31 11:11:34 +01:00
Michael Telatynski	62712159f6	Merge pull request #5578 from matrix-org/t3chguy/sso_fixes ... Improve SSO auth flow	2021-01-29 13:28:53 +00:00
Michael Telatynski	0167c3cefb	Iterate SSO auth ux styling	2021-01-29 13:04:05 +00:00
Michael Telatynski	2c2cf4c073	Update google branding	2021-01-29 11:42:34 +00:00
Ayush Kumar	6b56d0b987	change value #2e2f32 to -primary-color	2021-01-29 15:54:40 +05:30
Ayush Kumar	512ac5ef3b	fixed invisible text after logging out in the dark theme	2021-01-29 03:58:05 +05:30
Ayush Kumar	d006c521c2	solved style-lint errors	2021-01-28 23:49:13 +05:30
Ayush Kumar	6031e34fbe	fix language dropdown to center	2021-01-28 23:07:59 +05:30
J. Ryan Stinnett	5758cd8bcc	Merge pull request #5518 from blattersturm/pr/irc-layout-width ... Don't use name width in reply thread for IRC layout	2021-01-28 12:44:36 +00:00
Michael Telatynski	34ae766893	Wire up MSC2858 brand attribute ... For better brand adherance. Also removes old support for https IdP icons.	2021-01-27 16:15:47 +00:00
Šimon Brandner	4e438be433	Fixed Czech capital letters ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-24 17:40:19 +01:00
Šimon Brandner	90ad3360b6	Fixed read receipts? ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-24 09:15:11 +01:00
Šimon Brandner	e2abbf9a7c	Merge branch 'develop' into improve-image-view ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-23 08:12:32 +01:00
Michael Telatynski	bb50cd56ee	Merge pull request #5558 from matrix-org/t3hcguy/socialloginfixup ... Improve styling of SSO Buttons for multiple IdPs	2021-01-22 10:37:46 +00:00
J. Ryan Stinnett	35bee5c5ea	Merge pull request #5522 from SimonBrandner/room-dialog-fixes ... Fixes for the general tab in the room dialog	2021-01-22 10:34:37 +00:00
blattersturm	da7f6c7eca	Don't use name width in reply thread for IRC layout ... Signed-off-by: Robert Dash <peachypies@protonmail.ch>	2021-01-21 19:39:19 +01:00
Šimon Brandner	5ca9e8d323	Remove spaces ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-21 18:18:07 +01:00
Šimon Brandner	f1a3240ec3	Merge branch 'develop' into improve-codeblock	2021-01-21 17:36:22 +01:00
Michael Telatynski	928ddeb718	Improve styling of SSO Buttons for multiple IdPs	2021-01-21 13:33:25 +00:00
Šimon Brandner	bd2423a52c	Added line numbering ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-21 10:53:18 +01:00
Travis Ralston	c7c055dd98	Give a bigger target area to AppsDrawer vertical resizer ... The existing target was too hard to hit, which annoyed users. This change makes it the same sort of surface area as the horizontal resizers, as requested by design to fix the problem in the short term.	2021-01-20 15:05:18 -07:00
Šimon Brandner	14bf169631	Handle small codeblocks ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-20 15:01:23 +01:00
Šimon Brandner	19be3293e0	Remove commented code ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-20 13:06:08 +01:00
Šimon Brandner	58b2c18cf5	This somehow works ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-19 21:02:39 +01:00
Šimon Brandner	e6ab47ff76	Fix bug ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-19 17:30:02 +01:00
Šimon Brandner	61281a855c	Redo expanding ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-19 16:35:32 +01:00
Šimon Brandner	8a4af2f348	Merge branch 'develop' into expand-codeblock	2021-01-18 17:54:06 +01:00
Šimon Brandner	49dce58027	Added expanding based on the option ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-18 17:49:09 +01:00
Will Hunt	d71b2cf04f	Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2	2021-01-18 11:36:46 +00:00
Ayush Kumar	2c8aaa27dd	Increase width of language dropdown	2021-01-17 18:50:33 +05:30
Jason Robinson	3901cd9c72	WIP	2021-01-15 17:02:28 +02:00
Jason Robinson	158036ccf9	Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip	2021-01-15 16:12:53 +02:00
Jason Robinson	90a1c5a267	WIP	2021-01-15 15:57:14 +02:00
Jason Robinson	e80dba9414	WIP	2021-01-15 15:32:30 +02:00
Jason Robinson	d4a58bdb2a	WIP minimize	2021-01-14 11:53:20 +02:00
Šimon Brandner	b2850e11db	Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing	2021-01-13 19:47:07 +01:00
David Baker	d4470d2ed2	Actually this is right colour	2021-01-13 16:55:38 +00:00
David Baker	150e8c9d56	Fix incoming call box on dark theme	2021-01-13 15:31:26 +00:00
David Baker	e2111d9161	Merge pull request #5532 from matrix-org/dbkr/dtmf ... Add in-call dialpad for DTMF sending	2021-01-13 13:07:27 +00:00
Jason Robinson	3da5049dc7	WIP minimize	2021-01-12 17:08:42 +02:00
Jason Robinson	e6605441aa	WIP minimize	2021-01-12 14:08:09 +02:00
Michael Telatynski	1c3adbc545	Merge pull request #5526 from matrix-org/t3chguy/fix/15832 ... Fix avatar upload prompt/tooltip floating wrong and permissions	2021-01-11 16:48:17 +00:00
Jason Robinson	e8c716f33e	First stage of host signup flow now sits here ... Need to make things configurable, image and text for the first step should be configurable. Also missing privacy related words, though they should be configurable too.	2021-01-11 15:47:21 +02:00
Jason Robinson	2b98f14242	Merge branch 'develop' into jaywink/hosting-provider-iframe	2021-01-11 11:16:03 +02:00
Šimon Brandner	263f213650	Remove an empty line ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-09 09:27:02 +01:00
Šimon Brandner	4538274e74	Added send message icon ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-09 09:25:29 +01:00
Šimon Brandner	d589c61000	Added send message button ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-09 09:09:14 +01:00
Will Hunt	000a69765c	Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2	2021-01-08 18:03:36 +00:00
Šimon Brandner	b1010189be	Tabbed copyright link ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-05 20:41:33 +01:00
Šimon Brandner	640e6d68b3	Merge branch 'develop' into fix-screen-sharing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-05 20:41:06 +01:00
Šimon Brandner	bb7e76f69e	Hopefully fixed copyrights ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-05 20:36:54 +01:00
Šimon Brandner	8652c2e653	Fixed class names ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-01-05 19:49:09 +01:00
Jason Robinson	5f84371038	Update some copyrights	2021-01-05 14:29:48 +02:00
David Baker	4b43929aa3	Add in-call dialpad for DTMF sending ... Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573	2021-01-04 20:01:43 +00:00
Jason Robinson	bb53ae8038	Rename Element Pro -> Host Signup	2021-01-04 16:05:49 +02:00
Jason Robinson	6843737a33	Merge branch 'develop' into jaywink/hosting-provider-iframe	2020-12-28 11:22:05 +02:00
Jason Robinson	7a358b1ca3	Rename components to be less EMS specific	2020-12-28 11:21:42 +02:00
Šimon Brandner	95d93d143e	Clean up the SCSS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-28 08:38:29 +01:00
Michael Telatynski	8ee65258be	Unfloat the MiniAvatarUploader "tooltip"	2020-12-27 21:13:01 +00:00
Šimon Brandner	eff26600e8	Linting ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-26 18:33:23 +01:00
Šimon Brandner	675ca58eef	Improve UI ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-26 16:56:25 +01:00
Šimon Brandner	eae3c1c496	Get screen-sharing working, somehow ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-26 08:32:51 +01:00
David Baker	452fbb076b	Add a dialpad UI for PSTN lookup ... Queries the homeserver for PSTN protocol support, and if found, the add-room button on the DM rooms list section opens a context menu instead with a 'dial pad' option as well as the current 'start chat' dialog. Entering a number into this and pressing dial performs a thirdparty user query for the given string and starts a DM with that user.	2020-12-23 19:02:01 +00:00
Šimon Brandner	ffe2727cf7	Fixed topic field resizing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-22 09:40:39 +01:00
Šimon Brandner	743b91d7a1	Merge branch 'develop' into improve-image-view	2020-12-21 20:32:28 +01:00
David Baker	0d4b2f48dc	Probably better to just remove this	2020-12-21 11:25:04 +00:00
Šimon Brandner	6315c8ecef	Fix formatting ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2020-12-20 20:45:33 +01:00