3086 commits

Author	SHA1	Message	Date
David Baker	93cf281ff9	Merge pull request #2432 from matrix-org/travis/rver/7998 ... Navigate to the upgraded room's create event where possible	2019-01-11 10:35:30 +00:00
Travis Ralston	33eef6f5ac	Merge pull request #2428 from matrix-org/travis/rver/7991 ... Set which servers to try and join upgraded rooms through	2019-01-10 16:28:11 -07:00
Travis Ralston	7d4b6add2c	Recalculate the visible rooms when rooms are upgraded ... We also do this when they are created just in case we missed the tombstone event. Fixes https://github.com/vector-im/riot-web/issues/7992	2019-01-10 15:43:22 -07:00
Travis Ralston	b09219fe33	Navigate to the upgraded room's create event where possible ... Fixes https://github.com/vector-im/riot-web/issues/7998	2019-01-10 15:29:12 -07:00
Travis Ralston	e24d3cd671	Render a tile for tombstone events ... Fixes https://github.com/vector-im/riot-web/issues/7997 This isn't super elegant, but it also provides some amount of utility for people. As users might leave the old room, it might be useful to see when exactly a room was upgraded. We should fix the underlying cause for infinite back pagination though.	2019-01-10 15:15:45 -07:00
Travis Ralston	cec9c908fc	Set which servers to try and join upgraded rooms through ... Fixes https://github.com/vector-im/riot-web/issues/7991	2019-01-10 14:33:46 -07:00
David Baker	fc346b2766	Merge pull request #2423 from matrix-org/dbkr/lint_messagecomposerinput ... Fix lint errors in MessageComposerInput	2019-01-10 18:33:52 +00:00
Bruno Windels	92b9a8cc1f	persist cleared size sublists	2019-01-10 18:40:26 +01:00
Erik Johnston	cbf9ff6aee	Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters	2019-01-10 16:56:47 +00:00
Erik Johnston	fa6b33d629	Only update component state when feature is enabled	2019-01-10 16:54:08 +00:00
David Baker	9903c61a21	Fix lint errors in MessageComposerInput ... and remove from ignored files Missed a load of the async arrows functions when changing them because they were in the ignored files, so trying to chip away at this. A lot of these were unused imports / variables. Probably the only interesting one was a 'this' in a non-member function which I've moved to be a member function.	2019-01-10 09:41:26 +00:00
David Baker	3555b02f34	Merge remote-tracking branch 'origin/experimental' into dbkr/fix_recovery_reminder_cancel	2019-01-10 09:39:57 +00:00
David Baker	b9719abbc2	Oops, missed some asyncs	2019-01-09 19:36:34 +00:00
David Baker	f269b5fbbc	Fix spaceless async in ignored files too	2019-01-09 19:14:30 +00:00
David Baker	7381879e3a	Fix a few things with cancelling recovery reminder ... * Put a cancel button on the first page of the create key backup dialog * Move settings logic into the room reminder: I know this is moving logic *into* a view but RoomView is quite heavyweight as it is. * Give the recovery reminder an explicit 'onDontAskAgainSet' rather than onFinished which was getting called with false when the last screen of the dialog was closed with the cancel 'x' rather than the 'close' button. https://github.com/vector-im/riot-web/issues/8066	2019-01-09 16:27:41 +00:00
Bruno Windels	254427461d	fix PR feedback	2019-01-09 12:48:13 +01:00
Erik Johnston	07c2010cce	Use state rather than forceUpdate	2019-01-08 11:14:31 +00:00
Bruno Windels	56726ba8e5	fix lint	2019-01-08 12:10:42 +01:00
Bruno Windels	7227049c2a	add right panel toggle button to room header when in grid	2019-01-08 12:05:39 +01:00
Erik Johnston	4c204e88be	Add feature flag for counters	2019-01-07 13:52:13 +00:00
Erik Johnston	712241d710	Add simple state counters to room heading	2019-01-07 13:52:13 +00:00
Bruno Windels	290dc9d8fb	Merge branch 'experimental' into bwindels/roomgridview-experimental	2019-01-07 14:17:57 +01:00
Travis Ralston	5a2113e1a9	Fix a comparison bug in ordering the MemberList	2019-01-03 21:56:19 -07:00
Travis Ralston	77dfba8a22	Add unit tests for MemberList ... Particularly the ordering of the tiles.	2019-01-03 21:55:52 -07:00
Travis Ralston	cc8fa7911b	Merge remote-tracking branch 'origin/experimental' into travis/fix-memberlist-order	2019-01-03 20:01:28 -07:00
J. Ryan Stinnett	920911c0a1	Room list fixes for custom status	2019-01-03 18:49:15 -06:00
Travis Ralston	1481dcf9d7	Don't re-sort the room list if the user is hovering over it ... Fixes vector-im/riot-web#5624	2019-01-03 16:27:59 -07:00
Travis Ralston	8017f0a4a1	Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real	2019-01-03 16:00:23 -07:00
David Baker	f928be6f59	Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental" ... This reverts commit ad47144355.	2019-01-03 15:37:03 -07:00
Travis Ralston	d111fe27bb	Revert "Merge pull request #2396 from matrix-org/travis/room-list-hover" ... This reverts commit 5098b28672.	2019-01-03 15:36:56 -07:00
Travis Ralston	223a49d81f	Don't re-sort the room list if the user is hovering over it ... Fixes vector-im/riot-web#5624	2019-01-03 13:57:20 -07:00
Travis Ralston	95844ebf9d	Comment out debugging statements ... They are useful to have around, but not to have enabled all the time.	2019-01-03 12:15:27 -07:00
Travis Ralston	63a7b86eac	Flatten and simplify the memberlist sorting algorithm ... The previous algorithm had a bug where it was getting stuck on the power level comparison, leaving the memberlist incorrectly ordered. The new algorithm uses less branching to try and walk through the different cases instead. Additionally, the steps used to determine the order have changed slightly to better represent an active member list. This commit also includes changes to try and re-sort the member list more often during presence changes. Events are not always emitted, however. This may be a js-sdk bug but appears to happen prior to these changes as well. Fixes https://github.com/vector-im/riot-web/issues/6953	2019-01-03 12:15:19 -07:00
David Baker	982e037822	Fix merge	2019-01-03 18:05:38 +00:00
David Baker	7d161de35b	Partial merge of develop to experimental ... Does not include #2336 as the file has been moved out from underneath it: will do this separately	2019-01-03 15:02:58 +00:00
J. Ryan Stinnett	402f58225f	Show in-room reminder when key backup creating device unverified ... If the current device hasn't verified the device that created the account's current key backup version, then the current device is won't use the key backup. This change adjusts an existing in-room reminder to do the right thing for this case by allowing the user to verify the device that created the key backup. Fixes vector-im/riot-web#7902.	2019-01-02 15:36:40 -06:00
Travis Ralston	f5ff580e35	Add some logging for riot-web#7838 ... See https://github.com/vector-im/riot-web/issues/7838	2018-12-21 14:51:05 -07:00
Travis Ralston	04c9fff6ce	Add a feature flag for custom status messages	2018-12-18 15:11:08 -07:00
Bruno Windels	1d43712a8f	Merge branch 'experimental' into nadonomy/icons	2018-12-18 18:22:24 +01:00
Nad Chishtie	074c96cd3e	First pass of normalising icons.	2018-12-18 16:48:20 +00:00
Bruno Windels	5e2ee883aa	Merge pull request #2366 from matrix-org/bwindels/fixrhscollapse ... Redesign: fix remaining right panel collapse issues.	2018-12-18 16:19:02 +00:00
Bruno Windels	4b788fcb7e	fix lint	2018-12-18 16:29:31 +01:00
Bruno Windels	2cb817ae26	remove dead code (collapse button was removed)	2018-12-18 15:33:28 +01:00
Bruno Windels	acba36c975	Merge pull request #2364 from matrix-org/bwindels/fixresizepersistenceandscrollindicator-again ... Redesign: left panel fixes	2018-12-18 14:23:38 +00:00
Bruno Windels	2cda6d8f35	fix empty comment line	2018-12-18 15:06:56 +01:00
Bruno Windels	cdcb3c1a55	check overflow and restore sizes in more places inside RoomList: ... check overflow on mount restore size on query change (in case a sublist appeared) check overflow when updating rooms avoid duplicating for restoring size and checking overflow	2018-12-18 14:26:33 +01:00
Bruno Windels	b359a2edee	call header clicked callback after rerendering, so resizer has DOM nodes	2018-12-18 10:56:00 +01:00
Bruno Windels	0676c1b8ad	Merge pull request #2361 from matrix-org/bwindels/collapserhs ... Redesign: allow to hide the right panel when clicking already active button & persist	2018-12-18 09:46:30 +00:00
Bruno Windels	a734fb9d35	dont set initial phase, show panel when collapsed	2018-12-17 15:55:26 +01:00
Bruno Windels	65f9bc9754	remove expand button in room header	2018-12-17 15:23:46 +01:00
Bruno Windels	242b0c21ac	make avatar 24px and tile height 32px	2018-12-17 14:03:48 +01:00
Bruno Windels	3ea0fd1a2f	fix overflow indicators not being updated when searching	2018-12-14 17:06:51 +01:00
Travis Ralston	63658e0441	Add a missing null check	2018-12-13 14:29:12 -07:00
Bruno Windels	c8243357ea	disable editor history/persistence when in grid to avoid pesky bug	2018-12-13 13:01:59 +01:00
Bruno Windels	f593bff3c3	show right panel tabs inside panel instead of room header in grid mode	2018-12-13 13:01:59 +01:00
Bruno Windels	44200a6f78	only listen and dispatch to room-local dispatcher in room view, composer	2018-12-13 13:01:59 +01:00
Bruno Windels	720bc11aa4	avoid using roomviewstore for detecting selected room	2018-12-13 13:01:59 +01:00
Bruno Windels	43efa29ef8	track active room with OpenRoomsStore	2018-12-13 12:59:18 +01:00
Bruno Windels	df8539d6bc	pass the RoomViewStore down with a prop instead of global var. ... this will allow to have more than 1 RoomView further on	2018-12-13 12:59:18 +01:00
Travis Ralston	f2649f7807	Use the now-prefixed js-sdk status message API ... See 08b3dfa3b5	2018-12-12 23:07:03 -07:00
Travis Ralston	99f5b9e39b	Misc cleanup of whitespace	2018-12-12 18:18:43 -07:00
Travis Ralston	a91963e5ee	Replace the avatar next to the composer with a status entry menu ... The checkmark might change, and there appears to be some state tracking mishaps that need to be worked out. Part of https://github.com/vector-im/riot-web/issues/1528	2018-12-12 18:03:30 -07:00
Travis Ralston	dd382ecb05	Fix a bug with determining 1:1 rooms ... We shouldn't consider rooms where people have left or been banned	2018-12-12 13:20:26 -07:00
Travis Ralston	cd9ea2b2d7	Fix alignment of avatars and status messages ... also introduce the status message to the MemberInfo pane Part of https://github.com/vector-im/riot-web/issues/1528	2018-12-12 12:57:48 -07:00
Bruno Windels	9f5a0250bf	Merge pull request #2345 from matrix-org/bwindels/jumptofirstunread-rebased ... Redesign: restyle jump to first unread message & rework read marker logic (rebased)	2018-12-12 10:13:51 +00:00
Travis Ralston	ce7969e3d5	Display custom status messages in the UI ... Part of https://github.com/vector-im/riot-web/issues/1528	2018-12-11 21:40:11 -07:00
Bruno Windels	ac9902e52a	apply redesign to topunreadmessagebar ... with placeholder for message count	2018-12-11 15:43:00 +01:00
Bruno Windels	3040f2d2e2	remove try/catch as the error is already prevented inside resize	2018-12-11 10:51:14 +01:00
Bruno Windels	f4e61b2bf1	fixup for roomsublist fix	2018-12-10 16:53:04 +01:00
J. Ryan Stinnett	a92d2902c4	Add an in-room reminder to set up key recovery ... This adds an in-room reminder above the message timeline to set up Secure Message Recovery so that your keys will be backed up. If you try to ignore it, an additional dialog is shown to confirm. Fixes vector-im/riot-web#7783. Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>	2018-12-07 14:13:02 -06:00
Travis Ralston	ca1313099f	Show the IncomingCallBox if the call is for the RoomSubList ... Fixes https://github.com/vector-im/riot-web/issues/4369 Previously the RoomSubList would filter its list of rooms to verify that the incoming call belongs to it. This causes problems when the sub list is being told some rooms don't exist (ie: the list is filtered). It is trivial for the RoomList to instead track which RoomSubList (tag) it should be handing the call off to so we do that instead now. The RoomSubList trusts that the caller has already filtered it and will render the IncomingCallBox if it has an incoming call.	2018-12-06 11:45:58 -07:00
Travis Ralston	0f348a7c78	Merge branch 'develop' into travis/invite-errors	2018-12-05 11:25:45 -07:00
Bruno Windels	13491e797d	persists & load collapsed room sub lists	2018-12-03 10:39:31 +01:00
Will Hunt	2b077b4f5d	Merge remote-tracking branch 'upstream/develop' into hs/upload-limits	2018-12-01 16:24:43 +00:00
Travis Ralston	987ad0b0db	Check if users exist before inviting them and communicate errors ... Fixes https://github.com/vector-im/riot-web/issues/3283 Fixes https://github.com/vector-im/riot-web/issues/3968 Fixes https://github.com/vector-im/riot-web/issues/4308 Fixes https://github.com/vector-im/riot-web/issues/1597 Fixes https://github.com/vector-im/riot-web/issues/6790 This does 3 things: * Makes the `MultiInviter` check for a user profile before attempting an invite. This is to prove the user exists. * Use the `MultiInviter` everywhere to avoid duplicating the logic. Although a couple places only invite one user, it is still worthwhile. * Communicate errors from the `MultiInviter` to the user in all cases. This is done through dialogs, where some existed previously but were not invoked. Specifically to the 403 error not working: What was happening was the `MultiInviter` loop was setting the `fatal` flag, but that didn't resolve the promise it stored. This caused a promise to always be open, therefore never hitting a dialog.	2018-11-29 15:05:53 -07:00
Bruno Windels	8f4292399b	Merge pull request #2297 from matrix-org/bwindels/roomlistsizingimprovements ... Redesign: improve room sub list sizing & persist sizes	2018-11-27 13:40:48 +00:00
Bruno Windels	887defda9c	temp solution to make room settings usable ... make mx_fadable not do anything anymore, and make room settings full size. Room settings haven't been designed yet, so all of this will have a full pass when we have a go at it.	2018-11-26 17:58:51 +01:00
Bruno Windels	0c7d51d70d	persist room sub list sizes	2018-11-26 16:46:57 +01:00
Bruno Windels	8929ff9b5e	use room resize classes	2018-11-26 14:42:01 +01:00
Bruno Windels	67e0030ccd	Merge branch 'develop' into experimental	2018-11-26 13:10:29 +01:00
David Baker	985966f8be	Update async dialog interface to use promises ... Hopefully makes the syntax a bit nicer. Also uses ES6 async import rather than require.ensure which is now deprecated. Also also displays an error if the component fails to load rather than falling over in a heap, which is nice.	2018-11-21 16:56:44 +00:00
Bruno Windels	ece549bf71	fix lint	2018-11-13 09:17:37 +01:00
Bruno Windels	ffc73c59b4	make padding and DOM more like event tile	2018-11-13 09:15:43 +01:00
Bruno Windels	8ddd2dd078	scroll down when showing typing notif and stuck at bottom	2018-11-13 09:15:16 +01:00
Bruno Windels	20b8994714	simplify DOM and style to design	2018-11-12 18:19:18 +01:00
Bruno Windels	7df47cbc87	move typing notifications to WhoIsTypingTile, shown in ScrollPanel	2018-11-12 16:09:51 +01:00
Bruno Windels	883126a528	Merge branch 'experimental' into bwindels/memberqueryfield	2018-11-07 13:29:28 +01:00
Bruno Windels	9e95a1402c	Merge pull request #2269 from matrix-org/bwindels/roomlistpolish ... Redesign: room list visual polish	2018-11-07 11:44:47 +00:00
Bruno Windels	4e773c2665	Make right panel a dark-panel instead of every descendant. ... Also move bg color central.	2018-11-06 14:47:58 +01:00
Bruno Windels	92e43ea181	move filter member field to bottom of memberlist ... reorganize styles as well	2018-11-06 14:47:11 +01:00
Bruno Windels	ef26189add	add dedicated menu button to room tile with new design	2018-11-05 17:42:25 +01:00
Bruno Windels	c0becc7664	fix roomtile badge ... only put it in the dom if it has anything to show as it has a border now in collapsed mode	2018-11-05 14:24:12 +01:00
Bruno Windels	3cd32e2f44	update search icon(s)	2018-11-05 13:07:49 +01:00
Bruno Windels	064662380f	support search icon in mx_textinput, use in memberlist	2018-11-05 09:35:27 +01:00
Bruno Windels	46389457e3	add input styling for light and dark panels (leftpanel vs room header)	2018-11-05 09:32:37 +01:00
Bruno Windels	e29227db4e	bring back "filter rooms" field ... this does the filtering in RoomList instead of RoomSubList, so we can hide sections that don't have any results. The filtering does happen with every rerender of RoomList, but only does something while searching, so the performance implications are probably negligible.	2018-11-02 15:27:17 +01:00
Bruno Windels	b4dd739771	Merge branch 'experimental' into bwindels/rightpanelbelowheader	2018-10-31 14:57:16 +01:00
Bruno Windels	ba83166661	Merge branch 'develop' into experimental	2018-10-31 14:54:22 +01:00
Bruno Windels	e80a1c5051	move room/group panel header buttons into room/group header	2018-10-30 17:15:19 +01:00
Aaron Raimist	49ce4ef117	eslint --fix src/ ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-10-26 22:50:38 -05:00
David Baker	156ffd1334	Fix autoreplacement of ascii emoji ... More slate API updates in code paths I didn't test Fixes https://github.com/vector-im/riot-web/issues/7509	2018-10-26 17:01:44 +01:00
Bruno Windels	2c039483c6	Merge branch 'develop' into experimental	2018-10-26 15:33:39 +02:00
David Baker	85bb8392c4	Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement ... Fix emoji replacement in composer	2018-10-25 16:23:13 +01:00
David Baker	5e81e5b8b8	Fix variable scope	2018-10-25 15:07:19 +01:00
David Baker	401f6333ed	Do...while loops are a thing	2018-10-25 14:54:32 +01:00
David Baker	adee0fdcef	Merge pull request #2248 from matrix-org/bwindels/memberpanel ... Redesign: basic makeover of member info panel	2018-10-25 14:52:54 +01:00
Bruno Windels	3096bf42ef	fix css in chrome	2018-10-25 15:20:51 +02:00
Bruno Windels	030deba90c	avoid downloading avatars at full resolution	2018-10-25 15:20:33 +02:00
Will Hunt	8118a9c71a	Wall devtools button behind a setting	2018-10-24 18:15:35 +01:00
Will Hunt	44a41b589d	Comma on strings and styling button	2018-10-24 17:50:27 +01:00
Will Hunt	79d467c551	Add button to open devtools in roomsettings	2018-10-24 17:36:58 +01:00
Bruno Windels	e4dfb90b85	basic makeover of member panel with big avatar	2018-10-24 18:23:34 +02:00
Bruno Windels	873ff7fc29	make EntityTile responsive	2018-10-24 18:22:57 +02:00
David Baker	78d8d22457	Fix emoji replacement in composer ... * Re-scan the slate document tree on each emoji replacement since doing a replacement will invalidate all the offsets we have. * Reset the emoji regex each time we use it. Fixes https://github.com/vector-im/riot-web/issues/7550	2018-10-24 16:46:06 +01:00
Bruno Windels	7244d30c9c	guard against empty roomId/non-existant room	2018-10-24 16:44:18 +02:00
Bruno Windels	8c62dddb32	one big commit, sorry ... changing looks of input & buttons changing background color of right panels moving invite button around change margins and paddings in memberlist	2018-10-24 13:50:58 +02:00
Bruno Windels	5425eda438	Merge pull request #2241 from matrix-org/bwindels/redesignicons1 ... Redesign: update (most) icons	2018-10-23 19:40:59 +00:00
Bruno Windels	eb453f4539	make icons in composer smaller, better spacing	2018-10-23 18:11:15 +02:00
Bruno Windels	18fedb23ec	fix basic room header layout ... make room name take as much space as it needs (but not more than width) put all items apart from right buttons in one flex container so name and topic can grow as required more small tweaks	2018-10-23 16:57:56 +02:00
Travis Ralston	78f527cf95	Remove unused classes	2018-10-22 15:14:21 -06:00
Bruno Windels	ebd3d34106	make sure no resize handle is put after last sublist	2018-10-19 18:35:27 +02:00
Bruno Windels	c6924c47fa	no need for self	2018-10-19 14:43:54 +02:00
Bruno Windels	d48f19bc19	remove alwaysShowHeader, as now onAddRoom prop determines this	2018-10-19 14:43:02 +02:00
Bruno Windels	5091aa3b43	get rid of emptyContent, also cleanup sublist render method ... also assume empty list in css by default and add nonEmpty class	2018-10-19 14:41:51 +02:00
Bruno Windels	0386a1e048	get rid of obsolete showEmpty prop	2018-10-19 14:32:49 +02:00
Bruno Windels	ae8723451a	remove onShowMoreRooms, as room tiles & scrollbar rendered at same level	2018-10-19 14:27:36 +02:00
Bruno Windels	f14c2cf2b2	don't hide empty sections that have a (+) button	2018-10-19 12:46:59 +02:00
Bruno Windels	6af61ebb09	add plus button for rooms and people	2018-10-19 12:07:36 +02:00
Bruno Windels	d264687796	don't scroll sub list header	2018-10-18 16:25:22 +02:00
Bruno Windels	01082c8595	hook up resizer events	2018-10-18 15:51:58 +02:00
Bruno Windels	39ab3d86bd	create sizer that sets item size with flex-basis ... works with the flex-grow we set initially for the sub lists	2018-10-18 15:51:22 +02:00
Bruno Windels	c1e602d56f	scrollbars and resize handles around room sub lists	2018-10-18 15:19:45 +02:00
Bruno Windels	99982b1164	put repeated props in process function	2018-10-18 15:15:56 +02:00
Bruno Windels	c12368ea48	process RoomSubList props through function before creating them ... this way, we'll be able to add adjacent resize handles and scroll wrappers	2018-10-18 15:09:58 +02:00
Bruno Windels	81d0ce2bcf	remove sticky header code	2018-10-18 15:08:32 +02:00
Travis Ralston	af8dfda9a7	Add a bit of text to explain the purpose of the RoomPreviewSpinner ... Fixes https://github.com/vector-im/riot-web/issues/5869	2018-10-17 13:53:12 -06:00
Bruno Windels	6906d5a5f9	remove DND for room tiles	2018-10-17 16:02:35 +02:00
Bruno Windels	cc29dd08da	don't always show badge (leftover)	2018-10-16 14:54:14 +02:00
Bruno Windels	01471abdc5	Merge branch 'bwindels/redesign' into bwindels/resizehandles	2018-10-16 11:57:59 +02:00
Bruno Windels	6878ce3c6a	Merge branch 'develop' into bwindels/redesign	2018-10-16 11:57:44 +02:00
Will Hunt	5a72a5863f	Merge remote-tracking branch 'upstream/develop' into hs/upload-limits	2018-10-15 19:20:55 +01:00
Aaron Raimist	9f1b1d2028	Fix more lint errors ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-10-11 22:50:24 -05:00
Aaron Raimist	a66dbccef8	Fix lint errors in MessageComposerInput.js ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2018-10-11 22:46:55 -05:00
David Baker	3efc09586b	More API changes	2018-10-11 10:47:36 +01:00
David Baker	4d1f2cdfa9	Fix quote post slate update ... Missed API update	2018-10-11 10:29:55 +01:00
Bruno Windels	dfb4c594a8	Merge pull request #2204 from matrix-org/bwindels/rrfallbackavatars ... Fall back to default avatar in RR when member isn't loaded yet	2018-10-10 16:58:59 +02:00
Bruno Windels	0767c278e7	put userId next to member in read receipt, fall back when member missing	2018-10-10 16:14:09 +02:00
David Baker	97ed4ed0bb	Merge pull request #2202 from matrix-org/dbkr/update_slate ... Update to new version of slate	2018-10-10 11:10:20 +01:00
David Baker	4e1fabd140	Remove spurious ...atributes in the wrong place ... We already have it above	2018-10-09 16:05:14 +01:00
David Baker	41bc42e7d7	Merge pull request #2194 from pvagner/more_accessible_buttons ... More accessible buttons - take 2	2018-10-09 11:04:50 +01:00
David Baker	c1f51a76dd	Update to new version of slate ... Lots of fixes here as a lot of the API has changed (eg. anchorKey / offsetKey are now anchor.key and offset.key, and collapseFocusToThing is moveFocusToThing). Also changes the ref to a function (sorry for lumping this into the same PR). Hopefully will fix https://github.com/vector-im/riot-web/issues/7105	2018-10-09 10:55:55 +01:00
Will Hunt	17915b5082	Merge branch 'develop' into hs/purge-irc-hack	2018-10-03 19:39:14 +01:00
Will Hunt	fe788486b7	Drop (IRC) suffix hacks	2018-10-03 19:34:06 +01:00
Peter Vágner	e05ae29146	Also fix accessibility of sticker buttons	2018-10-02 20:19:21 +02:00
Peter Vágner	ded35e43a0	A11y: repurpose more divs into AccessibleButtons. ... With this more of the controls that look like buttons can be operated via the keyboard and navigated to by screen reader users. This includes editor buttons such as File upload, Audio / Video call, Right pannel hide button, Jump to the bottom timeline button, and some more buttons found in the user settings. Also I have added alt texts to some images that in turn label buttons which these happen to be packed in and removed some untranslated alt texts from decorative non-actionable images that might add more verbosity when talking about screen reader user experience.	2018-10-02 13:55:24 +02:00
Bruno Windels	928b6d47c8	add resize handles between 3 main app columns	2018-09-24 16:07:42 +01:00
Bruno Windels	91ec96c8d3	Merge branch 'develop' into bwindels/redesign	2018-09-21 12:44:44 +02:00
Matthew Hodgson	0f806d5b99	Merge branch 'develop' into matthew/canonical_aliases	2018-09-20 01:45:08 +01:00
Matthew Hodgson	c6fa8ea24c	show canonical aliases in timeline, and set/remove implicit ones	2018-09-20 01:07:01 +01:00
Bruno Windels	920e0d397c	Merge branch 'develop' into bwindels/fixstalerr	2018-09-19 12:15:41 +02:00
Matthew Hodgson	d39889e2cf	Merge pull request #2167 from matrix-org/t3chguy/m.room.aliases ... Add m.room.aliases to the timeline	2018-09-18 11:14:44 +01:00
Matthew Hodgson	ece041d059	fix NPE on name (related to LL?)	2018-09-18 00:16:25 +01:00
Bruno Windels	8c4f4765df	remove initial parameter and show available members on invite instead	2018-09-17 20:03:01 +02:00
Bruno Windels	0727e0f8d3	mounted can be set straight in componentWillMount	2018-09-17 20:02:15 +02:00
Bruno Windels	e8b4770940	fix lint	2018-09-17 20:01:55 +02:00
Bruno Windels	e0a789f77e	remove untrue comment, as we only load the members when joining	2018-09-17 19:21:22 +02:00
Bruno Windels	e1b9aa9626	better naming and document method	2018-09-17 19:20:26 +02:00
Matthew Hodgson	dc7212ec2b	switch back to simple TextForEvent ... I haven't found anyone who can justify to me why we need more complicated plurals for i18n (even in Polish) for %(senderName)s added %(addedAddresses)s and removed %(removedAddresses)s as addresses for this room.	2018-09-17 18:20:12 +01:00
Bruno Windels	d276b17c2a	remove dead code	2018-09-17 19:19:07 +02:00
Bruno Windels	c3914d3493	show empty list as initial state instead of spinner ... the spinner should only be shown when joined	2018-09-17 19:18:55 +02:00
Bruno Windels	2ed414494f	use Room.myMembership event instead of RoomMember.membership for me ... This is more reliable with LL enabled as the syncing user is only known when it was active in the current timeline or when the members have been loaded	2018-09-17 19:14:52 +02:00
Matthew Hodgson	3b868064c7	merge in develop	2018-09-16 19:06:52 +01:00
Bruno Windels	27c496aecb	remove unneeded async keywords	2018-09-14 13:55:47 +02:00
Bruno Windels	f194f323f4	postpone loading the members until the user joined the room ... when peeking, the members weren't being loaded at all because the room wasn't available yet, and the need for loading the members was never re-evaluated after that. This only loads the members once the user has joined the room, which also helps to avoid load all the members before an invite is accepted.	2018-09-13 18:43:24 +02:00
Bruno Windels	ecaabd6b75	Merge pull request #2161 from matrix-org/bwindels/dontupdatememberlistwhileloading ... avoid updating the memberlist while the spinner is shown	2018-09-11 10:57:29 +02:00
Bruno Windels	2aaf3e6b89	dont assign member in getInitialState	2018-09-10 17:39:03 +02:00
Bruno Windels	92f7e29132	missed one {} -> [], fix e2e tests	2018-09-10 17:32:40 +02:00
Bruno Windels	5044d4f2d6	dont keep the spinner in the memberlist when fetching /members fails	2018-09-10 14:56:10 +02:00
Bruno Windels	0cd222ef0b	make users available in member by requesting them from client right before ... before this was already foreseen, but memberDict wasn't being refreshed as it's only used in roomMembers(), I got rid of memberDict as well	2018-09-07 23:44:20 +02:00
Bruno Windels	7fe822ca17	Merge branch 'develop' into bwindels/dontupdatememberlistwhileloading	2018-09-07 23:43:25 +02:00
Bruno Windels	467cdd2f1f	Merge branch 'develop' into bwindels/optimizememberlist	2018-09-07 18:32:13 +02:00
Bruno Windels	9cc9fbf924	avoid memberlist refresh for events related to rooms other but the current	2018-09-07 14:05:26 +02:00
Bruno Windels	fec7d2ee5f	avoid updating the memberlist while the spinner is shown ... the memberlist gets updated constantly while the LL members are being added to the room state. this slows things down unneed, and is one of the main cause of dropping frames when member arrive.	2018-09-07 12:00:19 +02:00
David Baker	c8ab8bf5f8	Merge pull request #2150 from matrix-org/dbkr/disable_ilag_if_unsupported ... Do full registration if HS doesn't support ILAG	2018-09-06 16:23:32 +01:00
Bruno Windels	26df485607	Merge branch 'develop' into revert-2149-revert-2145-bwindels/fixllroompermission	2018-09-06 15:35:41 +02:00
David Baker	4c8d2de563	Revert "Revert "Don't rely on room members to query power levels""	2018-09-06 11:48:23 +01:00
David Baker	9e64a22884	s/DidMount/WillMount/ in MessageComposerInput ... This fixes the tests that broke with https://github.com/matrix-org/matrix-js-sdk/pull/717 This is because of https://github.com/vector-im/riot-web/blob/master/test/app-tests/joining.js#L63 which prevents the DOM nodes from actually ending up in the DOM, even though the react components get rendered. This means that WillMount and WillUnmount are called, but not DidMount. Using WillMount is more symmertrical anyway since the resulting teardown code must be in WillUnmount (since there is no DidUnmount).	2018-09-06 11:44:13 +01:00
David Baker	27fa21e403	Replace view_set_mxid with require_registration ... To put all the other flows through the to-ilag-or-not-to-ilag flow	2018-09-05 18:08:49 +01:00
David Baker	34d27954cf	Revert "Don't rely on room members to query power levels"	2018-09-05 18:03:48 +01:00
Bruno Windels	8500a7131f	avoid unneeded lookups in memberDict ... have members be an array of RoomMember instead of userId, so we can avoid multiple lookups when sorting, rendering, ...	2018-09-05 15:25:08 +02:00
Bruno Windels	50de22fb51	Merge pull request #2145 from matrix-org/bwindels/fixllroompermission ... Don't rely on room members to query power levels	2018-09-05 13:07:55 +02:00
Bruno Windels	be66f98381	use room method for checking power levels ... as it is always are of the syncing user's membership in case of lazy loading members	2018-09-04 15:35:44 +02:00
Bruno Windels	1eabb6012a	Merge pull request #2139 from matrix-org/bwindels/memberlist-spinner ... Show spinner in member list while loading members	2018-09-03 15:05:27 +02:00
Bruno Windels	cae419e304	avoid rerendering when LL is disabled	2018-09-03 11:13:56 +02:00
David Baker	2c1ba6f104	Merge pull request #2124 from matrix-org/dbkr/tombstone ... Support m.room.tombstone events	2018-08-29 18:38:48 +01:00
David Baker	c40ac49b2a	Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate	2018-08-29 18:18:08 +01:00
David Baker	bd0a9cf3a0	Merge remote-tracking branch 'origin/develop' into dbkr/room_upgrade	2018-08-29 15:51:07 +01:00
Bruno Windels	f9c40390e9	set state after setting _showPresence to avoid all members to appear offline on matrix.org	2018-08-29 11:09:55 +02:00
Bruno Windels	e9e5abfcc5	show a spinner in the memberlist while loading the members	2018-08-29 10:30:25 +02:00
David Baker	98dabe1a46	Merge pull request #2132 from matrix-org/bwindels/fixllcomposeravatar ... Fix LL crash trying to render own avatar in composer when member isn't available yet	2018-08-23 12:41:18 +01:00
David Baker	06ffc70aa4	Merge pull request #2127 from matrix-org/dbkr/hide_replaced_rooms ... Hide replaced rooms	2018-08-23 09:33:40 +01:00
Bruno Windels	37e60e4fc4	wait for members loading to finish to show the avatar in the composer	2018-08-23 00:02:20 +02:00
David Baker	f679acea08	Revert "Revert "Fix showing peek preview while LL members are loading""	2018-08-22 16:35:58 +01:00
David Baker	bf7633250a	Revert "Fix showing peek preview while LL members are loading"	2018-08-22 16:16:17 +01:00
Bruno Windels	860c6355f0	do self membership checks with getMyMembership elsewhere as well	2018-08-22 14:06:28 +02:00
David Baker	b7570002e0	Hide replaced rooms ... By using new getVisibleRooms() in js-sdk	2018-08-22 12:01:29 +01:00
David Baker	8d6d1be992	Typo	2018-08-21 16:40:04 +01:00
David Baker	7f8cd203a8	Support m.room.tombstone events ... For https://github.com/vector-im/riot-web/issues/7164	2018-08-21 15:56:56 +01:00
David Baker	ab10b5493b	Support room creation events ... For https://github.com/vector-im/riot-web/issues/7164	2018-08-20 16:20:59 +01:00
David Baker	9f19896df0	Support for room upgrades ... * Show when a room upgrade is needed * Dialog box to perform the upgrade	2018-08-17 14:54:43 +01:00
Bruno Windels	cead4096d8	Merge pull request #2118 from matrix-org/bwindels/feature_lazyloading ... Lazy loading of room members	2018-08-16 18:14:55 +02:00
David Baker	c736ae7efb	Copyright	2018-08-14 16:53:34 +01:00
David Baker	f20920718a	Show room version number in room settings ... Also change wording of the Room ID bit to match Requires https://github.com/matrix-org/matrix-js-sdk/pull/689 For https://github.com/vector-im/riot-web/issues/7164	2018-08-14 14:28:30 +01:00
David Baker	05bf200a72	Don't crash if scrollbars updated before init ... The initialisation here is done on a timer to allow the DOM elements to be in place before it's run, so it's possible for an update to happen ebfore the initialisation. Stop & bail out if there is no this.stickies.	2018-08-13 13:49:22 +01:00
David Baker	f44cc8e66e	Merge pull request #2112 from matrix-org/dbkr/recognise_server_notices_room ... Recognise server notices room(s)	2018-08-07 09:52:25 +01:00
David Baker	b5ce1ac5e1	Recognise server notices room(s) ... and put them in their own section at the bottom	2018-08-06 18:00:40 +01:00
David Baker	b2302af708	Update room tags behaviour to match spec more ... Fix Riot's behaviour with room tags after my cleanup in https://github.com/matrix-org/matrix-doc/pull/1457 . Although, reading it again, it's not clear how you're supposed to tell the difference between a reverse-dns tag name and a legacy freeform text tag (contains a '.'?) - I've left it detecting these as freeform text for now.	2018-08-06 16:58:54 +01:00
Bruno Windels	802efc7694	given the != join check, isInvite will never be true ... Also, put comments in right order	2018-08-02 11:47:24 +02:00
Bruno Windels	908de56c6d	replace getMember(myId).membership with getMyMembership ... This works with rooms which haven't had their members loaded yet.	2018-08-02 11:42:05 +02:00
Matthew Hodgson	fe73953d9d	fix merge; disable sticky headers; tweak chevrons	2018-07-30 09:00:11 -07:00
Matthew Hodgson	9783b6100d	Merge branch 'develop' into matthew/dharma	2018-07-29 17:03:23 +01:00
Michael Telatynski	f264075369	null-guard history properly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-26 17:11:32 +01:00
Michael Telatynski	265e4267b8	remove faulty onBlur/onFocus code which caused selection to rollback ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-26 15:00:43 +01:00
Bruno Windels	d87d34030a	fix dm detection and conf call code with lazy loading	2018-07-25 16:10:49 +02:00
Bruno Windels	f79e2eae40	might not have loaded members here yet	2018-07-25 16:10:49 +02:00
Bruno Windels	866b4bb067	use isKicked method in preview bar	2018-07-25 16:10:49 +02:00
Bruno Windels	8c9ceca14f	take into account lazy loading when enlarging avatar	2018-07-25 16:10:49 +02:00
Michael Telatynski	020e714b85	fix focus and too many <p>s after a Event>Quote in RT mode ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-24 15:54:24 +01:00
Michael Telatynski	afa19cd60d	make clicking autocomplete suggestions work again ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-24 13:48:05 +01:00
David Baker	b8ca65627b	Merge pull request #2076 from matrix-org/t3chguy/slate_cont2 ... Slate Fixes	2018-07-23 17:25:51 +01:00
Michael Telatynski	93abb4b74b	workaround to prevent Slate getting too empty when undoing RT pastes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-20 15:06:27 +01:00
David Baker	f9af96d422	Merge pull request #2070 from matrix-org/t3chguy/slate_cont2 ... Even More Slate Fixes :D	2018-07-19 13:49:42 +01:00
Michael Telatynski	855f8871b8	replace heuristic for the time being as it failed with inlines like pills. Fixes vector-im/riot-web#7059 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 16:50:07 +01:00
Michael Telatynski	88dddb628d	in MD mode forgo any Magic Rich Pasting conversion as its confusing ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 11:50:13 +01:00
Michael Telatynski	6bb88c0548	attempt to fix clash of Cmd-M on Mac. Should fix vector-im/riot-web#7047 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 11:28:48 +01:00
Michael Telatynski	3e956514b3	also prevent merge/skip on rich text pastes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 11:00:45 +01:00
Michael Telatynski	1a9de3fabe	fix undo on pasting plaintext content ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:58:27 +01:00
Michael Telatynski	f5856270cc	undo removal of stripping <p>s as it breaks HTML /mes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:48:54 +01:00
David Baker	68c46a694e	lint	2018-07-18 10:18:55 +01:00
Michael Telatynski	19e5dc5799	do less rewriting for composer quote to prevent breaking pills ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:10:42 +01:00
Michael Telatynski	8bb08b1b75	fix focus on new editorState as it didn't have focus so broke when alt tab ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:10:11 +01:00
David Baker	7aab6fa6f1	Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo	2018-07-18 09:35:57 +01:00
Matthew Hodgson	02c3bc9476	Merge pull request #2069 from matrix-org/t3chguy/slate_cont2 ... Moar Slate Fixes	2018-07-17 17:15:01 +01:00
Michael Telatynski	720a728278	workaround for placeholder being shown when empty text but block. Fixes vector-im/riot-web#7042 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 16:13:33 +01:00
Michael Telatynski	1b467f6ca8	fix pasting of plaintext content (prevent loads of <p>s) Fixes vector-im/riot-web#7043 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 16:02:37 +01:00
Michael Telatynski	414908611d	prevent exception if there is no text node at anchor ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 13:48:15 +01:00
Michael Telatynski	688776bc10	allow enter to remove current block if its empty useful for lists ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 13:29:40 +01:00
Michael Telatynski	8d4cead105	special-case 'inline-code' button because mark is called 'code' ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 13:24:28 +01:00
Michael Telatynski	ff76b6a981	allow user to break out of blockquote/etc by hitting enter twice ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 12:30:22 +01:00
Matthew Hodgson	48fbf1406f	Merge pull request #2068 from matrix-org/t3chguy/slate_cont2 ... fix 2nd typo in one PR :(	2018-07-16 21:36:57 +01:00
Michael Telatynski	1c24f1fd5a	fix 2nd typo in one PR :( ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 21:34:25 +01:00
Matthew Hodgson	8c17ee7281	Merge pull request #2067 from matrix-org/t3chguy/slate_cont2 ... check if has some completions, not if >=0	2018-07-16 21:32:04 +01:00
Michael Telatynski	547e0ed52c	check if has some completions, not if >=0 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 21:30:04 +01:00
Matthew Hodgson	a5b932bfdd	Merge pull request #2066 from matrix-org/t3chguy/slate_cont2 ... Slate fixes	2018-07-16 21:29:20 +01:00
Michael Telatynski	3000099991	add additional checks for hiding autocomplete to prevent text calculation ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 21:27:52 +01:00
Michael Telatynski	bdbc2cbd38	disable spellCheck when the placeholder is shown because "unencrypted" ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 18:32:50 +01:00
Michael Telatynski	c7859fed1a	add heuristic to compare documents to prevent autocomplete flicker ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 18:27:06 +01:00
David Baker	a79caed0c9	Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms	2018-07-16 17:21:51 +01:00
David Baker	379d65bd6c	Merge pull request #2064 from matrix-org/t3chguy/slate_cont2 ... simplify MessageComposerStore and improve its performance	2018-07-16 17:20:48 +01:00
Michael Telatynski	2f1779751b	make the MessageComposerStore stateless for better performance ... and inter-tab composition (by simplifying it. WIN-WIN) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 16:56:08 +01:00
David Baker	d16ac4d80c	Merge pull request #1890 from matrix-org/matthew/slate ... Replace Draft with Slate	2018-07-16 14:16:25 +01:00
David Baker	4c6419a3c5	Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo	2018-07-16 13:24:13 +01:00
David Baker	ff96537048	lint	2018-07-16 11:49:53 +01:00
Michael Telatynski	4850387ae0	add null-guard for stickerpickerWidget in StickerPicker	2018-07-13 14:24:29 +01:00
Bruno Windels	7bbb967ddd	Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen ... Implement always-on-screen capability for widgets	2018-07-13 11:14:37 +01:00
David Baker	e56feea9ec	Put always-on-screen widgets in top left ... always-on-screen widgets now appear in the top-left where the call preview normally is if you're not in the room that they're in. Fixes https://github.com/vector-im/riot-web/issues/7007 Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053	2018-07-12 18:43:49 +01:00
David Baker	5a5e967262	Fix avatars vanishing on hover ... Turns out the z-index was to make the avatar appear above the EventTile_line even though it comes before in the DOM (it's absolutely positioned to overlap with it). Instead, just put it afterwards in the DOM.	2018-07-12 17:48:49 +01:00
Michael Telatynski	7405c5eff2	specify alternate history storage key to prevent conflicts with draft ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-12 16:35:42 +01:00
David Baker	8f10ee01c6	Implement always-on-screen capability for widgets ... As per https://github.com/matrix-org/matrix-doc/issues/1354 This is whitelisted to only jitsi widgets for now as per comment, mostly because any widget that we may make always-on-screen we need to preemptively put in a PersistedElement container, which is unnecessary for any other widget. Apologies that this does a bunch of refactoring which could have been split out separately: I only discovered what needed to be refactored in the process of doing this. Fixes https://github.com/vector-im/riot-web/issues/6984	2018-07-11 18:07:32 +01:00
Michael Telatynski	b4bc09c335	null-guard savedState since now we're accessing its props ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 17:13:33 +01:00
Michael Telatynski	3e05bf19c5	hide autocomplete when moving caret to match existing behaviour ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 16:30:45 +01:00
Michael Telatynski	95909de446	fix MessageComposer not marking translatable strings. run gen-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 11:39:55 +01:00
Michael Telatynski	c3aef6e3a0	workaround for tommoor/slate-md-serializer#14 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 10:29:14 +01:00
Michael Telatynski	fd4f9679df	convert md<->rt if the stored editorState was in a different state ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 09:43:39 +01:00
Bruno Windels	3e14cd2190	Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling ... fix nullguard on EventTile, getComponent never returns falsey, it throws	2018-07-11 09:12:49 +01:00
Michael Telatynski	abbb69dc36	fix fn call, fixes usage of SlashCommands ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 17:35:13 +01:00
David Baker	25e453badd	Fix stickerpicker PersistedElement usage ... Earlier PR changed the prop to persistKey in PersistedElement but containerId here, so this was ending up as 'undefined'.	2018-07-10 17:32:17 +01:00
Michael Telatynski	100ecfe7ce	remove trailing spaces to make linter happy (no-trailing-spaces) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 10:29:52 +01:00
Michael Telatynski	58301e5dd4	navigateHistory only when at edges of document, to prevent Firefox bug ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 10:28:17 +01:00
Matthew Hodgson	51591a4d62	fix lint	2018-07-09 20:49:31 +01:00
Matthew Hodgson	ffec1b5a95	fix lint	2018-07-09 20:11:17 +01:00
Matthew Hodgson	0d0934add7	unbreak modifier+space (e.g. emoji insert on macOS) ... (cherry picked from commit c490f87) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:58:04 +01:00
Matthew Hodgson	021409aafe	apply review feedback from @lukebarnard1 ... (cherry picked from commit 37d4bce) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:54:57 +01:00
Michael Telatynski	5b74c615ae	add missing import ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 47b6099) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:42:57 +01:00
Michael Telatynski	43204ea177	fix Control-Backspace after select-all ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 0f32ec0) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:42:10 +01:00
Michael Telatynski	faf17f06c6	remove debugger statement ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit b6f7940) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:36 +01:00
Michael Telatynski	483116fb03	add rule to slate-md-serializer: make underlined and removed work for CM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit b521efd) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:29 +01:00
Michael Telatynski	372fa29ad3	take edge into consideration when moving focus region on arrow keys ... fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 0982617) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:20 +01:00
Michael Telatynski	c6837af398	import-type Change from slate ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 85ed499) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:00 +01:00
Matthew Hodgson	efdc5430d7	merge develop	2018-07-09 17:50:07 +01:00
Will Hunt	a6cff4a969	Show server bans in the timeline	2018-07-06 11:06:31 +01:00
David Baker	b6f854abe4	Simplify event name as it's the only one	2018-07-05 20:00:42 +01:00
David Baker	eb552e5cef	Just pass the roomId into WidgetEchoStore	2018-07-05 18:43:20 +01:00
Michael Telatynski	168edbca16	Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist	2018-07-04 11:21:16 +01:00
David Baker	ad35fbf208	Pull out z-index to the sticker picker ... As it's not a thing that's necessary for other PersistedElements, only the sticker picker because it has to sit above the ContextMenu it sits in.	2018-07-03 18:25:33 +01:00
David Baker	3f88721bc1	Give PersistedElement a key ... So there can be more than one on a page	2018-07-03 14:43:27 +01:00
David Baker	8b64ddcbe8	Do some level of local echo for widgets ... * Show a spinner while we wait for widgets to be deleted * Hide widgets while they're pending deletion * Don't put another jitsi widget into the room if there's already one pending	2018-07-03 11:16:44 +01:00
Michael Telatynski	37a8e7f2e2	add setting to throw new RoomSubList hide behaviour behind an opt-in ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-30 17:07:28 +01:00
Michael Telatynski	ea6e1b6f72	Merge branch 'develop' into t3chguy/warn_self_mute	2018-06-29 19:17:43 +01:00
Michael Telatynski	85a0736c78	update wording as per D4ve's feedback ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 19:16:56 +01:00
Michael Telatynski	322b77b57f	don't throw, console.warn + dummy render instead ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 12:54:36 +01:00
Michael Telatynski	55f4f1723d	fix nullguard on EventTile, getComponent never returns falsey, it throws ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-27 11:44:11 +01:00
David Baker	67dc8f2a8e	Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist ... fix historical section	2018-06-26 18:26:29 +01:00
David Baker	fddb576c3a	Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize ... Fix RoomSubList headers by re-commiting 1faecfd	2018-06-26 18:23:38 +01:00
Michael Telatynski	f40802e9d8	Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop ... don't fire share dialog when clicking timestamp of event,	2018-06-26 17:46:52 +01:00
Michael Telatynski	67f803bc5f	don't fire share dialog when clicking timestamp of event, ... it was tripping people up and broke search permalinks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-26 16:59:49 +01:00
David Baker	0ee8d18f5a	More code de-duping	2018-06-26 16:41:44 +01:00
David Baker	6cf11a15e6	Move WidgetUtils to utils dir	2018-06-26 11:59:16 +01:00
David Baker	0f2c47937c	Merge the two different widget utils files	2018-06-26 11:52:21 +01:00
Michael Telatynski	f5519c21b9	Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/i18n/strings/en_EN.json	2018-06-26 07:51:16 +01:00
Michael Telatynski	9b50daa748	give Historical an emptyContent to make it look more consistent ... and also to unbreak it since now !emptyContent get hidden Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-26 07:46:33 +01:00
Luke Barnard	e292ee942f	Fix RoomSubList headers by re-commiting 1faecfd ... The original got reverted in ebfafb36 somehow.	2018-06-25 16:37:45 +01:00
Luke Barnard	a24cb8e678	Merge pull request #2008 from matrix-org/t3chguy/focus_composer ... fix instances of composer not getting/regaining focus	2018-06-25 10:22:29 +01:00
Luke Barnard	383dccebb4	Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes ... notif panel fixes	2018-06-25 09:53:24 +01:00
Michael Telatynski	e1ba6949d0	expand composer input focus region and apply cursor:text to it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 16:40:53 +01:00
Will Hunt	541f1d71fb	Move upload verification logic to RoomView. ... Improve upload dialog ux	2018-06-23 14:28:39 +01:00
Will Hunt	caf2086585	Restructure limits to be set at RoomView, so they may change if the ... upload fails	2018-06-23 13:00:56 +01:00
Will Hunt	76f0f15e49	Fix nitpicks	2018-06-23 13:00:56 +01:00
Will Hunt	7c0811dd92	size > upload_size as per spec feedback	2018-06-23 13:00:56 +01:00
Will Hunt	0fad90eb43	Linting	2018-06-23 13:00:56 +01:00
Will Hunt	c99f5c0df8	Check upload limits before trying to upload large files	2018-06-23 13:00:56 +01:00
Michael Telatynski	aff2cc9065	EventTile:notif apply EmojiText to room name ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 01:21:42 +01:00
David Baker	6252f5b818	Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget	2018-06-22 11:31:54 +01:00
David Baker	a6d9c25b70	Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands ... refactor, consolidate and improve SlashCommands	2018-06-20 13:56:29 +01:00
David Baker	e67dae704a	Take replies out of labs!	2018-06-20 09:57:11 +01:00
Michael Telatynski	85ddc0651b	consolidate the two locations commands are defined, as it was a MESS ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-18 19:34:40 +01:00
Luke Barnard	bea52eccf8	Remove unused import, constant	2018-06-18 17:40:48 +01:00
Michael Telatynski	e0d36b18c9	make RoomTile context menu appear where you right clicked instead ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-18 12:08:47 +01:00
Michael Telatynski	1a236499b1	fix import ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-18 11:54:06 +01:00
Michael Telatynski	4fdb64a049	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 09:10:13 +01:00
Michael Telatynski	8fa96e19d5	allow rightclicking for exposing room tile context menus ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-16 09:07:16 +01:00
Michael Telatynski	df15841483	split too long line ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-15 19:28:23 +01:00
Michael Telatynski	b97aa77aca	factor out warn self demote and apply to muting yourself ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-15 19:27:23 +01:00
David Baker	8cf17a66e5	Very basic Jitsi integration ... Replaces the conference calling by adding a Jitsi widget. No support for continuing the call on room change currently, so hidden behind a feature flag. Existing behaviour is preserved by default.	2018-06-15 15:12:32 +01:00
David Baker	6904c2bafe	Merge pull request #1948 from matrix-org/export_Group ... Share Dialog	2018-06-15 10:52:27 +01:00
Luke Barnard	e81edd958b	Merge pull request #1950 from matrix-org/t3chguy/group_invite_contextmenu ... make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile	2018-06-14 17:32:24 +01:00
Michael Telatynski	3b141d7a84	change variable names for clarity ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 16:48:00 +01:00
Michael Telatynski	1346f47a12	allow filtering Group Invite Tiles with the same search filter ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 14:18:39 +01:00
Michael Telatynski	7d7a6f3d9c	ShareDialog share Message, link to timestamp and permalink in ctx menu ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-14 13:35:35 +01:00
David Baker	666d469222	Revert "Fix exception when opening dev tools"	2018-06-14 10:52:39 +01:00
David Baker	5804040a9b	Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock ... fix message appears unencrypted while encrypting and not_sent	2018-06-14 10:49:14 +01:00
David Baker	bb99950216	Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception ... Fix exception when opening dev tools	2018-06-14 09:45:19 +01:00
David Baker	038b43aabd	Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker ... show redacted stickers like other redacted messages	2018-06-13 17:28:22 +01:00
David Baker	b81e12e4cc	Fix exception when opening dev tools ... Apparently draft sometimes gets unhappy when you try to move to the end of an empty state, so only move to the end if we actually created a non-empty state. This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890 is merged, but I have the fix now, and this is probably otherwise going to annoy me now I'm doing things where devtools is very useful. Fixes https://github.com/vector-im/riot-web/issues/6436	2018-06-13 16:55:16 +01:00
Michael Telatynski	5cc2361737	change not_sent e2e lock to match colour of text ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 15:52:50 +01:00
Michael Telatynski	d4b2f06a63	fix message appears unencrypted while in flight ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 13:51:04 +01:00
Michael Telatynski	846c14062a	show redacted stickers like other redacted messages ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-13 09:28:35 +01:00
Michael Telatynski	ed779cabc4	add mx_filterFlipColor to mx_MemberInfo_cancel img ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 15:35:06 +01:00
Michael Telatynski	c820836bcc	make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 15:23:11 +01:00
Michael Telatynski	7f1ce52dd3	link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-12 11:22:01 +01:00
David Baker	8dce276e5b	Merge pull request #1933 from turt2live/travis/pin-cosmetics ... Pinned message cosmetic improvements	2018-06-08 16:46:33 +01:00
Michael Telatynski	96ec3ab78a	Merge pull request #1934 from turt2live/travis/realtime-pins ... Update pinned messages in real time	2018-05-27 17:50:23 +01:00
Travis Ralston	929da30df8	onEvent -> onStateEvent ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-27 10:28:47 -06:00
Travis Ralston	ec53b5f5ab	Expose at-room power level setting ... Fixes https://github.com/vector-im/riot-web/issues/5835 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 21:22:42 -06:00
Travis Ralston	53396ff38d	Show timestamp of pinned messages on hover ... Addresses part of https://github.com/vector-im/riot-web/issues/5405 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 19:46:11 -06:00
Travis Ralston	085271a864	Update pinned messages in real time ... Fixes https://github.com/vector-im/riot-web/issues/5358 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 19:18:35 -06:00
Travis Ralston	033c41a2a8	Align pinned message contents and reduce image size ... Fixes https://github.com/vector-im/riot-web/issues/5421 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 18:40:48 -06:00
Travis Ralston	62f4cfe734	Don't affect avatars in pinned message contents ... This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-26 18:21:24 -06:00
Matthew Hodgson	6299e188a4	unbreak keyboard shortcuts & ctrl-backspace	2018-05-26 02:11:20 +01:00
Matthew Hodgson	ab41212258	fix double-nested code blocks & bump md-serializer	2018-05-26 00:37:21 +01:00
Matthew Hodgson	3bf28a08ec	experiments in dharma	2018-05-25 03:17:29 +01:00
Matthew Hodgson	cc79384839	fix https://github.com/vector-im/riot-web/issues/6643	2018-05-24 01:57:22 +01:00
Matthew Hodgson	864a33f978	switch to using 'code' for both blocks & marks to match md-serializer	2018-05-23 20:12:13 +01:00
Matthew Hodgson	b0ff61f7ef	switch code schema to match slate-md-serializer	2018-05-23 14:12:08 +01:00
Matthew Hodgson	fc1c4996fc	slate-md-serializer 3.1.0 now escapes correctly	2018-05-23 02:15:34 +01:00
Matthew Hodgson	6fba8311f9	escape blockquotes correctly ... and fix NPE	2018-05-23 02:09:37 +01:00
Matthew Hodgson	794a60b9f8	refocus editor immediately after executing commands ... and persist selections correctly across blur/focus	2018-05-23 01:36:21 +01:00
Matthew Hodgson	e7a4ffaf45	fix emojioneifying autoconverted emoji	2018-05-23 00:52:00 +01:00
Matthew Hodgson	cace5e8bfc	fix bug where selection breaks after inserting emoji	2018-05-23 00:41:46 +01:00
Luke Barnard	c47c7b8d98	Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users ... improve privileged section users in room settings	2018-05-22 16:07:01 +01:00
Matthew Hodgson	11cea61661	refocus editor after clicking on autocompletes	2018-05-21 12:28:08 +01:00
Matthew Hodgson	7de45f8b7b	make quoting work	2018-05-21 03:48:59 +01:00
Matthew Hodgson	b616fd025e	comment out all the tests for now	2018-05-20 23:34:06 +01:00
Matthew Hodgson	e460cf35e0	hide formatting bar for MD editor	2018-05-20 22:48:40 +01:00
Matthew Hodgson	f981d7b729	unify buttons on the node type names, and make them work	2018-05-20 22:39:40 +01:00
Matthew Hodgson	d799b7e424	refactor roundtripping into a single place ... and fix isRichTextEnabled to be correctly camelCased everywhere...	2018-05-20 16:30:39 +01:00
Matthew Hodgson	aac6866779	switch back to using commonmark for serialising MD when roundtripping ... and escape MD correctly when serialising via slate-md-serializer	2018-05-20 14:33:14 +01:00
Matthew Hodgson	e9cabf0e85	add pill and emoji serialisation to Md	2018-05-20 03:17:51 +01:00
Matthew Hodgson	a0d88a829d	support sending inlines from the RTE. ... includes a horrific hack for sending emoji until https://github.com/ianstormtaylor/slate/pull/1854 is merged or otherwise solved	2018-05-20 02:53:32 +01:00
Matthew Hodgson	d76a2aba9b	use <p/> as our root node everywhere and fix blank roundtrip bug	2018-05-20 01:07:25 +01:00
Matthew Hodgson	c3a6a41e5d	support links in RTE	2018-05-20 00:49:29 +01:00
Matthew Hodgson	f2116943c8	switch schema to match the MD serializer	2018-05-20 00:17:11 +01:00
Matthew Hodgson	65f0b05719	fix typo	2018-05-19 23:40:22 +01:00
Matthew Hodgson	572a31334f	add h4, h5 and h6	2018-05-19 23:34:30 +01:00
Matthew Hodgson	1f05aea884	make HTML pasting work	2018-05-19 23:33:07 +01:00
Matthew Hodgson	1536ab433a	make file pasting work again	2018-05-19 22:05:31 +01:00
Matthew Hodgson	d426c3474f	fix strikethough & code, improve shift-return & backspace	2018-05-19 21:36:22 +01:00
Matthew Hodgson	58670cc3e5	exit list more sanely on backspace	2018-05-19 21:14:39 +01:00
Matthew Hodgson	a4d9338cf0	let backspace delete list nodes in RTE	2018-05-19 20:38:07 +01:00
Matthew Hodgson	167742d900	make RTE sending work	2018-05-19 20:28:38 +01:00
Matthew Hodgson	089ac337f4	remove unused html serializer	2018-05-18 15:22:24 +01:00
Matthew Hodgson	e51554c626	actually hook up RTE	2018-05-17 02:13:17 +01:00
Matthew Hodgson	ae208da805	nudge towards supporting formatting buttons in MD	2018-05-17 00:01:23 +01:00
Matthew Hodgson	4eb6942211	let onChange set originalEditorState	2018-05-15 01:16:06 +01:00
Matthew Hodgson	b60ccad29b	Merge branch 'develop' into matthew/slate	2018-05-15 01:00:07 +01:00
Matthew Hodgson	12a56e8b8e	remove spurious comment	2018-05-15 00:59:55 +01:00
David Baker	7588d4380c	Merge branch 'release-v0.12.4' into develop	2018-05-14 17:27:01 +01:00
Luke Barnard	e0236c3d3e	Fix issue with sticker picker rendering off-screen ... when the RightPanel is collapsed on a small monitor and the sticker picker is opened.	2018-05-14 17:12:45 +01:00
Luke Barnard	3761cd4054	When panels are shown/hidden, hide sticker picker	2018-05-14 16:35:12 +01:00
Michael Telatynski	a88cbef331	tidy and switch to lexicographic sorting ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-14 16:22:28 +01:00
Michael Telatynski	5ef0eece9a	refactor and sort ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-14 16:09:22 +01:00
Luke Barnard	49a3770e92	Merge branch 'release-v0.12.4' into develop	2018-05-14 14:31:18 +01:00
Richard Lewis	dddd1c43cc	Remove redundant logging (currently shown on every render when no stickerpicker is present).	2018-05-14 14:23:26 +01:00
Richard Lewis	986fb3237d	Remove redundant logging (currently shown on every render when no stickerpicker is present).	2018-05-14 13:56:39 +01:00
Luke Barnard	98c06315cf	Update widget state when account data changes	2018-05-14 11:14:49 +01:00
Matthew Hodgson	c1000a7cd5	emojioneify the composer ... and also fix up the selectedness CSS for pills and emoji	2018-05-14 03:02:12 +01:00
Matthew Hodgson	7ecb4e3b18	remove dead removeMDLinks code	2018-05-13 23:35:39 +01:00
Matthew Hodgson	7405b49b44	unify setState() and onChange() ... also make emoji autocomplete work again also remove the onInputContentChanged prop also slateify the onInputStateChanged prop	2018-05-13 23:34:00 +01:00
Matthew Hodgson	a247ea2f77	delete duplicate propTypes(!!!)	2018-05-13 22:43:20 +01:00
Matthew Hodgson	ddfe0691c4	fix insert_mention	2018-05-13 22:41:39 +01:00
Matthew Hodgson	dd0726f068	fix navigating history downwards on tall messages; remove obsolete code	2018-05-13 21:17:43 +01:00
Matthew Hodgson	721410b710	Merge branch 'develop' into matthew/slate	2018-05-13 19:50:55 +01:00
Matthew Hodgson	79f7c5d6ab	remove // support, as it never worked ... if you want to escape a /, do it with \/ or just precede with a space	2018-05-13 03:29:56 +01:00
Matthew Hodgson	4c3588d260	don't lose focus after a / command	2018-05-13 03:26:22 +01:00
Matthew Hodgson	5605439e76	autocomplete polishing ... * suppress autocomplete when navigating through history * only search for slashcommands if in the first block of the editor * handle suffix returns from providers correctly * fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor	2018-05-13 03:17:14 +01:00
Matthew Hodgson	877a6195ae	unbreak history scrolling for pills & emoji	2018-05-13 00:54:01 +01:00
Matthew Hodgson	33eaa84bdf	fix NPEs when deleting mentions	2018-05-13 00:48:52 +01:00
Matthew Hodgson	c91dcffe82	fix cursor behaviour around pills	2018-05-13 00:40:54 +01:00
Travis Ralston	9e11720191	Add setting to enable widget screenshots (if widgets declare support) ... Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708 Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-05-12 14:30:59 -06:00
Matthew Hodgson	9c0c806af4	correctly send pills in messages	2018-05-12 20:04:58 +01:00
Matthew Hodgson	d7c2c8ba7b	include the plaintext representation of a pill within it	2018-05-12 16:21:36 +01:00
Matthew Hodgson	410a1683fe	make autocomplete selection work	2018-05-12 01:10:38 +01:00
Luke Barnard	9c5c5e282b	Send visibility only when changed, and messaging is available	2018-05-11 18:20:23 +01:00
Luke Barnard	06919e22d6	When stickerpicker made visible, send visibility over postMessage	2018-05-11 18:20:00 +01:00
Luke Barnard	42c59b5923	Make AppTile in Stickerpicker persistent using PersistedElement	2018-05-11 18:17:48 +01:00
Luke Barnard	2d2b529f80	Use new ContextualMenu component in Stickerpicker	2018-05-11 18:17:35 +01:00
Luke Barnard	06898394eb	Send visibility only when changed, and messaging is available	2018-05-11 18:06:58 +01:00
Luke Barnard	8b049b2182	When stickerpicker made visible, send visibility over postMessage	2018-05-11 16:51:03 +01:00
Luke Barnard	746eeee33c	Make AppTile in Stickerpicker persistent using PersistedElement	2018-05-11 15:07:51 +01:00
Luke Barnard	2dc51c516c	Use new ContextualMenu component in Stickerpicker	2018-05-11 14:47:57 +01:00
Luke Barnard	0a326dc6a0	Take feature_sticker_messagse out of labs	2018-05-09 17:28:29 +01:00
Luke Barnard	7d0406b430	Merge pull request #1883 from matrix-org/luke/cement-sticker-messages ... Take feature_sticker_messagse out of labs	2018-05-09 16:52:20 +01:00
Luke Barnard	e10e659457	Take feature_sticker_messagse out of labs	2018-05-09 14:59:35 +01:00
Richard Lewis	8e1ba6d139	Always allow users to edit their user widgets.	2018-05-08 22:44:49 +01:00
Richard Lewis	b5320444a9	Fix current user and creator user ID properties.	2018-05-08 22:05:53 +01:00
Matthew Hodgson	8b2eb2c400	make history work again	2018-05-08 01:54:06 +01:00
Matthew Hodgson	ff42ef4a58	make it work for MD mode (modulo history)	2018-05-06 22:08:36 +01:00
Michael Telatynski	f0b7fd58b9	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-06 19:28:18 +01:00
Michael Telatynski	f68036a4fb	Replies: un-break click-to-mention on SenderProfile for reply&preview ... Fixes #6670 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-06 19:18:41 +01:00
Matthew Hodgson	190f6d9483	make slate actually work as a textarea	2018-05-06 15:27:27 +01:00
Matthew Hodgson	a2233a48c2	stub out yet more	2018-05-06 01:18:26 +01:00
Matthew Hodgson	05eba3fa32	stub out more until it loads...	2018-05-06 00:18:11 +01:00
Matthew Hodgson	f4ed820b6f	fix stubbing	2018-05-05 23:38:14 +01:00
Matthew Hodgson	e62e43def6	comment out more draft stuff	2018-05-05 23:25:04 +01:00
Matthew Hodgson	02947063d3	Merge branch 'develop' into matthew/slate	2018-05-05 22:45:44 +01:00
Michael Telatynski	71a12b6bbb	fix getDefaultProps mixup ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-03 11:23:41 +01:00
Michael Telatynski	f2102e283c	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-05-02 13:08:38 +01:00
Michael Telatynski	ec4ec4717d	clean up EventTile:onWidgetLoad optional/required mess ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-01 18:15:12 +01:00
Michael Telatynski	db55f87699	avoid .done and .then anti-pattern ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-05-01 18:14:35 +01:00
Luke Barnard	4d8394954c	Only create one group store listener in RoomList ... Instead of creating several and destroying the reference to the one created before.	2018-05-01 14:24:58 +01:00
Luke Barnard	6ec9e5f670	Merge pull request #1866 from matrix-org/luke/luke/group-store-refactor ... Refactor GroupStores into one global GroupStore	2018-05-01 12:33:06 +01:00
Luke Barnard	28e8ce967f	Correctly unregister group store listener when unmounting RoomList	2018-05-01 11:38:57 +01:00
Luke Barnard	023daef4b7	Refactor GroupStores into one global GroupStore ... Take a step closer to a flux-like architecture for group data, for the purposes of providing features that require it. Now the app has a single GroupStore that can be poked to fetch updates for a particular group.	2018-05-01 11:24:17 +01:00
Luke Barnard	22047d7e72	Merge pull request #1845 from kethinov/hide_encryption_icons ... Hide inline encryption icons except when hovering over a message	2018-04-30 17:57:22 +01:00
Eric Newport	e037cf0063	namespace CSS better and fix bug	2018-04-30 12:22:16 -04:00
Eric Newport	55566b35a2	convert attribute to class	2018-04-28 12:39:25 -04:00
Michael Telatynski	68dd57f56e	rename two methods ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-27 11:47:18 +01:00
Richard Lewis	b2d6dd8f6e	Optionally hide widget popout button.	2018-04-25 16:28:27 +01:00
Michael Telatynski	d680d805ce	Merge branch 'develop' into t3chguy/m.relates_to	2018-04-23 10:14:48 +01:00
Eric Newport	d42fa9d17a	Hide inline encryption icons except when hovering over a message ... Closes https://github.com/vector-im/riot-web/issues/2882 This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988) I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.	2018-04-22 22:30:37 -04:00
Matthew Hodgson	75a2be1a8d	WIP (doesn't build yet) replacing draft with slate	2018-04-23 01:13:18 +01:00
Aidan Gauland	6a918861bb	Add UI for displaying room avatars full size ... Change the onClick action on the RoomAvatar inside RoomHeader so that it brings up a lightbox with the full-size avatar.	2018-04-21 15:47:31 +12:00
Michael Telatynski	58cd585e86	start of BigMerge fixup ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-20 09:12:02 +01:00
Matthew Hodgson	4da804fd64	Merge branch 'develop' into matthew/fix_layering	2018-04-15 23:59:09 +01:00
Michael Telatynski	a90bd6cd4f	Allow collapsing ReplyThread from MessageContextMenu ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-13 12:28:58 +01:00
Michael Telatynski	8b1e411d6b	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-04-13 10:54:09 +01:00
Matthew Hodgson	40a67ca8fe	point imports at the new locations	2018-04-13 00:43:44 +01:00
Michael Telatynski	c77807bd22	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/i18n/strings/en_EN.json # src/i18n/strings/eu.json # src/i18n/strings/fr.json # src/i18n/strings/lv.json # src/i18n/strings/ru.json # src/i18n/strings/zh_Hant.json	2018-04-12 09:48:06 +01:00
Matthew Hodgson	8ab8f76254	move non-Riot-specific components over from riot-web	2018-04-11 23:58:04 +01:00
Travis Ralston	fe2cbc584d	Merge branch 'develop' into travis/remove-presence	2018-04-11 15:17:28 -06:00
Luke Barnard	ab578a5c0c	Merge pull request #1819 from pvagner/jump_to_first_unread_a11y ... TopUnreadMessagesBar a11y	2018-04-11 15:47:43 +01:00
Michael Telatynski	f765db7d16	only clear reply_to_event if there was one to begin with ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-07 12:18:53 +01:00
Luke Barnard	01dd494f50	Make stickers/messages continuations of each other	2018-04-06 17:47:44 +01:00
Luke Barnard	008572afe1	Revert "Handle non-m.room.message event types." ... This reverts commit f8d7ab10fa.	2018-04-06 16:42:59 +01:00
Richard Lewis	da6c2c51fb	Remove left and right menu padding	2018-04-04 13:38:48 +01:00
Michael Telatynski	9df2f7ddc8	Add warning to Upload Confirm prompt if replying, as can't reply with file ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-04 11:19:13 +01:00
Michael Telatynski	1d90835de0	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/RoomView.js	2018-04-04 11:08:34 +01:00
Michael Telatynski	9c2e3e25f0	clear reply_to_event at queue not send time ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-04-04 10:34:39 +01:00
Richard Lewis	f8f8bc469e	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot	2018-04-03 11:34:14 +01:00
Richard Lewis	b109c9304c	Put stickers behind labs flag.	2018-04-02 22:24:46 +01:00
Richard Lewis	8241afe87d	Fix content references	2018-04-02 20:25:24 +01:00
Richard Lewis	49bea1a35b	Move stickerpicker content out of state in to generator function.	2018-04-02 10:56:45 +01:00
Richard Lewis	d83b6f1cf8	Use AccessibleButton.	2018-04-02 10:18:35 +01:00
Peter Vágner	778ebe63ff	TopUnreadMessagesBar: turn clickables into accessible buttons and fix ... over verbosity for the accessible name.	2018-03-31 17:42:10 +02:00
Richard Lewis	557a45e890	Remove inline styling.	2018-03-29 22:22:57 +01:00
Richard Lewis	9cc3d3c9bb	Move default sticker content into generator function.	2018-03-29 21:48:03 +01:00
Richard Lewis	003cf61388	Handle remove sticker picker errors.	2018-03-29 21:16:35 +01:00
Richard Lewis	6181ca642f	"Stickerpack" translation.	2018-03-29 17:47:53 +01:00
Richard Lewis	c8f9586c9b	Check for valid reference.	2018-03-29 17:35:21 +01:00
Richard Lewis	67f755efcb	Comment.	2018-03-29 17:26:54 +01:00
Richard Lewis	e21cc14e5b	Comment.	2018-03-29 17:26:19 +01:00
Richard Lewis	38c8bc7d9a	Consistent function naming.	2018-03-29 17:25:07 +01:00
Michael Telatynski	fac89d9c58	Merge branch 'develop' into t3chguy/m.relates_to	2018-03-28 08:38:33 +00:00
Luke Barnard	39e9d52c04	Make sure to proxy special prop ref	2018-03-27 13:04:26 +01:00
Luke Barnard	b80568b1c5	Wrap GeminiScrollbar in a component, enabled forceGemini ... Fixes https://github.com/vector-im/riot-web/issues/6294	2018-03-27 13:04:26 +01:00
David Baker	0a920ae801	Indenting fix	2018-03-26 13:33:47 +01:00
Michael Telatynski	b5ed08eba2	Merge ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-24 17:52:49 +00:00
Aidan Gauland	3d4feac75b	Don't try to show unset display name ... In the ReadReceiptMarker title, show the display name only when it is not the same as the user ID.	2018-03-23 17:18:44 +13:00
Aidan Gauland	7e1913ef3c	Merge branch 'develop' into show-display-name-in-receipts	2018-03-23 15:51:10 +13:00
David Baker	e06783c5c7	Fix PresenceLabel in MemberInfo ... Which crashing when clicking on a member if presence was still enabled.	2018-03-21 12:45:09 +00:00
Luke Barnard	856c499541	Fix room tile badge not disappearing when receiving a read receipt ... Fixes https://github.com/vector-im/riot-web/issues/6357	2018-03-20 17:19:49 +00:00
David Baker	31b772997e	Option to remove the presence feature by HS ... Adds a config option that disables showing presence for certain HS URLs, so we can disable it on matrix.org where the feature is turned off.	2018-03-19 16:47:12 +00:00
Michael Telatynski	0ed3563748	clear quoting event even on send fail, as then we can click retry ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-16 00:03:50 +01:00
Luke Barnard	8672b97f9a	Improve room list performance when receiving messages ... In summary this makes RoomTiles (and RoomAvatars) do more for themselves in terms of reacting individually to state changes in the js-sdk. Instead of force updating the entire room list for avatar changes and room name changes, do this in the RoomTile and RoomAvatar instead. This increases the number of listeners listening to the matrix client, but allows us to properly implement a shouldComponentUpdate for RoomTile (because the avatar, name and notification count are now in component state)	2018-03-14 14:29:55 +00:00
Richard Lewis	b2d23b6999	Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities.	2018-03-12 13:56:02 +00:00
Michael Telatynski	14f29e4740	fix the bugs Tulir found - THANKS ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-09 23:37:42 +00:00
Richard Lewis	e36ae3cede	Fix context menu offset.	2018-03-08 17:33:07 +00:00
Richard Lewis	3ab8b1f866	Hide sticker picker delete button and show minimise button.	2018-03-08 17:20:42 +00:00
Luke Barnard	a1d0cf65d6	Fix missing space between "...is a" and user ID	2018-03-08 16:34:19 +00:00
Luke Barnard	5148ca1a88	Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button ... E2E "fudge-button"	2018-03-08 15:07:58 +00:00
Luke Barnard	3a3cced905	E2E "fudge-button" ... Implement a UI to expose a JS-SDK API for cancelling and resending a room key request for an event. This is useful in scenarios where the user has dismissed the request on their other devices and would like to send the restart the verification dance manually. Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624	2018-03-08 14:13:33 +00:00
Richard Lewis	7f91b47598	Move sticker picker icon.	2018-03-07 11:52:42 +00:00
Richard Lewis	e2cedbe9d7	Pull in changes from develop	2018-03-05 16:43:59 +00:00
Luke Barnard	a95f6a9804	Implement transparent RoomTile for use in some places ... where a transparent appearance is required (i.e. in MemberInfo or ChatCreateOrReuseDialog)	2018-03-05 12:36:02 +00:00
Michael Telatynski	df56a67fda	Add reply fallback and run gen-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-03-04 12:39:34 +00:00
Luke Barnard	d3dc2a33b4	Fix bug preventing setting room power levels ... - don't use refs, use onChange of PowerSelector - store power levels as state in the RoomSetting component	2018-02-28 16:32:20 +00:00
Luke Barnard	9a72e69a43	Handle lack of room directory visibility response	2018-02-28 16:14:18 +00:00
Luke Barnard	dd529791fb	Remove unused prop	2018-02-28 16:13:01 +00:00
Richard Lewis	57c98d96a5	Update widget type.	2018-02-27 13:40:21 +00:00
Richard Lewis	ef4d13715a	Wrap menu close in timeout to avoid element disappearing unexpectedly.	2018-02-27 11:29:14 +00:00
Richard Lewis	8e7564b9a3	Wrap the close menu trigger in a timeout	2018-02-26 17:47:52 +00:00
Richard Lewis	b64736aa44	Add listener to close stickerpicker.	2018-02-26 13:43:16 +00:00
Richard Lewis	e249e3d622	Correct stickerpicker naming,	2018-02-25 22:10:38 +00:00
Richard Lewis	86461bc88f	Disable all widget assets on widget removal.	2018-02-24 00:10:28 +00:00
Richard Lewis	332892fee6	Pull in changes from develop	2018-02-23 17:30:42 +00:00
Matthew Hodgson	3552800d19	Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg ... Give emptySubListTip a container for correct bg colour	2018-02-23 16:36:10 +00:00
Richard Lewis	b2bf4d4709	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot	2018-02-23 15:37:33 +00:00
Richard Lewis	9b667f2c38	Reduce logging.	2018-02-23 15:26:47 +00:00
Richard Lewis	88288ff3f5	Add error handling for failure to connect to integration manager.	2018-02-23 10:20:16 +00:00
Richard Lewis	9a5c916570	Close modal on integration manager launch.	2018-02-22 15:36:01 +00:00
Richard Lewis	ce560c577f	Fix link spacing	2018-02-22 15:20:51 +00:00
Michael Telatynski	665ddccb0d	restrict to m.text for now ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-20 15:45:25 +00:00
Michael Telatynski	90f9badbf3	s/Reply/ReplyThread/ ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-20 15:40:19 +00:00
David Baker	fd90a8b23c	Merge pull request #1756 from matrix-org/luke/fix-recent-ordering ... Make RoomListStore aware of Room.timeline events	2018-02-20 10:17:16 +00:00
Michael Telatynski	34b427d15e	s/quote_event/reply_to_event/ ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-19 23:41:07 +00:00
Michael Telatynski	f1a3592eff	fix 12/24h in Reply/ReplyPreview ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-16 21:14:03 +00:00
Michael Telatynski	cb293a852d	reply and reply_preview only differ in whether they contain <Reply /> ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-16 21:07:25 +00:00
Michael Telatynski	8062494692	show replies in ReplyPreview ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-16 20:58:39 +00:00
Travis Ralston	cbeee72062	Don't show empty custom tags when filtering tags ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2018-02-16 10:11:04 -07:00
Michael Telatynski	2e3cbb309e	Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to	2018-02-16 14:35:04 +00:00
Luke Barnard	94a0a90457	Make RoomListStore aware of Room.timeline events ... so that we can do reorderings of lists ordered by most recent event. No optimisations here; we only update for timeline events on live timelines that could update the "unread count".	2018-02-16 14:16:50 +00:00
Luke Barnard	57419a7f8d	Give emptySubListTip a container for correct bg colour	2018-02-15 14:11:45 +00:00
David Baker	ceec405519	Remove RoomListStore listener ... This caused the the RoomList component to leak (although in practice only accross logins because that's the only time it's unmounted)	2018-02-15 11:23:00 +00:00
David Baker	46b8fb9a19	Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets ... Store component state for editors	2018-02-14 11:33:48 +00:00
Luke Barnard	8377abcd19	Store component state for editors ... to prevent a forceUpdate from /sync causing the editors to revert before the user had a chance to hit "Save". Part of fixing https://github.com/vector-im/riot-web/issues/6019	2018-02-13 12:01:36 +00:00
Luke Barnard	db0ea9eb0e	Merge branch 'develop' into luke/room-list-flux	2018-02-13 10:18:24 +00:00
Luke Barnard	7a4c1994c3	Use Boolean() instead of assuming filter is based on truthiness	2018-02-12 18:35:13 +00:00
Aidan Gauland	0fd9b3e9b2	Avoid doubling up username in read receipt view ... In the ReadReceiptMarker title, use the RoomMember.rawDisplayName because RoomMember.name may already include the username, which we are going to add ourselves.	2018-02-11 16:27:07 +13:00
Aidan Gauland	97ce84c8e3	Add display name to the read receipt view ... Show the user's display name (aka nick) in the ReadReceiptMarker title (mouseover text), and then the user ID in parentheses.	2018-02-11 16:14:17 +13:00
Michael Telatynski	fbb950e064	mass s/Quote/Reply ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 12:38:25 +00:00
Michael Telatynski	1c3d8cbe6e	initial refactor of Replies to use B explicit over-the-wire format ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-10 11:19:43 +00:00
Richard Lewis	55593416fa	Hide apps drawer when viewining room settings.	2018-02-09 13:23:34 +00:00
Richard Lewis	9e3c1fbc7a	Pass room name.	2018-02-09 11:44:27 +00:00
Richard Lewis	234ca8b062	Remove top padding from app tile.	2018-02-08 17:50:30 +00:00
Richard Lewis	5e30468a00	Linting	2018-02-07 14:48:43 +00:00
Richard Lewis	7b75dbbd15	Use default AppTile menu bar.	2018-02-07 14:44:01 +00:00
Richard Lewis	f3943bef51	Check for empty user widgets.	2018-02-07 10:05:50 +00:00
Richard Lewis	393236ba34	Update / remove stickerpacks	2018-02-07 09:23:00 +00:00
lukebarnard	feca1707f1	Remove a factor n complexity during room visibility calc	2018-02-06 09:55:58 +00:00
Luke Barnard	71aa4ee9e1	Merge pull request #1721 from matrix-org/t3chguy/composer_slashcmd_history ... Persist contentState when sending SlashCommand via MessageComposerInput	2018-02-06 09:14:36 +00:00
Richard Lewis	992c4771f4	Add button to remove all stickerpacks	2018-02-05 11:49:44 +00:00
Luke Barnard	ff8fcb3139	Merge branch 'develop' into luke/room-list-flux	2018-02-05 11:39:39 +00:00
David Baker	ec3a37d9f3	Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard ... guard against m.room.aliases events with no keys (redaction?)	2018-02-05 10:21:05 +00:00
David Baker	3275a56013	Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites ... Fix not showing Invited section if all invites are 3PID	2018-02-05 10:14:23 +00:00
David Baker	916ab68506	Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image ... Fix Rich Replies on files	2018-02-05 09:58:37 +00:00
Michael Telatynski	d1a24ac87b	guard against m.room.aliases events with no keys (redaction?) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-02-02 08:12:56 +00:00
lukebarnard	c5a3a02e1d	Fix order calculation logic when reordering a room	2018-01-30 10:14:05 +00:00
Michael Telatynski	5764280588	Persist contentState when sending SlashCommand via MessageComposerInput ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-29 09:09:22 +00:00
Michael Telatynski	56927b23e6	pass onWidgetLoad (which is required for SOME EventTileTypes) ... XXX: they should follow an interface, this is somewhat nasty Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-28 22:14:22 +00:00
lukebarnard	701abb6a21	Move management of room lists to RoomListStore ... this is part maintenance to make RoomList clearer and part allowing room list state to be modified via a dispatch.	2018-01-25 22:16:03 +01:00
lukebarnard	d0e3319bd9	Remove DragDropContext from TagPanel and RoomList ... So that we can have one context that can handle DND between the TagPanel and RoomList.	2018-01-25 22:05:20 +01:00
Michael Telatynski	56bd4b7d06	Fix not showing Invited section if all invites are 3PID ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-25 12:18:02 +00:00
Michael Telatynski	4490715b60	Merge branch 'develop' into t3chguy/rich_quoting_linear	2018-01-22 16:46:20 +00:00
Michael Telatynski	33995b053e	Add class to EventTile Line's that are quotes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-22 16:34:14 +00:00
Richard Lewis	0441487e97	Manage sticker packs link and add comments	2018-01-22 17:00:50 +01:00
Luke Barnard	a8320fe7e2	Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd ... Swap RoomList to react-beautiful-dnd	2018-01-19 14:49:49 +00:00
lukebarnard	6106b3ce44	newOrder defaults null, allows check for newOrder on line 357	2018-01-19 14:12:27 +00:00
lukebarnard	54f6d305d7	Null-guard for newTag	2018-01-19 14:11:05 +00:00
lukebarnard	6f0d799912	Fix indentation	2018-01-18 18:15:34 +00:00
lukebarnard	59f4661bfd	Add comment	2018-01-18 18:01:31 +00:00
lukebarnard	dfecad181a	Swap RoomList to react-beautiful-dnd	2018-01-18 17:59:29 +00:00
Matthew Hodgson	d3292d9388	fix typos and NPE. fixes #5999	2018-01-17 23:28:14 +00:00
Richard Lewis	f8d7ab10fa	Handle non-m.room.message event types.	2018-01-17 17:19:20 +00:00
Richard Lewis	b6f85fbf92	Don't treat sticker messages as info messages.	2018-01-17 16:52:10 +00:00
Richard Lewis	aa524c339d	Update class names.	2018-01-17 15:49:36 +00:00
Richard Lewis	fa336b7a99	Bring hide stickers icon to front when menu open.	2018-01-17 15:41:15 +00:00
Richard Lewis	5a4271268b	Keep reference to stickers menu	2018-01-17 15:40:47 +00:00
Richard Lewis	614a10c6d3	Add manage integration link.	2018-01-17 00:04:06 +00:00
Richard Lewis	86da204169	Add manage stickerpacks link	2018-01-16 23:25:07 +00:00
Richard Lewis	38ed01bebd	Pass room to stickerpack	2018-01-16 21:35:25 +00:00
Richard Lewis	7676fc0c10	Handle stickerpack close.	2018-01-16 21:28:15 +00:00
Richard Lewis	9339284090	Stickerpack content placeholder.	2018-01-16 21:06:57 +00:00
Richard Lewis	86542d86e9	Move stickers into stand-alone component.	2018-01-16 18:14:32 +00:00
Richard Lewis	87d8ed5af8	Add comment	2018-01-16 17:01:25 +00:00
Richard Lewis	82b9897986	Select apropriate theme colour for popover.	2018-01-15 18:27:14 +00:00
lukebarnard	408f13f68c	Only set selected tags state when updating rooms ... instead of every time we get an update from a GroupStore/otherwise. This was leading to many setStates and renders at startup when we receive many group /members /rooms etc. responses. Also, use the rate limited version of refreshRoomList.	2018-01-15 14:42:41 +00:00
Richard Lewis	5a9a4ead96	Remove arrow opacity.	2018-01-15 14:25:56 +00:00
Richard Lewis	5e6da4d758	* Fix key error ... * Remove redundant logging * Catch error	2018-01-15 14:22:41 +00:00
Richard Lewis	0fab905a2e	Cleanup styles.	2018-01-15 11:16:07 +00:00
Richard Lewis	351bbdfd4e	Styling	2018-01-15 10:25:19 +00:00
Richard Lewis	a3c6dd36ef	Stickers popover.	2018-01-12 17:38:21 +00:00
Michael Telatynski	23bd612730	Focus composer when clicking Reply (quote event) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-11 19:29:00 +00:00
Michael Telatynski	192cba2b79	allow text&onSenderProfileClick for tileShape===quote ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-11 19:25:43 +00:00
Richard Lewis	90b7cb3760	Consistent popover size	2018-01-11 13:41:55 +00:00
Richard Lewis	1ab71f6f50	Load stickers in AppTile	2018-01-11 13:20:58 +00:00
Richard Lewis	78bd25eff0	Sticker popover styling	2018-01-11 11:36:19 +00:00
Richard Lewis	2cf9da8c95	Load user stickerpacks	2018-01-11 11:12:46 +00:00
Richard Lewis	52f28d09e0	Stickerpack styling	2018-01-10 20:44:14 +00:00
Richard Lewis	2bb51bafe1	Content placeholder.	2018-01-10 20:29:36 +00:00
Richard Lewis	53b590f55e	Add stickers popover.	2018-01-10 20:27:43 +00:00
Michael Telatynski	94167e2b8b	Run gen-i18n.js and embed the ellipsis into the base string ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 12:52:20 +00:00
Michael Telatynski	e45fcf10c7	Refactor DateUtils to ES6 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-10 12:00:11 +00:00
Michael Telatynski	1bc9d344ae	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/messages/TextualBody.js	2018-01-10 11:54:58 +00:00
Richard Lewis	9abb160120	Replace apps button with stickers button in message composer.	2018-01-09 16:02:17 +00:00
Richard Lewis	5df9a01e64	Use m.room.sticker event.	2018-01-08 12:06:32 +00:00
David Baker	587a6f8e2b	Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected ... Improve performance of tag panel selection (when tags are selected)	2018-01-05 15:55:24 +00:00
lukebarnard	8ade357349	Handle newly added rooms and removed rooms.	2018-01-05 12:33:26 +00:00
Michael Telatynski	c61d09464a	Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self ... small refactor && warn on self-demotion	2018-01-05 12:18:15 +00:00
Michael Telatynski	a8bd4bf858	add comment ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-05 11:56:18 +00:00
David Baker	5aed77c752	Merge pull request #1677 from aidalgol/PropTypes ... Remove use of deprecated React.PropTypes	2018-01-05 11:53:55 +00:00
Michael Telatynski	a473971c7b	negate for less indentation ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-05 11:11:20 +00:00
lukebarnard	7606e60188	Merge branch 'develop' into luke/perf-tag-panel-selected	2018-01-05 10:26:03 +00:00
David Baker	c7accb732c	Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor ... make RoomDetailRow reusable for the Room Directory	2018-01-04 18:26:06 +00:00
lukebarnard	f1b60287fb	Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups	2018-01-04 17:56:34 +00:00
David Baker	b34f360f96	Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop ... Remove unused selectedRoom prop	2018-01-04 17:33:36 +00:00
David Baker	5961cf3958	Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click ... Fix shift and shift-ctrl click in TagPanel	2018-01-04 17:08:01 +00:00
Michael Telatynski	831a3f7e42	Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo	2018-01-04 16:41:16 +00:00
lukebarnard	2282f5c26f	Remove unused selectedRoom prop	2018-01-04 14:19:10 +00:00
lukebarnard	cdd1a57569	Calculate visible rooms when tags change ... instead of every time we getRoomLists	2018-01-04 11:50:33 +00:00
lukebarnard	5c5307c665	Improve performance of tag panel selection (when tags are selected) ... Deselecting all tags is now slightly less performant than selecting a tag but mostly due to the number of RoomTiles being rendered. Swapping between different tags (a supposed common use-case) feels much more spritely!	2018-01-03 17:12:31 +00:00
lukebarnard	2baacfa562	Handle case where ordering is not yet known	2018-01-03 14:12:28 +00:00
lukebarnard	a2bb240dcb	Fetch group data for all tags instead of those selected ... so that tag switching is not delayed by fetching group data, i.e group members and rooms.	2018-01-03 14:07:29 +00:00
lukebarnard	85cdd888e8	Combine TagOrderStore and FilterStore ... so that shift-click semantics can work. The store that computes the shift-click rules has to be aware of the actual order of tags displayed, so they must be done in the same store.	2018-01-03 11:33:59 +00:00
nostradamos	2189fe9256	removed console.log	2018-01-03 01:52:02 +01:00
nostradamos	e543f55572	refactored code	2018-01-03 01:50:03 +01:00
Michael Telatynski	f67d405732	small refactor && warn on self-demotion ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-01-02 23:15:36 +00:00
nostradamos	36df3acf4d	Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821	2018-01-02 23:07:47 +01:00
nostradamos	03f88df66e	Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821	2018-01-02 22:44:18 +01:00
lukebarnard	57fb09dfb7	Fix dodgy merge done in 874a7bf ... where develop branch should have been used for a chunk of code	2018-01-02 19:26:56 +00:00
lukebarnard	874a7bf1de	Merge branch 'develop' into luke/fix-room-list-group-store-leak	2018-01-02 16:19:37 +00:00
Aidan Gauland	35780f5ae0	Remove use of deprecated React.PropTypes ... Replace all uses of React.PropTypes with PropTypes and importing PropTypes from 'prop-types'.	2017-12-26 14:03:18 +13:00
Travis Ralston	cc5eb77658	Remove presence management ... The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time. This reverts two PRs: * https://github.com/matrix-org/matrix-react-sdk/pull/1620 * https://github.com/matrix-org/matrix-react-sdk/pull/1482 The changes to the context menu positioning were not reverted as they are useful outside of presence management. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-12-25 14:25:13 -07:00
Michael Telatynski	05434e782a	change Composer placeholder text based on replying/rich quoting state ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-18 19:49:38 +00:00
Travis Ralston	e5df0dcf1e	$riot_theme -> $theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-12-18 09:19:54 -07:00
Michael Telatynski	882068078d	fix missing space ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-17 20:53:53 +00:00
Michael Telatynski	9603b21199	s/Quote/Reply/ and ES6 tweaks ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-17 20:20:45 +00:00
Travis Ralston	94ef80c008	Support sending the current theme to widgets ... This is a namespaced variable because some clients may not be able to support themes, or may have varying definitions of what "light" means. Widgets are recommended to opt for per-client checks, or accept that some clients may differ. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-12-16 20:11:00 -07:00
Michael Telatynski	9baf71c4fc	only pass one child to EmojiText otherwise it cries ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-15 19:52:47 +00:00
Michael Telatynski	4043ea7d57	change CSS classes and i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-15 17:57:24 +00:00
Luke Barnard	adaea9ad5b	Merge pull request #1647 from matrix-org/luke/tag-panel-improve-performance ... Attempt to improve TagPanel performance	2017-12-15 17:38:15 +00:00
Luke Barnard	71740cc176	Merge branch 'develop' into luke/fix-room-list-group-store-leak	2017-12-15 17:36:36 +00:00
Luke Barnard	d292dab9c6	More doc	2017-12-15 17:30:21 +00:00
Luke Barnard	56affd3d42	Rename for clarity	2017-12-15 17:29:06 +00:00
Luke Barnard	d2066f41d5	Merge pull request #1656 from matrix-org/luke/fix-scroll-jump-on-message-decryption ... Fix one variant of a scroll jump that occurs when decrypting an m.text	2017-12-15 17:25:21 +00:00
Luke Barnard	653137f6ec	Update comment	2017-12-15 17:21:20 +00:00
Luke Barnard	961d5e1868	Split updatedSelectedTagsRooms ... because we don't need to get the rooms for all groups when the filtered tags change.	2017-12-15 14:23:35 +00:00
Luke Barnard	34e455c6fc	Fix leaking of GroupStore listeners in RoomList	2017-12-15 14:12:21 +00:00
Luke Barnard	7f551f517b	Add comments to _onDecrypted	2017-12-15 14:01:07 +00:00
Luke Barnard	a516c18cc5	Indicate event tile resize after rendering	2017-12-15 13:58:58 +00:00
Luke Barnard	df1134f092	Use "shared" DMRoomMap	2017-12-14 16:34:49 +00:00
Luke Barnard	3732fd29d5	Comments for instance variables	2017-12-14 16:17:06 +00:00
Michael Telatynski	5c229b9ef8	DRY matrix.to link generation so it is all changeable in one class ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-12 23:33:40 +00:00
Michael Telatynski	4666ac7c83	hide rich quoting behind flags, retaining original quoting for now ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-12 23:29:43 +00:00
Richard Lewis	c93266b6af	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar	2017-12-11 13:08:49 +00:00
Michael Telatynski	0f85391587	Implement Rich Quoting/Replies ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-12-10 12:50:41 +00:00
David Baker	0d38e7510d	Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show ... Don't Auto-show UnknownDeviceDialog	2017-12-08 16:33:25 +00:00
Richard Lewis	a9ae4be74c	Fix page title variable name.	2017-12-08 15:27:14 +00:00
Luke Barnard	196e1a4f66	Fix one variant of a scroll jump that occurs when decrypting an m.text	2017-12-08 15:25:14 +00:00
Richard Lewis	20917e1a07	Set page title from widget data, if available.	2017-12-08 15:12:48 +00:00
Richard Lewis	df438924a7	Remove logging.	2017-12-07 09:57:53 +00:00
Richard Lewis	e20db416f2	Add field to bypass riot widget loading screen.	2017-12-06 16:44:41 +00:00
Luke Barnard	aac5bcfe80	Attempt to improve TagPanel performance ... by only recalculating rooms to show (for a given group) when a group updates.	2017-12-05 11:25:30 +00:00
Luke Barnard	363fe04a10	isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent	2017-12-01 10:44:00 +00:00
Luke Barnard	fe81fcb8c6	Factor out isCtrlOrCmdKeyEvent, use that in TagPanel ... as opposed to the incorrect ctrl || meta	2017-12-01 10:30:49 +00:00
Luke Barnard	45bcb6f2ed	Implement TagPanel (or LeftLeftPanel) for group filtering ... This allows for filtering of the RoomList by group. When a group is selected, the room list will show: - Rooms in the group - Direct messages with members in the group A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.	2017-11-29 16:53:43 +00:00
David Baker	a784abd57f	Comment typo	2017-11-22 17:13:18 +00:00
Michael Telatynski	4d177626b5	init Linkify properly to make tests happy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 13:24:18 +00:00
Michael Telatynski	d943807ad1	remove unused imports ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 13:18:06 +00:00
Michael Telatynski	f0752572a7	make RoomDetailRow reusable for the Room Directory ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 12:49:26 +00:00
Stefan Parviainen	df921438f3	Make PresenceLabel more easily translatable ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-16 18:36:54 +01:00
David Baker	196eafdc7f	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-16 15:59:16 +00:00
Luke Barnard	b54e563cb6	Merge branch 'develop' into luke/linting-keyword-spacing	2017-11-16 13:23:42 +00:00
Luke Barnard	dad797d4a2	Run linting --fix	2017-11-16 13:19:36 +00:00
Luke Barnard	f99755378a	Merge pull request #1612 from matrix-org/t3chguy/state_events ... differentiate between state events and message events	2017-11-16 13:06:36 +00:00
Stefan Parviainen	2c1618bc10	Fix conflict and update strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-15 20:40:51 +01:00
Michael Telatynski	c0002e7778	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events	2017-11-15 16:03:07 +00:00
Michael Telatynski	5563b71c47	differentiate between state events and message events ... so that people can't fake state event types and have them rendered. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-15 15:56:54 +00:00
David Baker	f8fc6dc83e	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-15 12:11:33 +00:00
Travis Ralston	bd4102eb3d	Merge branch 'develop' into travis/granular-settings	2017-11-14 19:12:48 -07:00
Matthew Hodgson	f05958e334	Merge pull request #1482 from turt2live/travis/presence ... Implement user-controlled presence	2017-11-14 23:53:16 +00:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Stefan Parviainen	3afbaf61e7	Refactor i18n stuff a bit	2017-11-13 20:19:33 +01:00
Travis Ralston	c5c346f0b7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:18:41 -07:00
David Baker	0659ac1ccb	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-13 17:45:57 +00:00
Luke Barnard	52af7a7659	Attempt to clarify the affect that the users_default has on power levels ... This modifies displayed power levels such that: - If users_default is !== 0: - the power level 0 is displayed as "Restricted (0)" - the power level users_default is displayed as "Default ({users_default})" - Otherwise: - the power level 0 is displayed as "Default (0)" When changing users_default, to say, 10, when the textual powers are rendered again, they will take users_default into account. So those previously at 10 and which would have previously have been rendered "Custom of 10" will now read "Default (10)". Conversely, those that were "Default (0)" will now read "Restricted (0)".	2017-11-13 17:03:48 +00:00
Luke Barnard	853d33a93a	Make groups a fully-fleged baked-in feature	2017-11-10 15:42:11 +00:00
David Baker	b1ec430523	Remove now-unused dispatches	2017-11-09 16:09:12 +00:00
Travis Ralston	f7da5836e1	Make blacklistUnverifiedDevices override the level order ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-08 17:41:32 -07:00
Travis Ralston	289b0c2b6a	Merge branch 'develop' into travis/granular-settings	2017-11-07 14:55:12 -07:00
Luke Barnard	d777e370f2	Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing ... Disable RoomDetailList in GroupView when editing	2017-11-07 18:53:04 +00:00
Travis Ralston	e0ddd88ec9	Default to no read pins if there is no applicable account data ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 11:14:27 -07:00
Matthew Hodgson	e14e0bf200	Merge pull request #1486 from turt2live/travis/pinned-notice ... Add a small indicator for when a new event is pinned	2017-11-07 17:56:12 +00:00
Luke Barnard	80d4873542	Disable RoomDetailList in GroupView when editing ... Otherwise the rooms can be clicked on.	2017-11-07 16:54:28 +00:00
Travis Ralston	142d23a099	Cap the read pin event IDs to 10 ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-07 09:16:19 -07:00
Luke Barnard	47bf991471	Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills ... Room notifs in autocomplete & composer	2017-11-07 10:25:48 +00:00
David Baker	df5c6470e8	get dict syntax right	2017-11-06 22:01:23 +00:00
David Baker	029853d379	Merge pull request #1578 from matrix-org/luke/groups-admin-badges ... Indicate admins in the group member list with a sheriff badge	2017-11-06 17:16:34 +00:00
David Baker	08d006d112	PR feedback	2017-11-06 17:15:09 +00:00
Luke Barnard	d6a6e59d6c	Indicate admins in the group member list with a sheriff badge	2017-11-06 16:37:16 +00:00
David Baker	adc4290451	Pillify room notif pills in composer	2017-11-06 15:11:42 +00:00
Richard Lewis	f1db564506	Merge pull request #1533 from anoadragon453/develop ... Remember whether widget drawer was hidden per-room	2017-11-06 14:29:25 +00:00
Travis Ralston	ef45d82ec6	Fix URL preview save calls ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:20 -07:00
Travis Ralston	b75be41f94	Fix split-brain for blacklistUnverifiedDevices ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:06 -07:00
Travis Ralston	cb17c0a379	Migrate blacklistUnverifiedDevicesPerRoom ... This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:15:55 -07:00
Travis Ralston	8282534f87	Add SettingsLevel enum; Move settings to own file. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 23:19:45 -06:00
Travis Ralston	893c39bfbe	Merge branch 'develop' into travis/granular-settings	2017-11-03 22:00:07 -06:00
Travis Ralston	de6fc32a87	Show an indicator when there are any pins in the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 20:00:48 -06:00
Travis Ralston	a2b7f6d30e	Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice	2017-11-03 19:57:39 -06:00
Travis Ralston	5c37155730	Don't assume we have a valid event. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 18:18:09 -06:00
Travis Ralston	3656fdb571	Store read pinned events as an array to avoid racing saves. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-03 18:12:57 -06:00
Luke Barnard	58f1757f0c	Handle rooms with no aliases or canonical alias	2017-11-03 17:52:36 +00:00
Luke Barnard	98312a4647	Use, if possible, a room's canonical or first alias when viewing the room ... (Only affects rooms the user has never joined)	2017-11-03 17:37:13 +00:00
David Baker	43a23d7e89	Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room ... Give autocomplete providers the room they're in	2017-11-03 14:29:59 +00:00
Luke Barnard	151f9917b1	Fix group invites such that they look similar to room invites ... - Change GroupInviteTile to use RoomTile CSS - Give group invites their own sub list, with heading "Community Invites"	2017-11-03 12:19:37 +00:00
David Baker	843d797ded	Better type checking	2017-11-02 18:17:57 +00:00
David Baker	7f9967389d	Pass room into Autocompleter	2017-11-02 18:15:26 +00:00
David Baker	498b117d5a	copyrights	2017-11-02 18:01:28 +00:00
David Baker	4953d4de4d	Give autocomplete providers the room they're in ... Removes the gut-wrenching that RoomView does to jam the user list into the user autocomplete provider.	2017-11-02 17:51:08 +00:00
Luke Barnard	e909d859ab	Merge branch 'develop' into luke/groups-room-info	2017-11-02 10:56:33 +00:00
Luke Barnard	0dcd52d88f	Fix some react warnings firing	2017-11-01 17:12:22 +00:00
Travis Ralston	6f8523081b	Some documentation ... Far from complete, and probably needs a bit of work, but it's a start. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 21:09:24 -06:00
Travis Ralston	0d3f0eaf98	Convert local settings to granular settings ... This breaks language selection. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:53:00 -06:00
Travis Ralston	ae10a11ac4	Convert synced settings to granular settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 01:43:52 -06:00
Travis Ralston	bf815f4be9	Support labs features ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-28 20:21:50 -06:00
Stefan Parviainen	95b2392104	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
Andrew (anoa)	b4868a6846	showWidget->hideWidgetDrawer and remove logs ... Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-26 11:27:58 -07:00
Michael Telatynski	1d5b4a9d50	Merge branch 'develop' into t3chguy/mention_user	2017-10-26 18:10:10 +01:00
Luke Barnard	eec6ed36cd	Use correct icon for group room deletion and make themeable ... Also fix cancel icons to have class mx_filterFlipColor	2017-10-26 14:05:58 +01:00
Travis Ralston	e773585a02	Merge remote-tracking branch 'matrix-org/develop' into travis/presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-25 11:21:39 -06:00
Stefan Parviainen	53e983f9c7	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-25 18:19:27 +02:00
Michael Telatynski	fd7e057ec0	Merge branch 'develop' into t3chguy/invite_in_memberinfo	2017-10-25 16:33:50 +01:00
David Baker	8ed3474b64	Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists ... Only show editing UI for aliases/related_groups for users /w power	2017-10-25 15:52:51 +01:00
Luke Barnard	39fa866d68	Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui ... Swap from `ui_opacity` to `panel_disabled`	2017-10-25 15:47:18 +01:00
Luke Barnard	b1f2a6c1e9	Dramatically simplify use of mx_fadable ... by applying it to parent elements of things that need to be faded.	2017-10-25 15:15:49 +01:00
Michael Telatynski	f3c8951d4e	remove unused lastPresenceTs ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 12:56:23 +01:00
Luke Barnard	2f8f2ce76e	Swap from ui_opacity to panel_disabled ... to simplify the process of disabling panels in the UI.	2017-10-25 11:23:51 +01:00
Michael Telatynski	b3463146ba	Add invite button to MemberInfo if user has left or wasn't in room ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 01:00:13 +01:00
Andrew (anoa)	9821f0d459	Fix linting ... Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-24 16:42:06 -07:00
Andrew (anoa)	f032284eff	Remember whether widget drawer was hidden per-room ... Fixes #4850 Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-10-24 16:28:10 -07:00
Michael Telatynski	5514d81683	Add Mention button to MemberInfo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 23:01:40 +01:00
Michael Telatynski	c896dfb17b	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 22:21:33 +01:00
Michael Telatynski	f813a752e7	only show change power level option in MemberInfo if we can actually ... send m.room.power_level AND are lower PL than them Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-24 22:12:48 +01:00
Stefan Parviainen	4ff369c884	Merge branch 'develop' into departify	2017-10-24 18:27:24 +02:00
Luke Barnard	ee7ebc425c	Only show editing UI for aliases/related_groups for users /w power	2017-10-24 16:19:09 +01:00
Luke Barnard	e419446081	Add fields needed by RoomDetailList to groupRoomFromApiObject ... and also alter props API for RDL to match the returned rooms. (This doesn't affect RoomDirectory - this does not use RDL (yet))	2017-10-24 10:13:38 +01:00
Stefan Parviainen	115772d526	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:57:52 +02:00
Stefan Parviainen	fc860c66bc	De-partify RoomPreviewBar ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-17 22:03:49 +02:00
Stefan Parviainen	8083dccfa5	De-partify SenderProfile ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi> Also, text does not need to be EmojiText	2017-10-16 20:53:43 +02:00
Luke Barnard	47ac0988ba	Refactor class names for an entity tile being hovered over	2017-10-16 16:31:13 +01:00
David Baker	e4a3309752	Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque ... Modify GroupView UI	2017-10-16 10:17:44 +01:00
Travis Ralston	4f6cd6b23a	Add a small indicator for when a new event is pinned ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-15 21:17:43 -06:00
Stefan Parviainen	ad2f54f8ab	Fix italics and parens ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-15 18:01:57 +02:00
Stefan Parviainen	15d1dc1f3b	Fix indentation ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-15 16:57:22 +02:00
Stefan Parviainen	9a5cffb5eb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify	2017-10-15 16:49:27 +02:00
Travis Ralston	854394cb2e	Merge branch 'develop' into travis/presence	2017-10-14 18:49:58 -06:00
Matthew Hodgson	1d75d9e90d	yet more horrifically strict linting :/	2017-10-15 01:47:11 +01:00
Matthew Hodgson	635996c083	more bizarrely strict linting :/	2017-10-15 01:19:06 +01:00
Matthew Hodgson	247e32115f	bizarrely strict linting :/	2017-10-15 01:13:52 +01:00
Matthew Hodgson	2b367edccf	Merge pull request #1439 from turt2live/travis/pinned_messages ... Message/event pinning	2017-10-15 01:03:18 +01:00
Travis Ralston	49c19bc9b4	Merge branch 'develop' into travis/presence	2017-10-14 17:26:54 -06:00
Matthew Hodgson	e57d9e686b	Merge branch 'develop' into t3chguy/jump_to_rr	2017-10-14 23:45:17 +01:00
Travis Ralston	8a641c7173	Hide message pinning behind a labs setting ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 16:40:10 -06:00
Travis Ralston	c34b55c6c7	Merge branch 'develop' into travis/pinned_messages	2017-10-14 16:10:32 -06:00
Matthew Hodgson	3efa0d2a76	Merge pull request #1478 from turt2live/travis/unset-avatar ... Buttons to remove room/self avatar	2017-10-14 22:13:32 +01:00
Travis Ralston	6cd07731c4	Add MemberPresenceAvatar and control presence ourselves ... Includes rudimentary support for custom statuses and user-controlled status. Some minor tweaks have also been made to better control how we advertise our presence. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 14:37:47 -06:00
Michael Telatynski	b0b7472901	undo bad merge ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 17:14:57 +01:00
Michael Telatynski	e79f9ef011	=== > == ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 17:10:51 +01:00
Michael Telatynski	6ad8532bed	lowerCase query so that searching for Erik will actually find Erik.. ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 17:09:58 +01:00
Michael Telatynski	a000439948	pass search query to filter fn in _updateList ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 17:09:30 +01:00
Travis Ralston	e5c8e3e7ad	Add option to unset room avatar ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-13 20:57:15 -06:00
Stefan Parviainen	a84b42bf24	Departify RoomSettings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-13 21:10:50 +02:00
Luke Barnard	6f20445a42	Explain topic click stopPropagation	2017-10-13 17:57:28 +01:00
Luke Barnard	77418f535e	Modify GroupView UI ... - Remove featured users/rooms - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode. - Make the group view body scrollable	2017-10-13 16:46:33 +01:00
Stefan Parviainen	9495ccdbb5	Don't hardcode ConfirmUserActionDialog title ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-12 22:15:53 +02:00
Stefan Parviainen	1f44233e05	Better translations in RoomList.js ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-12 21:24:45 +02:00
David Baker	047daec587	Merge pull request #1468 from matrix-org/dbkr/labs_config ... enable/disable features in config.json	2017-10-12 18:38:18 +01:00
David Baker	e50478aa1d	enable/disable features in config.json ... As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit# Replaces: * enableLabs setting * 'override' flag in labs * 'default' flag in labs Un-feature-flags matrix apps since this was now overidden to be enabled.	2017-10-12 17:03:38 +01:00
Luke Barnard	36bb8b7dc4	Fix bug that inserted emoji when typing ... This was quite simple in the end -- the mouse doens't move, but on some browsers, the autocomplete appearing beneath the mouse would cause the `onMouseOver`, which is not `onMouseMove`. The fix was to use `onMouseMove`. Fixes vector-im/riot-web#4974	2017-10-12 11:31:31 +01:00
Luke Barnard	d3f9a3aeb5	Run eslint --fix ... Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.	2017-10-11 17:56:17 +01:00
Luke Barnard	8958be9321	Merge pull request #1441 from turt2live/travis/who_banned ... Show who banned the user on hover	2017-10-11 17:33:53 +02:00
Travis Ralston	8a2813ac08	Fallback to MXID instead of relying on the user being in the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-11 09:08:40 -06:00
Travis Ralston	d1fdd20809	Show who banned the user on hover ... Fixes https://github.com/vector-im/riot-web/issues/5039 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-11 09:08:29 -06:00
Travis Ralston	0ab5b1a6af	_td translatable strings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-11 08:50:28 -06:00
Travis Ralston	f874fc1203	Merge branch 'develop' into travis/pl_enhancements	2017-10-11 08:42:45 -06:00
Michael Telatynski	dbb6f5a44d	i18n the Jump to Read Receipt in MemberInfo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-07 19:27:49 +01:00
Michael Telatynski	d54cea5429	Add a way to jump to a user's Read Receipt from MemberInfo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-07 19:25:13 +01:00
Michael Telatynski	7492f2dffa	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings	2017-10-04 22:35:29 +01:00
Luke Barnard	ed74ac394b	Put related groups UI behind groups labs flag	2017-10-04 14:35:13 +01:00
Luke Barnard	7be5e685f7	Implement UI for editing related groups of a room ... (using the new EditableItemList)	2017-10-04 13:19:57 +01:00
Stefan Parviainen	a96169e80e	Fix merge conflict	2017-10-02 17:57:22 +02:00
David Baker	b202601d65	Fix showing 3pid invites in member list	2017-10-02 15:10:32 +01:00
Travis Ralston	20798dd2fa	Expose power level setting for widgets ... Fixes https://github.com/vector-im/riot-web/issues/4866 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 15:37:32 -06:00
Travis Ralston	8ee9d39ffa	Expose option for m.room.topic power level ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 15:12:05 -06:00
Travis Ralston	8ab3d94c1c	Always show common events in the PL section of room settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 15:11:48 -06:00
Travis Ralston	614cf950b6	Supply user-friendly labels for common events ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 14:45:00 -06:00
Travis Ralston	2e1b2178a1	Remove assumptions on how languages work in the power levels section ... This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 14:35:49 -06:00
Travis Ralston	415693bd83	Support editing power levels of events. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 14:32:40 -06:00
Travis Ralston	a01387f7a6	Use an AccessibleButton for unpinning from the pane. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 13:32:25 -06:00
Travis Ralston	0f2fd9f698	Move the PinnedEventsPanel to the react-sdk ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 13:25:29 -06:00
Travis Ralston	874d383a8f	Add dock for pinned messages at the top of the room ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 08:56:21 -06:00
Travis Ralston	3a58e1c066	Show pinned message changes in the timeline ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 08:56:21 -06:00
Luke Barnard	6b9a2909df	Add rule to enforce spacing in curly brackets in JSX children ... This required an updated in version of eslint-plugin-react to 7.4.0.	2017-09-28 11:21:06 +01:00
Stefan Parviainen	35cb52febc	Fix merge conflict	2017-09-27 08:41:37 +02:00
Luke Barnard	1bd200f1b1	Merge pull request #1417 from matrix-org/dbkr/member_list_show_more ... MemberList: show 100 more on overflow tile click	2017-09-25 14:50:33 +01:00
Richard van der Hoff	e2f8bb2ec0	Fix NPE in MemberList ... _getChildCountInvited would throw an NPE if invoked before the js-sdk had found the room. Make sure we initialise the state correctly.	2017-09-25 10:25:21 +01:00
Stefan Parviainen	2b5b708057	Translate unknown presence label ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-24 10:14:04 +02:00
Stefan Parviainen	d4929b558e	Add dummy translation function to mark translatable strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-22 21:43:27 +02:00
David Baker	25da0f6a7a	MemberList: show 100 more on overflow tile click ... Not the full list because on HQ that causes your browser to implode. This should really be a decent paginated list at this point, but this is better for now.	2017-09-22 17:01:14 +01:00
David Baker	9cbfc22352	Make the invite section a truncatedlist too ... For uniformity and to speed up rooms like HQ with have a lot of lingering invites.	2017-09-22 16:50:54 +01:00
David Baker	dba48e2f8f	use start, end rather than min, max	2017-09-22 15:07:45 +01:00
David Baker	16398fbfc2	Allow TruncatedList to get children via a callback ... And update MemberList to use it as such. This means that the parent only needs to make react elements for the elements that will actually be rendered, rather than all of them. In practive this doesn't make a huge difference as making React elements is fairly fast, but experimentally (with all profiling turned on), MemberList went from 25ms in the constructor and 81ms in render to 38ms in constructor but sub 1ms render for Matrix HQ.	2017-09-22 13:15:02 +01:00
David Baker	add91f9a7d	Update when a group arrives	2017-09-21 16:28:49 +01:00
Luke Barnard	5295d7f058	Merge branch 'develop' into luke/feature-flair	2017-09-19 14:55:54 +01:00
Luke Barnard	e9fb5712bd	Merge branch 'develop' into dbkr/group_userlist	2017-09-19 13:26:55 +01:00
Luke Barnard	26941e994f	Merge branch 'develop' into luke/feature-flair	2017-09-18 14:46:50 +01:00
Luke Barnard	caaf5cca14	Only show the integ management button if user is joined	2017-09-18 13:34:33 +01:00
Matthew Hodgson	09e6ea00c5	Merge pull request #1273 from matrix-org/t3chguy/hide_chevron_memberlist_3pid_notarget ... suppressOnHover for member entity tiles which have no onClick	2017-09-17 23:19:35 +01:00
turt2live	2e72d6cd7c	Hide events that were sent by ignored users ... This code only kicks in if the user was ignored after an event was sent. The homeserver should prevent other events from coming in. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 20:16:56 -06:00
Travis Ralston	3889df6b08	Add (un)ignore button to MemberInfo ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 19:42:09 -06:00
Michael Telatynski	755f22a7fa	shelving. ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-14 17:39:18 +01:00
Michael Telatynski	d8781ddd0e	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.room.aliases	2017-09-14 15:28:10 +01:00
Michael Telatynski	8ab96ae2ff	render m.room.aliases events ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-14 13:43:46 +01:00
David Baker	5087da9247	Merge remote-tracking branch 'origin/develop' into luke/feature-flair	2017-09-13 16:52:12 +01:00
David Baker	3c3328c5f1	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-09-13 16:34:39 +01:00
David Baker	8abd35f581	Remove spurious cancel button ... That appeared if you clicked on a room from the room directory (it didn't do anything). It's only supposed to be shown when editing room settings.	2017-09-12 15:48:13 +01:00
David Baker	757bc9fe32	Update roomlist when an event is decrypted ... Events are now decrypted asynchronously, so are not decrypted at the time of the Room.timeline which is when our RoomList got the chance to update. It needs to update once the event has been decrypted. Ideally we would not update the whole room list order, but this is how all the room list re-ordering happens right now, so staying consistent with this. Fixes https://github.com/vector-im/riot-web/issues/5020	2017-09-12 14:47:26 +01:00
David Baker	be8f0991a6	Avoid re-rendering RoomList on room switch ... Introduce a class that consumes updates from the RoomViewStore and announces to listeners if the active room ID is now or is no longer the room ID they specified. Naming suggestions welcome: it's currently called ActiveRoomObserver. Avoids passing the selectedRoomId down from MatrixChat all the way through the LeftPanel / RoomList / RoomSubList to the RoomTiles. Also introduce a CallPreview class that listens directly for RoomViewStore changes as the call preview in the left panel needs to know when the room changes, so this allows this component to update without having to update the entire left panel.	2017-09-11 16:59:09 +01:00
David Baker	9efa604706	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-30 17:39:47 +01:00
Luke Barnard	ebc1993530	Implement Flair ... Add 14x14 group avatars next to sender profiles.	2017-08-30 11:10:49 +01:00
Richard van der Hoff	b9e047f0ff	Avoid breaking /sync with uncaught exceptions ... For reasons I don't fully understand, it appears that sometimes the ReadReceiptMarker has no offsetParent. Rather than dying with an uncaught exception when that happens (and taking out half of React as well as the /sync handler), log a warning and suppress the animation.	2017-08-30 10:01:45 +01:00
David Baker	d86fe0df6e	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-29 13:29:55 +01:00
Michael Telatynski	9658efd6d7	add comment and remove redundant logic	2017-08-28 01:04:18 +01:00
Michael Telatynski	21af3fe189	modularize and invert logic, so banned etc will count as left	2017-08-28 00:46:28 +01:00
Michael Telatynski	433cd505ee	skip direct chats which either you or the target have left	2017-08-28 00:39:59 +01:00
Michael Telatynski	b644751ca1	skip direct chats which you have left in memberinfo	2017-08-28 00:16:22 +01:00
Michael Telatynski	edb449dfe5	we need to pass whether it is an invite RoomSubList explicitly (i18n)	2017-08-27 23:38:25 +01:00
David Baker	299db845ff	PR feedback	2017-08-25 12:10:13 +01:00
David Baker	5cfec247f0	Merge pull request #1331 from matrix-org/luke/fix-completion-click-to-insert ... Fix click to insert completion	2017-08-24 14:56:15 +01:00
David Baker	c11432c3e3	Catch the promise rejection if scalar fails ... Otherwise this is incredibly annoying when developing if you don't have a scalar that will allow you to register (ie. if you're testing against an HS on your dev box)	2017-08-23 19:35:33 +01:00
Luke Barnard	8ed5422a45	Fix click to insert completion ... And remedy weird API in the process. Autocomplete now exposes `onSelectionChange` to indicate that the user has selected another completion, rather than returning the chosen completion via onUpArrow etc. Fixes vector-im/riot-web#4835	2017-08-23 16:22:14 +01:00
Richard Lewis	502a0480a0	Merge pull request #1327 from matrix-org/matthew/multiple-widgets ... Matthew/multiple widgets	2017-08-22 10:53:51 +01:00
David Baker	e72bdffd62	Remove unused import	2017-08-22 10:22:51 +01:00
David Baker	5f816666e1	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-22 10:08:02 +01:00
Richard Lewis	b7569a9831	Revert auxPanel changes (this should already have been fixed in a separate PR).	2017-08-21 15:29:11 +01:00
Robert Swain	385205471b	AppsDrawer: Remove unnecessary bind	2017-08-21 15:34:13 +02:00
Richard Lewis	e93a1fac3d	Position add app widget link	2017-08-21 11:29:42 +01:00
Matthew Hodgson	d7f5295949	untested WIP for supporting multiple widgets properly	2017-08-18 18:40:00 +01:00
Richard Lewis	1c36e47403	Fix add widget link	2017-08-18 15:59:12 +01:00
Richard Lewis	b7d46d91ed	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-18 15:35:01 +01:00
Luke Barnard	36fffa1696	Stop integ manager opening on every room switch ... This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle. This was introduced in matrix-org/matrix-react-sdk#1312. Known issue with this fix: deleting the last app doesn't hide the app drawer.	2017-08-18 14:48:58 +01:00
Luke Barnard	1a1a80b633	Merge branch 'develop' into luke/feature-app-tile-ux	2017-08-18 12:12:00 +01:00
Luke Barnard	cab3123bd8	Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events ... Implement TextualEvent tiles for im.vector.modular.widgets	2017-08-18 12:10:22 +01:00
Richard Lewis	4b5cdac032	Don't show widget security warning to the person who added it to the room.	2017-08-18 11:41:27 +01:00
David Baker	55998028b4	Show group invites in 'invites' section	2017-08-18 11:22:50 +01:00
Luke Barnard	57505c3a61	Add behaviour to toggle app draw on app tile header click	2017-08-18 10:56:35 +01:00
Luke Barnard	9382689675	Merge branch 'develop' into luke/feature-widget-timeline-events	2017-08-18 10:47:25 +01:00
Luke Barnard	acc54b97f1	Implement TextualEvent tiles for im.vector.modular.widgets ... E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget" The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.	2017-08-18 10:35:33 +01:00
Matthew Hodgson	bb0845954d	improve wording for directory listings	2017-08-17 19:10:45 +01:00
Matthew Hodgson	7c04a6671d	expand auxPanel when showing apps	2017-08-17 19:06:19 +01:00
Richard Lewis	120a4f4f44	Check for valid roomId before renering manageIntegsButton.	2017-08-17 18:10:50 +01:00
Richard Lewis	0907fff080	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-17 17:47:46 +01:00
Michael Telatynski	bdb2d6b475	Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings ... # Conflicts: # src/components/structures/MatrixChat.js	2017-08-17 13:39:19 +01:00
Richard Lewis	02edadbd15	Don't bubble cancel click to room header.	2017-08-17 12:21:44 +01:00
Richard Lewis	d1ee257b5a	Pass roomId rather than whole room object.	2017-08-17 12:15:01 +01:00
Richard Lewis	9111cb421e	Merge pull request #1291 from matrix-org/rxl881/maxWidgets ... Show a dialog if the maximum number of widgets allowed has been reached.	2017-08-17 10:03:42 +01:00
Luke Barnard	6b1b643d41	Merge branch 'develop' into luke/store-history-as-raw-content	2017-08-14 16:42:22 +01:00
Luke Barnard	9742962d61	preventDefault when moving autocomplete selection with vertical arrow ... Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790	2017-08-14 15:16:13 +01:00
Richard Lewis	454ec40b00	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-11 10:35:20 +01:00
Richard Lewis	0323151bee	Show a dialog if the maximum number of widgets allowed has been reached.	2017-08-10 23:53:43 +01:00
Michael Telatynski	41843f021d	don't track two more potential risks ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:21:01 +01:00
Michael Telatynski	56ea528f43	don't track error messages .2 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:17:52 +01:00
Michael Telatynski	b19c1010aa	Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/Analytics.js	2017-08-10 13:54:55 +01:00
Michael Telatynski	24599ace32	don't track error messages ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:49:11 +01:00
Luke Barnard	b2fd4be166	Merge pull request #1289 from matrix-org/luke/fix-quote-innerText ... Quote by taking the innerText of eventTiles	2017-08-10 10:35:49 +01:00
Luke Barnard	678c472b75	Quote by taking the innerText of eventTiles ... because using `body` gives inconsistent results - sometimes it will contain markdown and sometimes not, and this may not correspond with the `formatted_body`. TODO: Do quoting proper - using `in_response_to`.	2017-08-10 10:14:14 +01:00
Luke Barnard	390e77ee22	Merge pull request #1288 from matrix-org/luke/track-richtext-mode ... Track whether the user has richtext mode enabled	2017-08-10 09:31:09 +01:00
Luke Barnard	fc6977e68d	Track RT mode once we've retrieved the setting from account data	2017-08-09 19:00:38 +01:00
Luke Barnard	e121440d05	Track whether the user has richtext mode enabled	2017-08-09 18:39:06 +01:00
Luke Barnard	2d47d3d2c3	Hide autocomplete when RTE selection state (cursor) changes	2017-08-09 17:36:35 +01:00
Richard Lewis	185379b037	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes	2017-08-09 14:07:45 +01:00
Richard Lewis	4bc25f12cb	Move manage integrations button in to stand-alone component	2017-08-09 11:44:24 +01:00
Luke Barnard	610b2a3a42	For mentions, always use rawDisplayName and remove (IRC)	2017-08-09 10:40:06 +01:00
David Baker	8426ada24c	Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted ... Show unencrypted messages as unencrypted	2017-08-08 18:11:56 +01:00
Richard van der Hoff	da85cb9f45	Show unencrypted messages as unencrypted ... Previously, we were special-casing outgoing messages such that they were shown as encrypted even when encryption had failed for some reason. There's no need for this: outgoing messages have a working isEncrypted() method which we can use to show whether the event has been encrypted yet. Arguably we could do better than an open padlock for events in the 'encrypting' send state, but I'm not really sure what.	2017-08-08 17:49:41 +01:00
David Baker	b76b6791b2	Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions ... Always use message `body` when quoting	2017-08-08 17:47:25 +01:00
Luke Barnard	cb8a66b5a1	When hideing autocomplete, also remove completion state	2017-08-08 17:25:11 +01:00
Luke Barnard	503fa6a7b3	Always use message body when quoting ... (not formatted_body) This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756	2017-08-08 14:59:56 +01:00
David Baker	ca2273519d	Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting ... Add optional setting for hiding avatars in <Pill>s	2017-08-08 14:01:34 +01:00
Luke Barnard	91a1cc4431	Mandate ctrl/meta ONLY for a subset of key bindings ... Because by default dratf-js doesn't check that other modifiers are _not_ pressed.	2017-08-08 13:36:43 +01:00
Luke Barnard	b08d32371d	Add optional setting for hiding avatars in <Pill>s ... As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445	2017-08-08 11:13:29 +01:00
Luke Barnard	7018deee44	Fix ctrl+a, backspace toggling block format ... Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753	2017-08-07 17:16:42 +01:00
Luke Barnard	641fda0162	Adjust comment	2017-08-07 16:29:22 +01:00
Luke Barnard	d9d8f2055f	Allow default for ctrl+shift+b, ctrl+shift+u in RTE ... fixes vector-im/riot-web#4750	2017-08-07 16:23:37 +01:00
Richard Lewis	18ae5fd129	Send messages on widget addition and deletion	2017-08-06 11:01:14 +01:00
Richard Lewis	308d932b2f	CancelClick prop.	2017-08-06 10:29:43 +01:00
Richard Lewis	a22e768343	Move room settings button to RoomHeader	2017-08-06 10:01:48 +01:00
Michael Telatynski	c4803c6d89	suppressOnHover for member entity tiles which have no onClick ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-05 13:01:19 +01:00
Richard Lewis	1973b2bbe7	Switch app drawer icons	2017-08-05 00:00:19 +01:00
Luke Barnard	a27eefd893	Fix a couple of more errors due to API changes	2017-08-03 15:20:44 +01:00
Luke Barnard	901cbf495d	Update decorator strategy API in accordance with recent changes to 0.11.0 ... See 590cdc6c54, which is a change to the API not mentioned in the migration to v0.10 notes https://draftjs.org/docs/v0-10-api-migration.html	2017-08-03 12:02:29 +01:00
Luke Barnard	1d1cd5f691	Reflect API change for decorator strategy	2017-08-03 11:36:07 +01:00
Luke Barnard	fb5dc295aa	Reflect API change for getting an Entity	2017-08-03 11:29:26 +01:00
Luke Barnard	124795006c	Reflect API change for creating an Entity	2017-08-03 11:18:56 +01:00
Michael Telatynski	e9afcec5b2	fix m.federate=false warning in room settings ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 13:42:24 +01:00
Luke Barnard	7fcb8c5ff0	Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace ... Only auto-replace emoji following ^ or \s	2017-08-01 15:56:42 +01:00
Luke Barnard	438b63bee2	Only auto-replace emoji following ^ or \s ... So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)	2017-08-01 14:26:30 +01:00
Richard Lewis	abae43b65e	Merge pull request #1257 from matrix-org/rxl881/widgetPermissions ... Widget permissions	2017-08-01 12:13:09 +01:00
Michael Telatynski	4bdaa15c47	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics	2017-07-28 21:01:59 +01:00
Luke Barnard	8a5f2bf2ca	Interpret a split-block as format toggle for an empty block ... (`split-block` is emitted when "return" is pressed) part of fixing https://github.com/vector-im/riot-web/issues/4580	2017-07-28 14:46:57 +01:00
Richard Lewis	20a1693c71	Only display add app link if user has permission to add widgets in the room.	2017-07-27 23:38:02 +01:00
Luke Barnard	6cb8b12cda	Instead of inserting MD for completion, convert the Entity later ... This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets. Fixes https://github.com/vector-im/riot-web/issues/4666	2017-07-27 18:17:41 +01:00
Richard Lewis	27923e300c	Add JSX wrapper.	2017-07-27 17:47:04 +01:00
Michael Telatynski	bf98c0da7c	un-i18n Modal Analytics ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-27 17:19:18 +01:00
Luke Barnard	5c7891a25b	Remove logs	2017-07-27 15:26:36 +01:00
Luke Barnard	e71df44fc9	Fix /join #alias command in markdown mode ... Tab-completing a room alias inserts a markdown link, which is now stripped before a command is parsed. We also strip the MD links when doing the autocompletion itself (getAutocompleteQuery). There is still an issue where `/invite` will not work at all with tab-completion - the text of a user Pill is not the userID but rather the display name, which cannot be used as an argument to the command.	2017-07-27 15:18:06 +01:00
David Baker	9cb28ff33c	Merge pull request #1248 from matrix-org/luke/fix-rte-auto-scroll ... Scroll to the bottom of editor if on last line	2017-07-26 16:58:36 +01:00
Luke Barnard	fc00eaf546	Merge branch 'develop' into luke/store-history-as-raw-content	2017-07-25 17:19:35 +01:00
Luke Barnard	1ef2a2bcf9	Merge pull request #1250 from matrix-org/dbkr/fix_truncatedlist_i18n ... Fix i18n on truncatedlist & friends to be sane	2017-07-25 16:17:44 +01:00
David Baker	fa7a9818c6	Fix i19n on truncatedlist & friends to be sane ... Use the proper counterpart tool for plurals rather than if > 1. Fix up all the translation files respectively.	2017-07-25 15:59:06 +01:00
Luke Barnard	7e0fecbc8c	Scroll to the bottom of editor if on last line ... Make the MessageComposerInput scroll to the bottom if we are on the last line of the contents. fixes https://github.com/vector-im/riot-web/issues/4652	2017-07-25 15:22:10 +01:00
Luke Barnard	eccdceae33	Rename props to entityProps for clarity	2017-07-25 11:43:12 +01:00
Luke Barnard	143994e44f	Use data-offset-key in RTE decorators ... This makes sure the selection state is correct when moving the cursor through an entity in the composer but only in rich text mode. https://github.com/vector-im/riot-web/issues/4666 still persists despite this, probably because the text content inserted during a completion in markdown mode has a different length to the text node within the entity. fixes vector-im/riot-web#4654	2017-07-25 11:25:33 +01:00
Luke Barnard	6945fa54ea	Reimplement so that only tab-completed mentions are stripped ... Instead of blindly stripping all MD mentions, only strip those that were tab-completed. We do this by adding the `isCompleted` flag to the Entity data.	2017-07-24 14:41:13 +01:00
Luke Barnard	397201a74d	Remove subjective comment	2017-07-24 09:41:46 +01:00
Luke Barnard	e315b30f6a	Merge branch 'develop' into luke/fix-rte-pt-md-mentions	2017-07-21 18:06:31 +01:00
Luke Barnard	e8495f637f	Strip MD mentions from the body of sent messages ... Because previously we just sent the display name and MD links are not very readable.	2017-07-21 16:38:31 +01:00
Luke Barnard	7db7192701	Factor out shared logic in two code-paths for pill rendering ... This isn't an entirely side-effect-free refactoring: - the text of the timeline pills is now either the room ID/alias or user ID/ display name of the linked resource (which means that until we do a roundtrip to get user displaynames, mentions for users not in the current room will have their user IDs shown instead of what was in the link body). - timeline links to rooms without avatars are now rendered as links - fixed issue that would throw an error whilst rendering (i.e. unusable client) a room link to a room that the client doesn't know about	2017-07-21 14:07:48 +01:00
Luke Barnard	bac22cfb7c	Re-add removal of (IRC) suffix	2017-07-20 18:04:12 +01:00
Luke Barnard	08cc0c421d	insert_displayname -> insert_mention	2017-07-20 18:02:54 +01:00
Luke Barnard	0cc890c020	WIP store history as raw content state ... Not sure this solves any problems because we still have to convert from md and back	2017-07-20 18:01:39 +01:00
Luke Barnard	0600c5b049	Pretend that insert_displayname is a completion on that user ... This has the advantage of us not reimplementing things and fixing the same bugs twice.	2017-07-20 16:46:53 +01:00
Luke Barnard	4bee9bd8c7	Merge branch 'develop' into luke/feature-rte-insert-pills-on-click-tl-profile	2017-07-20 15:48:38 +01:00
Luke Barnard	0419eff230	Insert pill onClick of timeline profile ... When clicking someone in the timeline, insert a user pill instead of the plaintext "displayname:"	2017-07-20 15:46:36 +01:00
Luke Barnard	e893f994e1	Default to first room alias and then roomID	2017-07-20 15:17:07 +01:00
Luke Barnard	84fe51a162	Insert MD links when autocompleting in MD mode ... These will appear decorated because they are inserted as entities. It was necessary to modify pills to have an explicit linkText that is derived from the `href` being pillified (and is thus no longer the inserted completion but rather the display name (or user ID) or room alias.	2017-07-20 15:09:59 +01:00
Luke Barnard	352f70f9ce	Implement old composer feature that inserts ': ' or ' ' ... after a user completion	2017-07-20 11:52:18 +01:00
Richard van der Hoff	0e8ad75248	Merge pull request #1233 from matrix-org/rav/async_crypto ... Prepare for asynchronous e2e APIs	2017-07-19 21:11:36 +01:00
Luke Barnard	61d5d078dd	Merge pull request #1235 from matrix-org/luke/fix-rte-inline-code-format ... Mimic ctrl+j of RT mode in MD mode	2017-07-19 17:44:56 +01:00
Luke Barnard	3a53fabb87	Merge pull request #1228 from matrix-org/luke/feature-auto-complete-matrixto-pills ... Implement composer completion user/room pill insertion	2017-07-19 17:19:47 +01:00
Luke Barnard	29b6d70aff	Merge branch 'develop' into luke/fix-rte-inline-code-format	2017-07-19 17:19:25 +01:00