195 commits

Author	SHA1	Message	Date
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
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
Bruno Windels	8c9ceca14f	take into account lazy loading when enlarging avatar	2018-07-25 16:10:49 +02: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	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	6904c2bafe	Merge pull request #1948 from matrix-org/export_Group ... Share Dialog	2018-06-15 10:52:27 +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	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
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	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
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
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
Matthew Hodgson	d3292d9388	fix typos and NPE. fixes #5999	2018-01-17 23:28:14 +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
Michael Telatynski	831a3f7e42	Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo	2018-01-04 16:41:16 +00: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
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
Luke Barnard	dad797d4a2	Run linting --fix	2017-11-16 13:19:36 +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
Stefan Parviainen	95b2392104	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
Michael Telatynski	1d5b4a9d50	Merge branch 'develop' into t3chguy/mention_user	2017-10-26 18:10:10 +01: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
Michael Telatynski	f3c8951d4e	remove unused lastPresenceTs ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 12:56:23 +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
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	9a5cffb5eb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify	2017-10-15 16:49:27 +02:00
Matthew Hodgson	e57d9e686b	Merge branch 'develop' into t3chguy/jump_to_rr	2017-10-14 23:45:17 +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
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
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
Luke Barnard	e9fb5712bd	Merge branch 'develop' into dbkr/group_userlist	2017-09-19 13:26:55 +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	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
David Baker	299db845ff	PR feedback	2017-08-25 12:10:13 +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	bf98c0da7c	un-i18n Modal Analytics ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-27 17:19:18 +01:00
Richard van der Hoff	4998d1b359	Prepare for asynchronous e2e APIs ... the js-sdk is making some of its APIs asynchronous, and adding an `initCrypto` method which you have to call. Particular methods we need to worry about are: * `getStoredDevice` * `getStoredDevicesForUser` * `getEventSenderDeviceInfo` * `isEventSenderVerified`	2017-07-18 23:47:36 +01:00
David Baker	bc8c2d442b	WithMatrixClient -> withMatrixClient ... because we're using it as a function rather than a React component	2017-07-07 11:34:20 +01:00
Matthew Hodgson	df625b0d31	hit MemberInfo with Gemini to fix vector-im/riot-web#4223	2017-06-08 17:26:40 +01:00
Kegan Dougal	c57823a31d	Merge branch 'develop' into kegan/translation-tamarin	2017-06-08 14:19:56 +01:00
Kegan Dougal	00df956ca2	Add remaining translations! ... Every file has now been manually vetted by me. Due to the extent of the changes, I've been unable to test all scenarios to make sure this all works. :(	2017-06-08 14:08:51 +01:00
Matthew Hodgson	5c885922d9	Merge branch 'develop' into new-guest-access	2017-05-28 22:58:18 +01:00
David Baker	443ab1add7	Put back default strings on dialogs ... But make them work by calling _t in render rather than getDefaultProps(). Also sort out some 'Warning!' strings	2017-05-25 18:20:48 +01:00
David Baker	5c359e63ab	Bulk change counterpart imports ... to use languageHandler wrapper func	2017-05-25 11:39:08 +01:00
David Baker	d419c42a4f	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00
Luke Barnard	05aaa599cc	Merge branch 'develop' into new-guest-access ... Conflicts: src/components/structures/MatrixChat.js	2017-05-22 16:19:10 +01:00
Luke Barnard	f199f3599e	Replace NeedToRegisterDialog /w SetMxIdDialog ... This uses MatrixChat's `view_set_mxid`	2017-05-15 17:31:26 +01:00
Matthew Hodgson	6879f7ee6f	add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720	2017-05-15 02:43:23 +01:00
Matthew Hodgson	a2be764681	display err.message to user if available in error msgs	2017-04-23 01:48:27 +01:00
David Baker	a3efa45795	Correct confirm prompt for disinvite ... It should be 'disinvite' not 'kick', and probably doesn't really need a reason.	2017-03-27 16:53:00 +01:00
Matthew Hodgson	3aaf37df1a	beautify a tonne more errors	2017-03-12 22:59:41 +00:00
Luke Barnard	b7f1b1a424	Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog ... Allow user to choose from existing DMs on new chat	2017-03-07 16:22:52 +00:00
Luke Barnard	bf348a0f78	Instead of listening for view_room, use a callback ... But make sure that nothing other than the callback is done when RoomTile is clicked.	2017-03-06 17:44:29 +00:00
Luke Barnard	04510da057	Clarify "No devices" message	2017-03-06 16:01:22 +00:00
David Baker	db4b9691cc	Support reasons for kick / ban ... Don't ban me for fun, girl Let me be the one, girl Ban me for a reason Let the reason be love.	2017-02-17 17:27:46 +00:00
David Baker	6fc70415cb	s/onBan/onBanOrUnban/	2017-02-14 17:29:40 +00:00
David Baker	a1c990a2ea	Make ban either ban or unban ... depending on whether the user is banned already Mostly gives some feedback that the ban has actually taken effect.	2017-02-14 16:03:30 +00:00
David Baker	5e232d8500	Argh, ES6 import syntax	2017-02-14 14:33:21 +00:00
David Baker	ff61b76bf7	Fix imports	2017-02-14 13:58:29 +00:00
David Baker	689972f023	Copyright	2017-02-14 13:57:22 +00:00
David Baker	8001c0b16b	Add confirmation dialog to kick/ban buttons ... Add a specific dialog used for confirming member actions. Also remove onFinished from MemberInfo which did absolutely nothing.	2017-02-14 13:40:19 +00:00
Richard van der Hoff	770820e6fa	Fix a bunch of lint complaints	2017-01-24 22:41:52 +00:00
Richard van der Hoff	6dd46d532a	Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux	2017-01-24 20:47:24 +00:00
David Baker	18d4d3392a	Fix a bunch of linting errors ... eslint --fix and a few manual ones	2017-01-20 14:22:27 +00:00
Jani Mustonen	959163f2ef	Proper accessible buttons	2017-01-13 19:36:41 +02:00
Jani Mustonen	d2ff2715ce	Buttonified almost everything. Stylesheet is broken.	2017-01-13 19:36:40 +02:00
Kegan Dougal	dcd0acb2b5	Review comments	2017-01-13 15:17:34 +00:00
Kegan Dougal	e196cfaf91	Show the error dialog when requests to PUT power levels fail ... This is why I dislike Q.	2017-01-13 14:51:01 +00:00
Richard van der Hoff	4476b09ce7	Get rid of always-on labs settings ... If the setting is on by default, it's not much use as a Labs setting. The E2e setting was only confusing everyone anyway.	2016-11-21 10:25:48 +00:00
Richard van der Hoff	ab7007784f	Make MemberInfo use the matrixclient from the context ... An arbitrary component to demonstrate how this works	2016-11-03 19:05:48 +00:00
Matthew Hodgson	a2904ad33f	fix 'new chat' layout bug	2016-09-20 10:06:57 -04:00
Matthew Hodgson	5fa5489bbd	disambiguate devices by ID in memberinfo	2016-09-17 20:12:56 +01:00
Matthew Hodgson	88273e8065	move admin tools to the top	2016-09-17 15:07:41 +01:00
Matthew Hodgson	b852756332	DM title	2016-09-16 14:35:43 +01:00
David Baker	96fabe09d2	Update createRoom to support creating DM rooms ... * Make ChatInviteDialog and MemberInfo createRoom use it * Fix bug in setDMRoom	2016-09-09 19:25:00 +01:00
David Baker	6f2e0a4cdf	Make rooms in MemberInfo update when necessary ... Factor out the chunk of code that looks through a read receipt event to see if it contain a read receipt from a given user, now we use it in 2 places.	2016-09-09 16:59:59 +01:00
David Baker	aa0f15c46e	List common rooms in MemberInfo	2016-09-09 16:15:01 +01:00
Richard van der Hoff	fc40bdcbfc	Make MemberInfo to use client.getStoredDevicesForUser ... It's more powerful than listDeviceKeys, and isn't deprecated.	2016-09-05 00:08:16 +01:00
Matthew Hodgson	36d8fa9786	fix avatar clicking in memberinfo	2016-08-25 16:20:38 +01:00
Richard van der Hoff	0356f04b9c	MemberInfo: initialise _enableDevices in componentWillMount ... ... to avoid referencing it in render() before it is set	2016-08-17 14:40:10 +01:00
Richard van der Hoff	30168a1b9c	Don't download E2E devices if feature disabled ... If the user hasn't enabled the E2E setting in the labs, there is no point in firing off the device download request when the MemberInfo is opened.	2016-08-17 09:57:06 +01:00
David Baker	5b71b28dcf	Fix member info	2016-08-11 11:34:14 +01:00
Aviral Dasgupta	4c1dcb924b	reskindex and use sdk.getComponent for EmojiText	2016-08-11 07:55:12 +05:30
Aviral Dasgupta	09e8a45cde	Add EmojiText component for emoji replacement.	2016-08-10 00:31:51 +05:30
David Baker	a0b973ffad	Syntax fail	2016-08-02 16:07:07 +01:00
David Baker	10f6ecfe5f	Include rooms with 1 person invited ... If we can't find one with both people joined.	2016-08-02 15:59:28 +01:00