2318 commits

Author	SHA1	Message	Date
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