31446 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Clemens Zeidler	06181221a1	Add copyright headers	2021-03-07 19:05:36 +13:00
Clemens Zeidler	71d63f016a	Fix tests that mock incomplete key events	2021-03-06 14:17:53 +13:00
Clemens Zeidler	efc5d413c4	Fix missing import (from earlier merge conflict)	2021-03-05 22:13:47 +13:00
Clemens Zeidler	dadeb68bbf	Fix spelling	2021-03-05 22:02:18 +13:00
Clemens Zeidler	4a6f931782	Merge branch 'develop' into key-bindings	2021-03-04 21:10:35 +13:00
David Baker	2f52412834	Merge pull request #5712 from matrix-org/dbkr/dont_place_multiple_calls ... Don't place another call if there's already one ongoing	2021-03-03 20:36:16 +00:00
David Baker	d8483ddf0d	Don't place another call if there's already one ongoing ... The 'call' button doesn't turn into a hangup button as soon as there's a call in the room, but we should have been doing this anyway.	2021-03-03 20:23:21 +00: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	73411fa53d	tidy code style	2021-03-03 13:42:44 +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
Clemens Zeidler	7b74085708	Add missing binding + remove invalid note ... HOME and END are going back to the start/end of the same line, i.e. they are different to the other bindings.	2021-03-03 22:08:22 +13:00
Clemens Zeidler	0214397e27	Fix handling of the platform onKeyDown ... Only call it if the event hasn't been handled yet.	2021-03-03 22:06:36 +13:00
Travis Ralston	c7d4dfa4f5	Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting ... Add a scroll to bottom on message sent setting	2021-03-02 17:41:15 -07:00
Travis Ralston	054330c07b	Merge pull request #5708 from matrix-org/travis/ignore-tmp ... Add .tmp files to gitignore	2021-03-02 10:51:20 -07:00
Travis Ralston	867ce322e1	Add .tmp files to gitignore ... My git client is convinced that `src/component-index.js.tmp` needs to be checked in, which is nice of it but also wrong.	2021-03-02 10:47: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	43cc7deeda	Show hierarchy of auto_join rooms in the space view	2021-03-02 14:37:28 +00:00
Michael Telatynski	716268b2f9	Add context menu to spaces in the space panel	2021-03-02 14:35:29 +00:00
Travis Ralston	303ea16492	Merge pull request #5697 from matrix-org/travis/fix-tetris ... Fix tetris effect (holes) in read receipts	2021-03-02 07:35:04 -07:00
Michael Telatynski	ca1bd78921	Add space specific variant of the dropdown on "Rooms +" sublist	2021-03-02 14:20:29 +00:00
Michael Telatynski	faf7a4b8bc	Initial Space room directory view	2021-03-02 14:14:50 +00:00
Michael Telatynski	4e93452275	Tweak resizer collapse distributor behaviour to work with the expanding space panel	2021-03-02 14:02:03 +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	a687b9883c	Add a create room in space CTA to Space View	2021-03-02 13:29:34 +00:00
Michael Telatynski	ab4b7b73ea	Add a basic Space Settings view	2021-03-02 13:26:00 +00:00
Michael Telatynski	926e226a78	Add Invite CTA to Space View	2021-03-02 10:12:49 +00:00
Michael Telatynski	dfd0aaffe3	Iterate copy for some global warning prompts for spaces	2021-03-02 09:56:43 +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
Šimon Brandner	6fcb4c7cd2	Fix quote ... Co-authored-by: Travis Ralston <travpc@gmail.com>	2021-03-02 07:37:00 +01:00
Travis Ralston	178ae2f7bf	Merge pull request #5703 from jaiwanth-v/fix-edit-markdown-image ... Fixed edit for markdown images	2021-03-01 16:57:08 -07: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	12161f9da2	Merge pull request #5700 from SimonBrandner/fix-read-receipts-in-compact ... Fix read receipts for compact layout	2021-03-01 16:37:59 -07:00
Michael Telatynski	1a7a0e619d	extend createRoom for creating rooms in a space	2021-03-01 19:05:50 +00:00
Michael Telatynski	c10512fd56	Initial SpaceRoomView work	2021-03-01 18:53:11 +00:00
Michael Telatynski	c8fe3f7676	Pass room creation opts for new rooms into RoomView	2021-03-01 17:54:53 +00:00
Michael Telatynski	483d56320c	Beginning of space creation UX from space panel	2021-03-01 17:47:40 +00:00
Jaiwanth	d731e82fba	Fixed edit for markdown images ... Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>	2021-03-01 22:44:48 +05:30
Michael Telatynski	89386b9b2e	fix missing closing brace	2021-03-01 17:06:56 +00:00
Michael Telatynski	ea61b18c18	Iterate Space Panel alignments	2021-03-01 17:02:02 +00:00
Michael Telatynski	70f1303544	Fix invite svg viewbox	2021-03-01 16:48:35 +00:00
Michael Telatynski	ce64863326	Annotate User Menu handle with currently selected space	2021-03-01 15:53:16 +00:00
Michael Telatynski	d679708058	Fix styling of disabled options in an Iconized menu	2021-03-01 15:40:46 +00:00
RiotRobot	588e94e813	Reset matrix-js-sdk back to develop branch	2021-03-01 13:10:43 +00:00
RiotRobot	5a5816d723	Resetting package fields for development	2021-03-01 13:10:32 +00:00
RiotRobot	7b7a972714	Merge branch 'master' into develop	2021-03-01 13:10:32 +00:00
RiotRobot	9ab92e7971	v3.15.0	2021-03-01 13:09:12 +00:00
RiotRobot	24d249555c	Prepare changelog for v3.15.0	2021-03-01 13:09:11 +00:00
RiotRobot	ebb782062f	Upgrade matrix-js-sdk to 9.8.0	2021-03-01 12:51:56 +00:00