3688 commits

Author	SHA1	Message	Date
David Baker	e2f5e16fa7	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-20 10:00:47 +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
Peter Vágner	093f110199	Make the toggle button on the memberEventListSummary translatable	2017-11-18 17:48:57 +01:00
Peter Vágner	184b29daf8	Revert "Make the disabled PowerSelector element showing custom value translatable. Fixes #5547" ... This reverts commit 681f43913a.	2017-11-18 16:58:36 +01:00
Travis Ralston	28ff0a4ee7	Disable presence controls if there's no presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-17 22:25:15 -07:00
Travis Ralston	d010329f4a	Make the room-level URL preview notification explicit ... Fixes https://github.com/vector-im/riot-web/issues/5638 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-17 22:03:06 -07:00
Travis Ralston	cdf5a6fb8a	Fix typo that prevented URL previews on a room-account level from being saved ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-17 22:02:33 -07:00
Richard van der Hoff	4e7fd55fb4	MemberPresenceAvatar: fix null references ... avoid assuming that `member` has a `user`	2017-11-17 14:35:33 +00:00
Stefan Parviainen	8090aadb0e	Add aria-labels to ActionButtons ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-17 14:33:39 +01:00
David Baker	65e1d49f37	More sensible buttons in UnknownDeviceDialog ... Just say 'Send' (or equiv) if you actually verify all the devices, rather than 'Send Anyway'.	2017-11-16 17:59:42 +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	3c8645871f	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-16 16:47:15 +00:00
David Baker	196eafdc7f	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-16 15:59:16 +00:00
David Baker	02629d13d9	Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity ... Do something more sensible for sender profile name/aux opacity	2017-11-16 15:35:16 +00:00
Luke Barnard	7ffb542cb5	Do something more sensible for sender profile name/aux opacity ... - If no translation is needed, don't do it. - For now, ignore the fact that this doens't allow us easily to put Flair into "luke sent an image" but we don't kow where the flair should go for this anyway.	2017-11-16 15:24:36 +00:00
David Baker	6f8427a5af	Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584 ... Because apparently the revert did not revert this part	2017-11-16 15:11:47 +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
Matthew Hodgson	f62b04c3be	Merge branch 'develop' into travis/granular_bugs	2017-11-16 13:12:03 +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
Luke Barnard	a80935e181	JSX does not do comments in a way one might expect	2017-11-16 11:45:40 +00:00
Travis Ralston	d0a0a9ce7f	Fix URL preview string not being translated ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 22:33:23 -07: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
David Baker	b0027525f3	Wire up Unknown Devices popup for outbound calls	2017-11-15 17:21:04 +00: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
Richard Lewis	750e64deee	Pass required props to TintableSvg.	2017-11-15 15:17:21 +00:00
David Baker	93800be742	Factor out showing UnknownDeviceDialog ... So we can re-use it for calls that fail due to unknwon devices	2017-11-15 15:15:21 +00:00
Richard Lewis	7bab7813bb	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour	2017-11-15 13:26:29 +00:00
Richard Lewis	59d405d4fa	Use TintableSvgButtons for widget menubar icons.	2017-11-15 13:24:38 +00:00
Richard Lewis	6c2e9096cd	Tintable SVGs that behave like normal image buttons / links.	2017-11-15 13:08:24 +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
Matthew Hodgson	96a3eff5d3	lint hell	2017-11-15 11:25:56 +00:00
Travis Ralston	f58e8826c0	Use the correct settings store for presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-14 19:18:04 -07: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
Richard Lewis	58966c5c3d	Make edit icon green by default	2017-11-14 19:53:59 +00:00
Richard Lewis	e87940f63c	Make app tile title stronger	2017-11-14 19:53:32 +00:00
Stefan Parviainen	f8660de52d	Add note about alternative to opacity	2017-11-14 20:13:00 +01:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Stefan Parviainen	788be67c75	Clarifications	2017-11-14 20:08:27 +01:00
Luke Barnard	12d9f05883	Merge branch 'develop' into luke/fix-restrict-power-level-options	2017-11-14 13:08:31 +00:00
Luke Barnard	3fa1bece0a	Simplify further ... Also fix not-i18n-friendly "of" to be "=".	2017-11-14 13:06:54 +00:00
David Baker	e7c99a71b6	Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display ... Determine whether power level is custom once Roles have been determined	2017-11-14 12:42:55 +00:00
Luke Barnard	c3492634bd	Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options	2017-11-14 12:41:36 +00:00
Luke Barnard	d2ef6bffa8	Remove reverseRoles ... This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.	2017-11-14 12:02:37 +00:00
Travis Ralston	d92cba25ef	Use the SettingsStore to get the theme ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 13:14:00 -07:00
Stefan Parviainen	2acd42e7c5	Make eslint happy	2017-11-13 21:10:08 +01:00
Travis Ralston	0648b3eae7	Merge branch 'develop' into travis/granular-settings	2017-11-13 12:29:36 -07: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	88010fa26c	Determine whether power level is custom once Roles have been determined ... Instead of potentially inspecting an empty {} before mounting. This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294	2017-11-13 11:57:34 +00:00
Matthew Hodgson	2827bc0718	replace some of the status.im theme with general config options	2017-11-11 23:46:43 +00:00
Matthew Hodgson	a0cdaf29f9	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-10 15:29:42 -08:00
Luke Barnard	a96bfee9f2	Remove unused UserSettingsStore import	2017-11-10 16:12:27 +00:00
Luke Barnard	ceda5939f9	Remember to import React	2017-11-10 15:55:55 +00:00
Luke Barnard	853d33a93a	Make groups a fully-fleged baked-in feature	2017-11-10 15:42:11 +00:00
Luke Barnard	6e1cf6ce17	Merge pull request #1548 from matrix-org/rxl881/widgetrendering ... Improve widget rendering on prop updates	2017-11-10 12:41:20 +00:00
Luke Barnard	74c6ebc5c6	Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action ... Display group member profile (avatar/displayname) in ConfirmUserActionDialog	2017-11-10 12:31:47 +00:00
David Baker	d2549b621c	Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule ... Don't crash if there isn't a room notif rule	2017-11-10 11:57:43 +00:00
Luke Barnard	981ca458ec	Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip ... Show group name in flair tooltip if one is set	2017-11-10 11:51:45 +00:00
Richard Lewis	ba8a9f2a43	Comment length	2017-11-10 11:50:14 +00:00
David Baker	ff5e00d244	Don't crash if there isn't a room notif rule	2017-11-10 11:50:00 +00:00
Luke Barnard	6deeaf94d6	group name not required	2017-11-10 11:43:05 +00:00
Richard Lewis	d2070a08d8	Replace 'qs' dep. with 'querystring'	2017-11-10 11:42:56 +00:00
Luke Barnard	90a63d78b9	Merge pull request #1597 from matrix-org/luke/groups-fix-invite-avatar ... Convert group avatar URL to HTTP before handing to BaseAvatar	2017-11-10 11:41:51 +00:00
Luke Barnard	d179267714	Add prop type	2017-11-10 11:41:36 +00:00
Peter Vágner	681f43913a	Make the disabled PowerSelector element showing custom value translatable. Fixes #5547	2017-11-10 11:26:53 +01:00
Richard Lewis	bd6b5c4498	Improve function name.	2017-11-10 10:17:55 +00:00
Richard Lewis	98ac3dd19b	Explicitly set initialisation state.	2017-11-10 09:44:58 +00:00
Luke Barnard	31be27515c	Modify the group room visibility API to reflect the js-sdk changes ... See https://github.com/matrix-org/matrix-js-sdk/pull/569	2017-11-09 16:28:21 +00:00
David Baker	b1ec430523	Remove now-unused dispatches	2017-11-09 16:09:12 +00:00
David Baker	820d9c1c25	Show staus bar on Unknown Device Error ... Don't pop up the dialog as soon as we can't send a message. Also removes dispatches used to keep the RoomStatusBar up to date. We can get the same events straight from the js-sdk via the pending events event.	2017-11-09 15:58:15 +00:00
Luke Barnard	a8487c540f	Convert group avatar URL to HTTP before handing to BaseAvatar ... This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.	2017-11-09 14:34:04 +00:00
Richard Lewis	da8b1ff1cd	Ensure that loading state is reset when showing app panel.	2017-11-09 14:28:24 +00:00
Luke Barnard	9a6c9594a1	Correctly display group invite ... By making sure the groupName truncates in the right place	2017-11-09 14:16:54 +00:00
Richard Lewis	f796bc79c3	Fix addition of scalar token to widget URL. ... Add error logging.	2017-11-09 14:07:29 +00:00
Luke Barnard	9027780215	Show group name in flair tooltip if one is set ... e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver" Fixes https://github.com/vector-im/riot-web/issues/5341	2017-11-09 12:38:43 +00:00
Luke Barnard	6eeb91ee2e	Display group member profile (avatar/displayname) in ConfirmUserActionDialog ... Fixes https://github.com/vector-im/riot-web/issues/5486	2017-11-09 12:24:20 +00:00
Travis Ralston	030633fa90	Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings	2017-11-08 17:43:38 -07:00
Travis Ralston	2711da28b4	Use the SettingsStore in the UnknownDeviceDialog	2017-11-08 17:43:06 -07: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
Richard Lewis	8016fb82d7	Fix broken commit.	2017-11-08 20:38:54 +00:00
Richard Lewis	56581ef408	Fix various loadingElement related issues.	2017-11-08 20:38:31 +00:00
Richard Lewis	b2b07d9370	Formatting	2017-11-08 20:17:28 +00:00
David Baker	7b243bf64d	Revert "UnknownDeviceDialog: get devices from SDK"	2017-11-08 18:49:50 +00:00
Richard Lewis	be0a76dbd6	Update variable name and JSdoc for improved clarity.	2017-11-08 17:44:54 +00:00
David Baker	b575df7da7	Merge pull request #1591 from matrix-org/luke/groups-order-admins-first ... Order users in the group member list with admins first	2017-11-08 14:04:28 +00:00
Luke Barnard	e2a0cba6cb	If group member privilege level is equal, disambiguate with displayname or userId	2017-11-08 13:57:38 +00:00
Matthew Hodgson	e729bc431d	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-08 04:29:52 -08:00
Luke Barnard	e3e161fbea	Order users in the group member list with admins first	2017-11-08 11:51:58 +00:00
Luke Barnard	7075931c58	Merge pull request #1589 from matrix-org/luke/improve-room-address-picker ... Improve address picker for rooms	2017-11-08 11:49:45 +00:00
Luke Barnard	c1d9d3714a	Fix not being able to filter community rooms - fixes vector-im/vector-web#5538	2017-11-08 10:55:51 +00:00
Luke Barnard	077ca36b05	Rank rooms with shorter matching aliases first	2017-11-08 10:47:45 +00:00
Luke Barnard	b3674f503d	Do not search through room topics	2017-11-08 10:32:48 +00:00
Luke Barnard	4c47f75918	Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility ... Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-08 10:04:41 +00:00
Peter Vágner	a29ab0976b	Make the addresses heading on the aliases settings view translatable	2017-11-08 10:23:11 +01:00
Matthew Hodgson	ce6957a288	Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api ... Alter group member api	2017-11-07 22:46:11 +00:00
Travis Ralston	289b0c2b6a	Merge branch 'develop' into travis/granular-settings	2017-11-07 14:55:12 -07:00
Luke Barnard	8fbe50a1cf	Merge pull request #1580 from matrix-org/luke/groups-new-group-settings ... Improve group creation UX	2017-11-07 18:55:34 +00: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
Luke Barnard	edc744067f	Add checkbox to GroupAddressPicker for determining visibility of group rooms	2017-11-07 18:51:41 +00:00
Matthew Hodgson	3b1726657f	Merge pull request #1586 from turt2live/travis/message-pinning-fix1 ... Default to no read pins if there is no applicable account data	2017-11-07 18:24:21 +00:00
David Baker	49a935881f	Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk ... UnknownDeviceDialog: get devices from SDK	2017-11-07 18:15:59 +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
David Baker	10f15dfc56	Unmounted guard	2017-11-07 17:10:40 +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
David Baker	ec560345c7	UnknownDeviceDialog: get devices from SDK ... rather than having to have the error message passed in. This is in preparation for not having the dialog pop up straight away when a message isn't sent so we don't have to keep the error object knocking around somewhere.	2017-11-07 16:37:43 +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	646cabf324	Add missing whitespace	2017-11-07 15:15:10 +00:00
Luke Barnard	ddc1ff2f23	Name things in a sane way	2017-11-07 15:13:26 +00:00
Luke Barnard	62305a1ccd	Implement tooltip for group rooms	2017-11-07 14:07:31 +00:00
Richard Lewis	96de72ab44	Switch to using existing dep "qs" and record in package.json	2017-11-07 12:45:12 +00:00
Richard Lewis	d3784b4925	Fix URL parameter encoding.	2017-11-07 12:33:38 +00:00
Richard Lewis	eb8c15075a	Fix url params parsing.	2017-11-07 11:58:38 +00:00
Luke Barnard	7a09127687	Alter group member api ... To match https://github.com/matrix-org/synapse/pull/2647	2017-11-07 11:27:42 +00:00
Richard Lewis	70c4100350	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-07 11:04:05 +00: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
Luke Barnard	36cd22663a	Open group settings when the group is created	2017-11-06 18:02:50 +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	781b94c8f4	Appease the linter ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 15:37:06 -07:00
Travis Ralston	45140cab69	Don't assume false means "use state" ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 19:52:42 -07: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
Matthew Hodgson	8587b36715	Merge branch 'develop' into matthew/status	2017-11-04 23:51:26 +00:00
Matthew Hodgson	b2ddcb8027	tint the colours in the theme rather than hardcode vector green	2017-11-04 23:43:20 +00:00
Travis Ralston	c7eee36990	Fix lanugage detection ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:38:26 -06:00
Travis Ralston	4f1ad974fc	Delay URL preview saving until the save button is pressed ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:32:13 -06:00
Travis Ralston	358298e4ee	Support room color in settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 16:10:25 -06:00
Matthew Hodgson	3fd5937687	Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing ... Fixes React warning	2017-11-04 15:41:57 +00: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
Luke Barnard	abff4ee6b5	Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog ... Add CSS classes to group ID input in CreateGroupDialog	2017-11-03 16:14:59 +00:00
Luke Barnard	b88c13d527	Use prefixed class names to avoid collisions with other libraries	2017-11-03 16:02:41 +00:00
Luke Barnard	e84e4ed5f5	Add CSS classes to group ID input in CreateGroupDialog	2017-11-03 15:38:12 +00:00
Matthew Hodgson	6747390333	merge	2017-11-03 15:12:24 +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
David Baker	2c9a93a8ac	Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills ... Fix multiple pills on one line	2017-11-03 14:24:33 +00:00
David Baker	802ab16746	Fix multiple pills on one line	2017-11-03 14:06:59 +00:00
Michael Telatynski	b2cd65e182	Fixes React warning ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-03 12:30:58 +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
Richard Lewis	853ada027d	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering	2017-11-02 18:34:46 +00:00
Richard Lewis	0e854ee356	Fix loading and initialisation spinners.	2017-11-02 18:33:11 +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
Richard Lewis	a52bb9d603	Pass URL to check.	2017-11-02 17:27:59 +00:00
David Baker	7c17ad8509	Merge pull request #1566 from matrix-org/luke/groups-room-publicity ... Add toggle to alter visibility of a room-group association	2017-11-02 15:38:03 +00:00
Luke Barnard	982e87e01c	Communities are communities, wrap div for label alignment	2017-11-02 15:04:40 +00:00
David Baker	8895ab7e5b	Merge pull request #1564 from matrix-org/dbkr/pillify_at_room ... Pillify room notifs in the timeline	2017-11-02 14:22:58 +00:00
Luke Barnard	bf77b51b5e	Merge branch 'develop' into luke/groups-room-publicity	2017-11-02 13:39:33 +00:00
Luke Barnard	790db94fd7	Add toggle to alter the visibility of a room-group association	2017-11-02 13:31:11 +00:00
Luke Barnard	e909d859ab	Merge branch 'develop' into luke/groups-room-info	2017-11-02 10:56:33 +00:00
David Baker	4f8d6d8fbe	Pillify room notifs in the timeline ... This scans text nodes in the DOM for room notifications and turns them into pills. Changes the pillification code around a bit so it works with text nodes. Uses the push processor directly to test the event against the room notifiation rule so we know whether this event would actually trigger a room notification (needs to hook into push at a lower level because otherwise our own room notifications would not pillify since our own events never generate notifications). Requires https://github.com/matrix-org/matrix-js-sdk/pull/565	2017-11-01 19:42:47 +00:00
Luke Barnard	64a369216a	Implement simple GroupRoomInfo ... which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.	2017-11-01 17:27:35 +00:00
Luke Barnard	0dcd52d88f	Fix some react warnings firing	2017-11-01 17:12:22 +00:00
Matthew Hodgson	64d8c81897	Merge branch 'develop' into matthew/status	2017-11-01 15:24:30 +00:00
Stefan Parviainen	e1e4fc2dac	Make eslint happy ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 16:18:48 +01:00
Stefan Parviainen	d6f1e12bee	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 15:50:45 +01:00
Richard Lewis	17c0405862	Restructure to pass props from componentWillRecieveProps.	2017-10-31 16:31:46 +00:00
Luke Barnard	302bd6c3e9	Escape dash in regex	2017-10-31 11:48:56 +00:00
Richard Lewis	758df29b23	Fix onLoad on wrong element.	2017-10-31 10:43:17 +00:00
Richard Lewis	35b33263ea	Use querystring lib	2017-10-31 10:37:40 +00:00
Luke Barnard	53938f7998	Change client-side validation of group IDs to match synapse	2017-10-31 10:25:06 +00:00
Richard Lewis	1cb878bb57	Formatting	2017-10-31 10:04:37 +00:00
Richard Lewis	648b295971	Removed comment	2017-10-31 10:04:02 +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	f070604350	Rename SettingsCheckbox to be a bit more generic ... Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 20:08:27 -06:00
Travis Ralston	9c846e4dd9	Fix URL preview options ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-30 19:49:44 -06:00
Luke Barnard	4e234cfc3b	Alter UI for disinviting a group member ... The same API as kicking is used for disinviting, so only cosmetic changes needed here.	2017-10-30 18:17:35 +00:00
Luke Barnard	19b798be10	Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools ... Only show admin tools to privileged users	2017-10-30 18:03:24 +00:00
Luke Barnard	3e64333ada	Only show admin tools to privileged users	2017-10-30 16:45:45 +00:00
David Baker	57d516f042	Don't refresh page on password change prompt ... It's on the form submit but missing a preventDefault	2017-10-30 16:28:27 +00:00
Luke Barnard	14d600a69f	Fix initial in GroupAvatar in GroupView	2017-10-30 15:04:12 +00:00
Travis Ralston	72517f95bb	Don't explode if the SdkConfig isn't available ... This can happen prior to logging in, for some reason. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:53:59 -06:00
Travis Ralston	99ee58d13a	Don't break the room settings page ... A later commit will make the URL preview settings behave like the rest of the settings page. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:18:03 -06:00
Travis Ralston	c056f4faa6	Make URL preview checkboxes pretty again ... Works for all other settings too! Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:17:15 -06:00
Travis Ralston	b139c8d01c	Generate unique IDs for SettingsCheckbox ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 22:16:46 -06:00
Travis Ralston	786bd87fec	Support URL previews (with bugs) ... Known issues at this point: * The room-level setting accepts the current user's default, which is wrong * The checkboxes on RoomSettings are not independent * The checkboxes in RoomSettings need some layout fixes Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 21:48:29 -06:00
Travis Ralston	b5d5c81f32	Add a new component to back various settings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 20:43:27 -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
David Baker	858c3a2548	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-10-27 18:59:57 +01:00
Stefan Parviainen	95b2392104	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
Richard Lewis	3756ce606d	Check URL prop updates and ensure that widgets are refreshed.	2017-10-27 17:49:14 +01:00
Matthew Hodgson	5d0629ff73	resolve matrix.status.im v. matrix.org confusion	2017-10-27 14:23:16 +01:00
Richard Lewis	7662b5ac8f	Unfinished, non-working changes to try and handle URL changes gracefully	2017-10-27 13:47:51 +01:00
Luke Barnard	e094c32c62	Simplify GroupStore listener registration	2017-10-27 11:38:10 +01:00
Matthew Hodgson	0952befdea	target blank for tg	2017-10-27 01:09:37 +01:00
Matthew Hodgson	015aed0597	hide optionality of email for status	2017-10-27 01:03:04 +01: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
Matthew Hodgson	14d9743e30	unbreak reg	2017-10-26 17:22:32 +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
David Baker	5871a74228	Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo ... Add invite button to MemberInfo if user has left or wasn't in room	2017-10-26 11:35:45 +01:00
Luke Barnard	591a7f4b86	Default to false	2017-10-26 10:06:04 +01:00
Luke Barnard	97b9cf6402	Actually use the synced setting	2017-10-26 09:58:46 +01:00
David Baker	e6c3483c8b	Add correct telegram link	2017-10-26 09:58:05 +01:00
Matthew Hodgson	deb0f902e3	linting	2017-10-26 01:59:18 +01:00
Matthew Hodgson	1237de3ef0	Merge branch 'develop' into matthew/status	2017-10-26 01:47:22 +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
Luke Barnard	3ae97348f8	Add option to mirror local video feed	2017-10-25 18:17:33 +01:00
Luke Barnard	4cfbd66729	Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip ... Use the correct userId when displaying who redacted a message	2017-10-25 17:47:22 +01:00
Luke Barnard	cedc0b27a9	Handle redaction with no sender	2017-10-25 17:37:20 +01:00
Luke Barnard	5990e41bd7	Use the correct userId when displaying who redacted a message	2017-10-25 17:24:45 +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
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
David Baker	19364c25ee	Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name ... Fix room address picker tiles default name	2017-10-25 14:25:51 +01:00
Luke Barnard	fbe0cc4927	Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50 ... T3chguy/hide level change on 50	2017-10-25 14:09:59 +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	27f845a7aa	Match on any alias	2017-10-25 12:42:58 +01:00
Luke Barnard	7029ab07fc	If no canonical alias, use first alias (and fallback to Unnamed)	2017-10-25 12:38:39 +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
Richard Lewis	fd85c74bc5	Merge pull request #1520 from matrix-org/rxl881/deleteWidget ... Add a delete confirmation dialog for widgets	2017-10-25 10:45:52 +01:00
Richard Lewis	2e3bdfd55d	Fix string indentation.	2017-10-25 10:45:17 +01:00
Matthew Hodgson	6beb604cd0	fascist linting >:(	2017-10-25 02:31:30 +01:00
Matthew Hodgson	eb4b7c78a0	skin register screen	2017-10-25 02:04:02 +01:00
Matthew Hodgson	adbea44d70	hide login options for status	2017-10-25 01:30:09 +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
Matthew Hodgson	26e8b2c1b3	switch to a LoginPage wrapper component ... as it's much nicer in the CSS to wrap the LoginBox as needed rather than have separate header & footer divs floating above and below it which need to be correctly vertically centered	2017-10-24 23:37:26 +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	88fd60066f	Fix typo ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 20:07:57 +02:00
Stefan Parviainen	b5024cca75	Further simplify MemberEventListSummary a bit ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-24 19:34:08 +02:00
Luke Barnard	e9ce7f97f5	canSetRelatedRooms -> canSetRelatedGroups	2017-10-24 17:57:26 +01:00
Stefan Parviainen	4ff369c884	Merge branch 'develop' into departify	2017-10-24 18:27:24 +02:00
Luke Barnard	640d88f25d	Typo	2017-10-24 16:21:18 +01:00
Luke Barnard	ee7ebc425c	Only show editing UI for aliases/related_groups for users /w power	2017-10-24 16:19:09 +01:00
David Baker	ba46faf1b1	Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings ... Fix some react warnings in GroupMemberList	2017-10-24 11:18:03 +01:00
Luke Barnard	d1db0d6426	Deduplicate members, key by userId	2017-10-24 10:50:31 +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
Luke Barnard	1cc427ba46	Fix some react warnings in GroupMemberList ... - If the list contains two users twice, react would warn about duplicate keys. Use `index` instead. - Check if unmounted before setting state after fetching members.	2017-10-24 09:58:45 +01:00
Richard Lewis	11d4a63a32	Update text and split across multiple lines.	2017-10-23 23:59:36 +01:00
Richard Lewis	8b7f737c97	Remove logging. ... Return early.	2017-10-23 23:47:37 +01:00
Richard Lewis	54bd916862	Split string across multiple lines.	2017-10-23 20:08:52 +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	ef30ba889b	Make MemberEventListSummary more translatable ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:55:40 +02:00
Richard Lewis	3c4c986aca	Update button text	2017-10-23 18:42:43 +01:00
Luke Barnard	2f418976aa	Only show flair for groups with avatars set ... Fix vector-im/riot-web#5377	2017-10-23 17:06:47 +01:00
Richard Lewis	ee60155846	Add delete widget confirmation dialog.	2017-10-23 17:05:44 +01:00
Luke Barnard	0799e5cde4	Refresh group member lists after inviting users	2017-10-23 16:04:26 +01:00
Luke Barnard	03f4e6c622	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-10-23 14:57:50 +01:00
Luke Barnard	a133fd1cf4	Fix "failed to create community" message	2017-10-23 14:57:40 +01:00
Matthew Hodgson	440b8e0e31	16px for flair please	2017-10-23 14:56:24 +01:00
Luke Barnard	e89371fb1c	Add click-to-open-settings functionality to GroupAvatar	2017-10-23 14:54:57 +01:00
Matthew Hodgson	f09fbccc19	WIP	2017-10-23 00:56:15 +01:00
David Baker	cbb36f4780	Lint	2017-10-19 17:31:06 +01:00
David Baker	b9574ff382	Group create dialog: only enter localpart ... Since we currently can only create groups on the local server anyway, there's no point making the user jump through the hoop of forming the whole group ID and telling them off if they got the server name wrong.	2017-10-19 16:47:43 +01:00
David Baker	19173ab4d6	Space, man.	2017-10-19 16:31:45 +01:00
David Baker	4abaa93cf0	Add clientside error for non-alphanumeric group ID	2017-10-19 16:28:02 +01:00
Luke Barnard	ea1dbe1f76	Fix invites to groups without names	2017-10-19 15:47:52 +01:00
Luke Barnard	2be0ebdd1d	More Groups->Communities	2017-10-19 15:01:16 +01:00
Luke Barnard	fd65cb1396	Merge pull request #1501 from matrix-org/luke/groups-are-communities ... Groups -> Communities	2017-10-19 12:16:15 +01:00
Luke Barnard	71443e9b94	Remove logs comments	2017-10-19 10:34:24 +01:00
Luke Barnard	5f3c06b38a	Factor out Flair cache into FlairStore ... This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).	2017-10-19 10:28:59 +01:00
Luke Barnard	a40704f085	Merge branch 'develop' into luke/groups-are-communities	2017-10-18 15:57:37 +01:00
Stefan Parviainen	7eeed3e093	Simplify MemberEventListSummary by using pluralization provided by the i18n library ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-17 23:46:23 +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	468a05c6f1	Fix SenderProfile ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-17 21:32:35 +02:00
Luke Barnard	1b8c5b50db	Don't show room IDs when picking rooms	2017-10-17 18:02:35 +01:00
Luke Barnard	85d99d429d	Use correct logic operator	2017-10-17 09:49:39 +01: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	14eee9a37a	Only show invited section if there are invited group members	2017-10-16 17:59:53 +01:00
Luke Barnard	0c34e943fb	Merge branch 'develop' into luke/groups-are-communities	2017-10-16 17:34:06 +01:00
Luke Barnard	760b3cc60a	Merge pull request #1488 from matrix-org/luke/groups-invited-users ... Show "Invited" section in the user list	2017-10-16 18:29:15 +02:00
Luke Barnard	9b08f4d11f	Separate fetching indicator state	2017-10-16 17:21:05 +01:00
Luke Barnard	008e8d4f54	Show "Invited" section in the user list	2017-10-16 16:38:32 +01:00
Luke Barnard	47ac0988ba	Refactor class names for an entity tile being hovered over	2017-10-16 16:31:13 +01:00
Luke Barnard	eaa5dd5f22	Groups -> Communities in the UI ... Translation files still need updating, and this would be much simpler with a script that could automate the tedium	2017-10-16 13:18:39 +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	7307bc412f	Respond to updates from presence context menu ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 23:16:12 -06:00
Travis Ralston	c483717282	Make onClick be a context menu for presence ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 21:44:07 -06:00
Travis Ralston	788e16a716	Linting ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 20:23:50 -06:00
Travis Ralston	0b20681f6a	Put presence management behind a labs setting ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 19:13:46 -06: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
Matthew Hodgson	f32ba0b54c	Merge pull request #1462 from pafcu/translation-fixes ... Use standard subsitution syntax in _tJsx	2017-10-14 23:43:12 +01:00
Matthew Hodgson	71d25bf787	Merge pull request #1442 from turt2live/travis/no_grey ... Don't suggest grey as a color scheme for a room	2017-10-14 23:41:32 +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
Matthew Hodgson	0284a582a1	Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist ... T3chguy/fix memberlist	2017-10-14 22:09:55 +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	c1edc0c32e	add option to disable BigEmoji ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 19:40:45 +01: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	6e7f0d649b	Add option to unset your own avatar ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-13 21:13:47 -06: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
Stefan Parviainen	3b91ada4c8	Departify sending emails and text messages ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-13 20:44:01 +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	45137f030b	Fix merge conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-12 22:18:50 +02: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
Stefan Parviainen	f694fb24ff	Fix merge-conflict ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-11 20:02:14 +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
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
Luke Barnard	d2b9fcc7aa	Merge pull request #1440 from turt2live/travis/pl_enhancements ... Enhancements to room power level settings	2017-10-11 17:31:20 +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
Luke Barnard	21a31b02d0	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-10-11 16:02:10 +01:00
Luke Barnard	060bf3bdf6	Remove inline CSS	2017-10-11 16:02:01 +01: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
Luke Barnard	ffb9dd844a	Merge pull request #868 from psaavedra/set_default_federate_by_settings ... Added TextInputWithCheckbox dialog	2017-10-11 16:28:03 +02:00
Luke Barnard	f6eca14bee	Merge pull request #1456 from matrix-org/dbkr/say_which_homeserver ... Make it clearer which HS you're logging into	2017-10-11 15:11:22 +02:00
David Baker	0f84216a9f	Grey out login form when no valid HS	2017-10-11 14:05:34 +01:00
Luke Barnard	99aabd9025	Merge pull request #1451 from matrix-org/t3chguy/redundant_thing ... Remove redundant stale onKeyDown	2017-10-11 14:31:08 +02:00
David Baker	fa24b4bd2d	Remove this log - it's not an error worth logging	2017-10-11 09:48:12 +01:00
Stefan Parviainen	581abcb4b7	Consistent subsitution variable in translations ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-11 09:15:24 +02:00
David Baker	92be3af990	Make it clearer which HS you're logging into ... Otherwise there's no indication without clicking 'custom server'	2017-10-10 19:16:42 +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	917957c1dc	Modify the group store to include group rooms ... and modify components to use this new part of the store such that feedback can be given when adding or removing a room from the room list.	2017-10-05 14:30:04 +01:00
Michael Telatynski	a8231f7bf9	Remove redundant stale onKeyDown ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-05 08:26:57 +01:00
Michael Telatynski	c115980f21	remove redundant&stale onKeyDown ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-05 08:08:39 +01:00
Michael Telatynski	38de4ae152	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-05 08:00:22 +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	a400c03768	Merge pull request #1447 from matrix-org/luke/feature-flair-related-only ... Restrict Flair in the timeline to related groups of the room	2017-10-04 14:24:59 +01:00
Luke Barnard	0c6b5776ec	Remove commented imports	2017-10-04 14:09:51 +01:00
Luke Barnard	02e7287123	Remove constraint on groups being local, remove logging	2017-10-04 14:08:31 +01:00
Luke Barnard	8d46b19916	Restrict Flair in the timeline to related groups of the room	2017-10-04 14:06:49 +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
Luke Barnard	9e3954865a	Fix a couple of bugs with EditableItemList ... - fix entering the same thing twice (which had the bug of not emptying the "new" field) - fix editing items in the list (which would stack overflow because of typo)	2017-10-04 13:15:38 +01:00
Luke Barnard	28b8582bd6	Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings	2017-10-04 10:37:45 +01:00
Luke Barnard	4e9694be6d	Maintain "blur to add" function to match previous UX	2017-10-04 10:28:26 +01:00
Luke Barnard	407a632a8d	Fix typo	2017-10-04 10:26:43 +01:00
Luke Barnard	d25ebfb844	Remove cruft from EIL	2017-10-04 10:15:44 +01:00
Luke Barnard	011aadcb94	Merge pull request #1421 from pafcu/develop ... Add dummy translation function to mark translatable strings	2017-10-04 10:09:09 +01:00
Luke Barnard	8243c39d83	Factor out EditableItemList from AliasSettings ... Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).	2017-10-04 10:00:01 +01:00
Luke Barnard	03581adf85	Merge pull request #1438 from matrix-org/luke/groups-remove-room ... Implement button to remove a room from a group	2017-10-03 11:45:03 +01:00
Luke Barnard	6b834bc72e	Add confirmation dialog for removing room from group	2017-10-03 11:16:22 +01:00
Luke Barnard	0116c4b486	Log the error when failing to removie room from group	2017-10-03 10:14:08 +01:00
Luke Barnard	3e34a460a4	Add error dialog for when removing room fails	2017-10-03 10:12:11 +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	0e2a1c90d5	Don't suggest grey as a color scheme for a room ... Fixes https://github.com/vector-im/riot-web/issues/5045 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 16:08:50 -06: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
Luke Barnard	955ca6cd2b	Implement button to remove a room from a group ... NB: This doesn't provide any feedback to the user. We should use a GroupSummaryStore-style component to refresh the view after a successful hit to the API. This could affect the summary view as well, because when rooms are removed from a group, they are also removed from the summary (if necessary).	2017-09-29 17:59:24 +01: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	c8b2158156	Lint	2017-09-29 10:42:23 +01:00
Luke Barnard	18e0d8da86	Rename Flair feature to Groups	2017-09-29 10:27:40 +01:00
Luke Barnard	739ddb8410	Merge branch 'develop' into luke/groups-button	2017-09-28 12:11:26 +01: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
Luke Barnard	38fdd155f0	Construct address picker message using provided validAddressTypes	2017-09-28 10:06:51 +01:00
Luke Barnard	929c8627d3	Add button to get to MyGroups (view_my_groups or path #/groups)	2017-09-27 17:45:49 +01:00
Luke Barnard	f3b6b2cc06	Fix GroupView summary rooms displaying without avatars ... - GroupView can now render with rooms in the summary that do not have an avatar - RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar) - RoomAvatar was delinted	2017-09-27 16:18:15 +01:00
Luke Barnard	d52355f80e	Implement adding rooms to a group (or group summary) by room ID	2017-09-27 15:30:58 +01:00
David Baker	2d8bc783b0	Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip ... Give flair avatars a tooltip = the group ID	2017-09-27 14:44:25 +01:00
Luke Barnard	f528e147e3	Give flair avatars a tooltip = the group ID	2017-09-27 14:36:22 +01:00
Luke Barnard	e3405cfd95	shouldOmitSelf -> includeSelf	2017-09-27 11:52:05 +01:00
Luke Barnard	6bc9b32ab7	Fix ability to feature self in a group summary ... By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.	2017-09-27 11:04:41 +01:00
Luke Barnard	1ca9102442	Fix spinner appearing above RP header ... By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel	2017-09-27 10:36:44 +01:00
Stefan Parviainen	35cb52febc	Fix merge conflict	2017-09-27 08:41:37 +02:00
Luke Barnard	1b12602ea5	Merge branch 'develop' into luke/groups-add-rooms	2017-09-26 17:12:52 +01:00
Luke Barnard	20d65535c0	Use all known rooms instead of public rooms	2017-09-26 17:11:54 +01:00
Luke Barnard	ddab8d7b5c	Implement "Add room to group" feature	2017-09-26 14:49:13 +01:00
Robert Swain	24de01e21d	AppTile: Test if widgetUrl startsWith instead of has a substring ... The event origin should be at the beginning of the URL.	2017-09-25 17:14:25 +02:00
Robert Swain	6e49926228	AppTile: Do not test for electron platform ... The method platform method is instead stubbed on all other platforms.	2017-09-25 17:13:18 +02:00
Robert Swain	b047f1caaa	Merge branch 'develop' into rob/electron-screensharing	2017-09-25 17:02:30 +02:00
David Baker	2ab860f487	Merge pull request #1427 from matrix-org/luke/feature-flair-cache-bust ... Bust the flair caches after 30mins	2017-09-25 15:39:06 +01:00
Luke Barnard	20c731f627	Bust the flair caches after 30mins ... Group profile data and the groups a user has publicised will be removed from the cache 30mins after retrieval. There may be some benefits to caching the group profiles for longer than the group memberships but for now they're naively busted after the same 30mins.	2017-09-25 15:21:56 +01:00
David Baker	d9c2f6e610	Merge pull request #1426 from matrix-org/dbkr/profile_in_group_member_info ... Show displayname / avatar in group member info	2017-09-25 15:14:30 +01:00
David Baker	0b96871be4	Lint	2017-09-25 15:07:02 +01:00
David Baker	58ec732fb3	Add width/height/resizeMethod params	2017-09-25 14:51:21 +01: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
David Baker	5b312ffb03	Show displayname / avatar in group member info	2017-09-25 14:38:43 +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	dbae5a66e3	Use translation in img alt text ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-24 09:43:52 +02:00
Stefan Parviainen	f2f5302a7b	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-09-23 09:47:51 +02:00
Stefan Parviainen	cc441f42f9	Some more translatable strings ... Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-23 09:02:51 +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
Michael Telatynski	6d530eeb6e	apply i18n _t to string which has already been translated ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-22 20:04:04 +01: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	a868fa4be9	Merge pull request #1412 from matrix-org/dbkr/truncatedlist_experiment ... Allow TruncatedList to get children via a callback	2017-09-22 16:25:45 +01:00
David Baker	621a108b5e	Use flow style function definition for doc	2017-09-22 15:15:10 +01:00
David Baker	dba48e2f8f	use start, end rather than min, max	2017-09-22 15:07:45 +01:00
David Baker	0f9f1c85a8	Remove done todo	2017-09-22 14:58:49 +01:00
David Baker	4a36e32c8d	Show displayname & avatar url in group member list	2017-09-22 14:52:52 +01:00
David Baker	f1a2b6d327	lint	2017-09-22 13:35:49 +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	29d8df2c9e	De-lint TruncatedList	2017-09-22 10:00:46 +01:00
Luke Barnard	cf23ac5931	Merge branch 'develop' into luke/groups-add-feature-rooms	2017-09-21 17:20:12 +01:00
Luke Barnard	5f840a3031	Implement adding rooms to the group summary ... This includes making UserPickerDialog more generic such that it can also pick rooms from groups.	2017-09-21 16:53:10 +01:00
David Baker	add91f9a7d	Update when a group arrives	2017-09-21 16:28:49 +01:00
David Baker	5940b11fd2	Merge pull request #1404 from matrix-org/luke/feature-flair-click-for-group ... Implement `view_group` dispatch when clicking flair	2017-09-21 15:18:28 +01:00
Luke Barnard	41a9ff22fb	Rename profile object properties to camelCase ... Also, add correct PropTypes for FlairAvatar	2017-09-21 14:22:43 +01:00
David Baker	60d444b841	Merge pull request #1402 from matrix-org/luke/groups-add-featured-rooms-and-users ... GroupView: Add a User	2017-09-21 14:19:58 +01:00
Luke Barnard	e64cc3b666	Implement view_group dispatch when clicking flair	2017-09-21 13:25:36 +01:00
Luke Barnard	9cd4cdf6df	Filter group users results based on query	2017-09-21 10:52:28 +01:00
Luke Barnard	515222c25f	Track action button click event	2017-09-20 17:16:49 +01:00
Luke Barnard	7ef55946da	Fix console error log statement	2017-09-20 17:04:05 +01:00
Luke Barnard	1c1bf82c2a	Add users to group summary using new API	2017-09-20 16:32:02 +01:00
Luke Barnard	44c38652ab	Implement UserPickerDialog for adding users ... Also, use AccessibleButtons.	2017-09-20 15:44:42 +01:00
David Baker	6ad4ba767b	Merge pull request #1401 from matrix-org/luke/fix-separate-sender-profile ... Separate sender profile into elements with classes	2017-09-19 17:21:52 +01:00
Luke Barnard	979b580e1f	Merge branch 'develop' into luke/fix-ugly-integ-button	2017-09-19 17:04:06 +01:00
Luke Barnard	e2ae6e6235	Separate sender profile into elements with classes ... For separate CSS manipulation so that we can vary opacity independently for flair/name/aux	2017-09-19 16:56:14 +01:00
Luke Barnard	668e096194	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2017-09-19 16:36:51 +01:00
Luke Barnard	7414d4d1f9	Fix issue with "props.aux" being inserted instead of e.g. "sent an image"	2017-09-19 16:36:30 +01:00
David Baker	80e0205b78	Fix promise error in flair ... Import bluebird other wise it gets a native promise on my dev box which does not have a finally method	2017-09-19 15:53:54 +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	61a0f1ef67	Fix ugly integration button, use hover to show error ... This simplifies the implementation of the button but also adjusts the appeareance such that a warning triangle appears in the top-right of button if an error has occured. The error popup will now appear when hovering over the button (with related CSS).	2017-09-19 11:57:23 +01:00
Luke Barnard	241d442284	Fail gracefully for non-supporting servers	2017-09-18 15:12:38 +01:00
Luke Barnard	6add06db44	Fix big with rejecting promises upon error	2017-09-18 15:11:49 +01:00
Luke Barnard	26941e994f	Merge branch 'develop' into luke/feature-flair	2017-09-18 14:46:50 +01:00
Luke Barnard	3476cfca79	getPublicGroups->getPublicisedGroups ... To match dbkrs js-sdk wrappers for flair: matrix-org/matrix-js-sdk/pull#542	2017-09-18 14:44:35 +01:00
Luke Barnard	548e5f516c	Put flair into labs	2017-09-18 14:38:41 +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
Matthew Hodgson	141ae916ce	Merge pull request #1387 from turt2live/travis/tooltip_redacter ... Show who redacted an event on hover	2017-09-17 22:36:18 +01:00
Matthew Hodgson	b06d540f4c	Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded ... start MELS expanded if it contains a highlighted/permalinked event.	2017-09-17 22:09:44 +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	f612b1933b	start MELS expanded if it contains a highlighted/permalinked event. ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-14 17:53:47 +01:00
turt2live	8dc2604d63	Show who redacted an event on hover ... This should fix #3931 although it's not obvious who actually performed the redaction. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 09:03:05 -06:00
Matthew Hodgson	bb8538cd1a	Merge pull request #1381 from matrix-org/dbkr/remove_spurious_cancel_button ... Remove spurious cancel button	2017-09-14 10:38:26 +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	081a900524	Merge pull request #1363 from matrix-org/t3chguy/on_copy_tooltip ... respond on copy code block	2017-09-13 14:27:35 +01:00
Michael Telatynski	fea7af11b4	Merge remote-tracking branch 'origin/t3chguy/on_copy_tooltip' into t3chguy/on_copy_tooltip	2017-09-13 14:18:56 +01:00
Michael Telatynski	d3bfdf495c	initialize value with false to prevent undefined. ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-13 14:18:31 +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
Robert Swain	aa82be1fb1	Merge branch 'develop' into rob/electron-screensharing	2017-09-12 10:54:20 +02:00
David Baker	3c70b86668	Merge pull request #1375 from matrix-org/dbkr/active_room_observer ... Avoid re-rendering RoomList on room switch	2017-09-11 18:52:09 +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
Michael Telatynski	0580d536ad	Merge branch 'develop' into t3chguy/on_copy_tooltip	2017-09-10 18:54:52 +01:00
David Baker	7617788345	Merge pull request #1372 from matrix-org/dbkr/emoji_fast_path ... Fast path for emojifying strings	2017-09-10 17:44:02 +01:00
David Baker	05a986334d	Separate function to add code copy button ... For neatness and also so it can show up separately in the profiler.	2017-09-10 15:58:17 +01:00
David Baker	876257f4e2	Consolidate the code copy button ... Adding the code code button was done by manipulating the HTML of the event body to add a span tag, then adding the onclick handler after the thing was mounted. Apart from splitting the code between two places, adding the span tag was, according to Chrome's profiler, taking up quite a lot of CPU cycles (apparently as soon as you set the innerHTML on a div). Instead, just build the whole lot together after the component mounts.	2017-09-10 14:23:33 +01:00
David Baker	ea5726aa4e	Copyright	2017-09-08 23:14:06 +01:00
David Baker	ec3ff529e7	Fast path for emojifying strings ... Emojione's regex for detecting emoji is *enourmous* and we were running it on every display name, room name, message etc every time those components mounted. Add a much simpler regex to rule out the majority of strings that contain no emoji and fast-path them. Makes room switching about 10% faster (in my tests with all the profiling turned on).	2017-09-08 23:05:27 +01:00
Michael Telatynski	b10b0e573d	i18n and change message depending on success of copy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-06 11:29:55 +01:00
Michael Telatynski	269f1f33e3	show response on copy so you don't mash it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-06 11:27:25 +01:00
Robert Swain	53574541c3	AppTile: Add Jitsi electron screensharing support	2017-09-04 09:31:25 +02:00
Luke Barnard	0ded4acba0	Mark TODO for https://github.com/vector-im/riot-web/issues/4951	2017-08-31 17:52:53 +01:00
Luke Barnard	d84190f58d	Explain Flair debounce	2017-08-31 17:49:19 +01:00
Luke Barnard	e89d52ccbf	Do not get avatars when no groups were/could be retrieved	2017-08-31 16:46:39 +01:00
Luke Barnard	86e8a4c7e2	Make componentWillMount not async ... This was left over from a previous refactor	2017-08-31 16:44:14 +01:00
David Baker	9efa604706	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-30 17:39:47 +01:00
David Baker	cf747fcb57	Lint	2017-08-30 17:34:44 +01:00
Luke Barnard	ebc1993530	Implement Flair ... Add 14x14 group avatars next to sender profiles.	2017-08-30 11:10:49 +01:00
Richard Lewis	84481f1a1e	Merge pull request #1350 from matrix-org/rxl881/scalarTokenFix ... Make staging widgets work with live and vice versa.	2017-08-30 11:04:50 +01:00
Richard Lewis	2ff1888054	Make staging widgets work with live and vice versa.	2017-08-30 10:36:22 +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	824b29dc1f	PR feedback	2017-08-30 09:22:26 +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
Michael Telatynski	cd1e58cb61	_tJsx returns a React Object, the sub fn must return a React Object ... not a string	2017-08-26 08:18:55 +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
Michael Telatynski	ec6867dc8b	Fix React crying on machines without internet due to return undefined	2017-08-24 12:32:37 +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	a69cc9169f	lint fix.	2017-08-22 10:04:57 +01:00
David Baker	ac64e9b705	Lint	2017-08-21 19:34:07 +01:00
David Baker	b898d15580	Specify default number of members to load	2017-08-21 19:30:28 +01:00
David Baker	e77ea352e4	Support full group membership cycle ... Apart from knocking, ie. Invite / accept / reject / leave	2017-08-21 19:18:32 +01:00
David Baker	a0fe3d1cb0	Merge pull request #1326 from matrix-org/rav/userpicker_proptypes ... Fix proptypes on UserPickerDialog	2017-08-21 16:43:15 +01:00
Richard van der Hoff	764d5891ad	Fix proptypes on UserPickerDialog ... ... so that it doesn't log an error	2017-08-21 16:30:49 +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	c0f0425907	Merge pull request #1322 from matrix-org/rxl881/styling ... Position add app widget link	2017-08-21 14:03:27 +01:00
Richard Lewis	6c8391e3ea	Remove beta tag.	2017-08-21 11:39:06 +01:00
Richard Lewis	e93a1fac3d	Position add app widget link	2017-08-21 11:29:42 +01:00
Robert Swain	2eac869e27	Merge branch 'develop' into rob/apps-not-e2ee	2017-08-21 10:30:38 +02:00
Robert Swain	70824960ee	AppPermission: Make strings translatable	2017-08-21 10:23:55 +02:00
Matthew Hodgson	d7f5295949	untested WIP for supporting multiple widgets properly	2017-08-18 18:40:00 +01:00
Richard Lewis	1862057695	Only render appTile body (including warnings) if drawer shown.	2017-08-18 18:33:56 +01:00
Luke Barnard	b678c2cf0f	Don't bind Pill function, React does this for us	2017-08-18 17:15:27 +01:00
Robert Swain	2e00968bcd	AppPermission: Note that apps are not E2E encrypted in E2E rooms	2017-08-18 17:44:33 +02: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	bf07333915	Merge pull request #1316 from matrix-org/luke/fix-app-name-case ... Don't apply case logic to app names	2017-08-18 15:08:40 +01:00
Luke Barnard	5e0a7212d9	Don't apply case logic to app names ... As they should have the Correct Case in integrations land now	2017-08-18 14:57:28 +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
Richard Lewis	857a8c9519	Remove empty defaultProps.	2017-08-18 13:28:47 +01:00
Richard Lewis	84f5e5aad2	REmove unused onCancelClick	2017-08-18 12:21:48 +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	96900e76a0	Move error logging to where it is first caught.	2017-08-18 11:51:32 +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
David Baker	91fe308f06	Merge pull request #1310 from matrix-org/t3chguy/hotfix1 ... hotfix bad fn signature regression	2017-08-17 17:31:55 +01:00
Michael Telatynski	766c188a1e	hotfix bad fn signature regression ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-17 17:15:18 +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
Michael Telatynski	ca5e26744f	Make dialog more specific and hide options behind advanced spoiler	2017-08-17 13:33:07 +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	eb77dcc8e3	Camel case variable name	2017-08-17 11:24:25 +01:00
Richard Lewis	2c25639a61	Fix copyright header	2017-08-17 11:22:42 +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
MTRNord	59815359f8	Add misiing _tJsx import	2017-08-16 23:55:43 +02:00
MTRNord	fceccfc503	Add missing Robot string to translation	2017-08-16 23:54:36 +02:00
David Baker	252ab208e4	Merge pull request #1300 from matrix-org/dbkr/userpicker ... Refactor ChatInviteDialog to be UserPickerDialog	2017-08-16 14:29:07 +01:00
David Baker	e1ddd3781d	Merge branch 'dbkr/userpicker' into dbkr/group_userlist	2017-08-15 14:10:45 +01:00
David Baker	81273ec855	Move non-invite specific stuff to UserAddress	2017-08-15 13:42:23 +01:00
David Baker	bbcf7e1d9b	s/inviteList/userList/	2017-08-15 13:30:13 +01:00
David Baker	fa660c8211	PR feedback	2017-08-15 10:57:24 +01:00
David Baker	64f352dda7	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-15 10:49:07 +01:00
Luke Barnard	004cc42cfc	Merge pull request #1298 from matrix-org/luke/store-history-as-raw-content ... Store history as raw content	2017-08-15 09:18:22 +01:00
Luke Barnard	6baca05968	Merge pull request #1297 from matrix-org/luke/fix-user-pill-onclick ... Add onClick to user pills	2017-08-15 09:15:50 +01:00
David Baker	b7b449434d	Lint	2017-08-15 09:10:13 +01:00
David Baker	1b66e88b6e	ChatInviteDialog -> UserPickerDialog pt 2 ... The other changes I forgot to add	2017-08-14 17:43:00 +01:00
David Baker	447aa1e5a0	Refactor ChatInviteDialog to be UserPickerDialog ... Now it's just a means of choosing users and all the actual inviting functionality is moved out to Invite.js. This will allow us to reuse it for inviting to groups. Adds the ability to restrict what types of addresses may be chosen, although this isn;t used yet, it will be necessary for groups because groups don't support 3pid invites.	2017-08-14 17:38:59 +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
Luke Barnard	bb229d33a4	Add onClick to user pills ... instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.	2017-08-14 14:44:08 +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	67f9c3774d	make string more human-friendly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:51:47 +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
David Baker	f4092cc9b4	Merge pull request #1287 from matrix-org/luke/fix-hide-autocomp-on-selection-change ... Hide autocomplete when RTE selection state (cursor) changes	2017-08-09 18:21:25 +01:00
David Baker	4daf9064d9	Convert to API objects ... & remove redundant power label	2017-08-09 18:15:31 +01:00
Luke Barnard	794bf820cc	Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog ... Fix Set MXID Dialog woes	2017-08-09 17:53:50 +01:00
Luke Barnard	2d47d3d2c3	Hide autocomplete when RTE selection state (cursor) changes	2017-08-09 17:36:35 +01:00
Michael Telatynski	579090a4e3	add comment	2017-08-09 16:37:38 +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
David Baker	c1546ceb59	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-09 13:46:15 +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
David Baker	234a88c098	WIP group member list/tiles	2017-08-04 15:00:34 +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
Richard Lewis	5752345b80	Merge pull request #1263 from matrix-org/rxl881/warnings ... Display warning if widget is mixed content	2017-08-02 17:30:46 +01:00
Richard Lewis	7599bde1f6	Fix logging line length.	2017-08-02 17:05:46 +01:00
Kegan Dougal	c914f1607b	scalar-develop is a scalar URL	2017-08-02 14:35:14 +01:00
Michael Telatynski	6e39e72849	fix m.federate always being false because value is a string. Y HTML... ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 14:00:24 +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
Michael Telatynski	4b4b730233	fix and i18n the impl ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-02 13:41:26 +01:00
Michael Telatynski	fd454b476a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings	2017-08-02 12:15:00 +01:00
Richard Lewis	48faf72fdc	Disable eslint rule	2017-08-01 21:00:18 +01:00
Richard Lewis	2ab6bc84a7	Improve clarity	2017-08-01 17:49:41 +01:00
Richard Lewis	f0224460d2	Fix comparison and handle case where app has permission to load but content is mixed protocol.	2017-08-01 17:48:02 +01:00
Richard Lewis	d29610bdd2	Fix boolean comparison.	2017-08-01 17:45:06 +01:00
Richard Lewis	f57b0d4cc7	Fix invalid translation	2017-08-01 17:43:38 +01:00
Richard Lewis	bc4d979d1e	Display warning if widget is mixed content	2017-08-01 17:29:29 +01:00
Luke Barnard	a40a86669a	Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating ... Use componentWillReceiveProps to update pill state when props change	2017-08-01 16:30:25 +01:00
Luke Barnard	630c2968eb	Use componentWillReceiveProps	2017-08-01 16:20:32 +01:00
Luke Barnard	71abd3aff8	Revert setting of key	2017-08-01 16:14:12 +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
Richard Lewis	546173d246	Fix scalar token	2017-08-01 15:53: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
Luke Barnard	9e71ba26c4	Add key prop to RTE decorated entities (Pills and links) ... This will cause a re-render when the URL of the pill/link changes. fixes vector-im/riot-web#4718	2017-08-01 13:51:08 +01:00
Richard Lewis	abae43b65e	Merge pull request #1257 from matrix-org/rxl881/widgetPermissions ... Widget permissions	2017-08-01 12:13:09 +01:00
Richard Lewis	5f8e86197f	Check that wurl is scalar, before checking for curl	2017-08-01 12:00:03 +01:00
Richard Lewis	596efb6062	Fix missing comma	2017-08-01 11:42:50 +01:00
Richard Lewis	15f39040a0	Simplify canUserModifyWidgets API	2017-08-01 11:39:17 +01:00
Michael Telatynski	62af06104d	resolve -> reject because semantics.	2017-07-31 14:22:05 +01:00
Michael Telatynski	f310d4446c	i18n the title of the set mxid dialog	2017-07-31 13:31:07 +01:00
Michael Telatynski	25d1d21d93	copy logic from RegistrationForm to detect invalid localparts	2017-07-31 13:28:43 +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
Richard Lewis	a310ff3bab	Add ToDo item.	2017-07-28 18:21:23 +01:00
Richard Lewis	6aa1d923ce	Add comment	2017-07-28 16:48:13 +01:00
Richard Lewis	9935dd0051	Add comment to explain "fullWidth" component porperty.	2017-07-28 16:46:21 +01:00
Richard Lewis	8529a21f5c	Translate "Allow"	2017-07-28 16:42:07 +01:00
Richard Lewis	700ef34e95	Translate warning	2017-07-28 16:39:18 +01:00
Richard Lewis	4308d2c635	Inline setState.	2017-07-28 16:36:06 +01:00
Richard Lewis	50ad80ad86	Use ES6 style import	2017-07-28 16:24:32 +01:00
Richard Lewis	2e6fb1f956	Fix license header	2017-07-28 16:23:49 +01:00
Richard Lewis	6238c1d704	Fix default prop initialisation	2017-07-28 16:23:38 +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	aff1cd9469	Add allow-presentation permission to iframe sandbox permissions	2017-07-28 11:14:04 +01:00
Richard Lewis	11335b1488	Rename variable to curlBase, for clarity	2017-07-28 10:18:06 +01:00
Richard Lewis	e1d9301eb4	Strip query parameters from content URLs	2017-07-28 10:01:58 +01:00
Richard Lewis	d69c9a36b3	Factor out check permissions code.	2017-07-27 23:38:26 +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
Richard Lewis	5e23d676b4	Remove comments.	2017-07-27 23:05:43 +01:00
Richard Lewis	51d160e7d6	Hide edit button when user does not have permission to edit.	2017-07-27 20:18:31 +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	ab7fcbb5e7	Add function to determine if a user can modify widgets and style UI components as a result.	2017-07-27 18:10:28 +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
Richard Lewis	9ee1f3962d	Set display URL from wurl if curl not specified.	2017-07-27 16:42:29 +01:00
Richard Lewis	8e4f1f0989	Add message spinner.	2017-07-27 16:41:52 +01:00
Richard Lewis	f2058e0a6c	Add message spinner component.	2017-07-27 16:41:20 +01:00
David Baker	92746f8cb5	Merge pull request #1254 from matrix-org/luke/fix-join-command ... Fix /join #alias command in markdown mode	2017-07-27 15:43:02 +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
Luke Barnard	dff79c4688	Only apply room pills to matrix.to room links, exclude event links ... This fixes https://github.com/vector-im/riot-web/issues/4680 and fixes https://github.com/vector-im/riot-web/issues/4670	2017-07-27 13:01:40 +01:00
Luke Barnard	4d4078be7e	Remove disambiguation from pills	2017-07-27 10:54:23 +01:00
Luke Barnard	f19fade448	Strip " (IRC)" from display names inserted into the timeline	2017-07-27 10:50:41 +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
Richard Lewis	9f52c13bea	Grant permission to load app widget.	2017-07-26 16:47:58 +01:00
Richard Lewis	76f4f88fcd	App tile permissions -- broken	2017-07-26 11:28:43 +01:00
David Baker	7469a9ae2a	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-07-25 17:20:16 +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
David Baker	c2034d5335	Add user list to groups	2017-07-25 15:56:16 +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	11f3a1db72	Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills	2017-07-25 09:37:47 +01:00
Luke Barnard	ac597996e0	Remove outdated comment	2017-07-25 09:37:18 +01:00
Luke Barnard	026582bcf7	Add unmounted guard	2017-07-25 09:22:08 +01:00
Luke Barnard	5efd5bf927	done -> then, style	2017-07-25 09:20:14 +01:00
Luke Barnard	d13c4b510c	Merge branch 'develop' into luke/feature-async-pills	2017-07-24 17:39:35 +01:00
Luke Barnard	bcd1ab5cd4	Merge pull request #1245 from matrix-org/luke/feature-mentions-ambiguate ... Remove disambiguation from user mentions, add tooltip for mxid	2017-07-24 17:36:42 +01:00
Luke Barnard	61c16569cb	Get user pill profile remote data ... Instead of relying on the local avatar/displayname of a user, request the data from the server and update the pill if it shows up. This required a slight refactor which means we're not doing everything in `render` now. Also I noticed unknown rooms weren't being rendered _at all_! So now you get something that looks like a normal link but with the room alias/ID in it.	2017-07-24 17:18:29 +01:00
Luke Barnard	727b1ca545	Remove disambiguation from user mentions, add tooltip for mxid ... Also add a tooltip for room pills = room alias/ID Requires: https://github.com/matrix-org/matrix-js-sdk/pull/513	2017-07-24 15:08:22 +01:00
Luke Barnard	dc09ad8db4	Re-add NL	2017-07-24 14:50:44 +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	eb0575d9c1	Merge pull request #1241 from matrix-org/luke/refactor-pills ... Factor out shared logic in two code-paths for pill rendering	2017-07-21 17:54:20 +01:00
Luke Barnard	feaafc7a1a	Remove logging	2017-07-21 17:18:48 +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
Richard Lewis	b589fcc3b0	Merge pull request #1240 from matrix-org/rxl881/deleteWidgets ... Hide widget panel while it is being deleted.	2017-07-21 11:14:42 +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	26b16b076c	Merge pull request #1238 from matrix-org/luke/fix-rte-md-mentions ... Insert MD links when autocompleting in MD mode	2017-07-20 15:32: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
Richard Lewis	563f5f7bac	Merge pull request #1226 from matrix-org/rxl881/beta ... Show beta testing icon and help message for widgets tile.	2017-07-20 14:04:53 +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	2f293adad5	Fix userId undefined in pillifyLinks	2017-07-19 18:21:26 +01:00
Luke Barnard	ecaf6e5223	Merge pull request #1234 from matrix-org/luke/feature-mention-pill ... Add mx_UserPill_me class to user pills that match credentials.userId	2017-07-19 17:56:24 +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	5d1b33d2a8	Merge branch 'develop' into luke/feature-mention-pill	2017-07-19 17:22:03 +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
Luke Barnard	d179398cf2	Merge pull request #1227 from matrix-org/luke/feature-matrixto-timeline-pills ... Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill	2017-07-19 17:17:48 +01:00
Luke Barnard	28c98d93d1	Mimic ctrl+j of RT mode in MD mode ... by inspecting whether multiple lines are selected or the selection is empty. If either of these are true, insert a code block surrounding the selection, otherwise insert single backticks around the selection for inline code formatting.	2017-07-19 16:13:47 +01:00
Luke Barnard	b131637a11	Add mx_UserPill_me class to user pills that match credentials.userId	2017-07-19 11:00:26 +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
Luke Barnard	98ca937fef	Interpret backspace at start of style block as block style toggle ... Part of fixing https://github.com/vector-im/riot-web/issues/4580	2017-07-18 17:52:04 +01:00
Luke Barnard	d207ee5244	Expand groups into variables with readable names	2017-07-17 19:31:36 +01:00
Luke Barnard	29757fcf11	Merge branch 'luke/feature-matrixto-timeline-pills' into pills	2017-07-17 16:43:46 +01:00
Luke Barnard	897ff05d87	Implement composer completion user/room pill insertion ... This modifies the composer completion such that completing a room or user will insert an IMMUTABLE matrix.to LINK Entity for the range that was replaced. Display names will not have a colon after their name anymore as it seemed strange that we would insert one after a pill.	2017-07-17 15:53:29 +01:00
Luke Barnard	b1e3dc406c	Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill ... Requires https://github.com/vector-im/riot-web/pull/4597 to look OK	2017-07-17 14:50:45 +01:00
Richard Lewis	6aa0f68ee9	Show beta testing icon and help message for widgets tile.	2017-07-14 23:31:57 +01:00
Luke Barnard	ee5117525c	Merge pull request #1225 from matrix-org/luke/feature-rte-pills ... Decorate http://matrix.to links in the composer as pills	2017-07-14 17:47:16 +01:00
Luke Barnard	434660166c	Decorate http://matrix.to links in the composer as pills ... Any links in the composer that are recognised as matrix.to links will be decorated as `<span>`s with CSS classes (one of mx_UserPill or mx_RoomPill). This implementation has the nice bonus that switching to markdown (and back) will Just Work. This will have some CSS changes coming to better match the design.	2017-07-14 17:04:28 +01:00
Richard van der Hoff	2a52c902e2	Merge pull request #1223 from matrix-org/rav/roomsettings_promise_usage ... Fix RoomSettings save	2017-07-14 14:47:14 +01:00
Richard van der Hoff	9df1fb91ff	Fix RoomSettings save ... Looks like saving RoomSettings had been broken since 0d7cc59. `isFulfilled` cannot be used as a static function.	2017-07-14 14:24:42 +01:00
Kegsay	5274cf59a0	Hook up the edit widget button (#1218) ... * Hook up the edit widget button * Review comments	2017-07-14 11:17:59 +01:00
Luke Barnard	219c00bbc3	Add code-block to the list of blocks where hitting return will split-block ... Hitting return in a code-block will now split the block into two code blocks. (Holding shift will still insert a soft newline into the current block). We still need to make it a bit more obvious that consecutive code-blocks are not contiguous - https://github.com/vector-im/riot-web/issues/4535	2017-07-13 18:42:37 +01:00
Luke Barnard	d97de4d576	Implement disabled-by-default setting for auto-replacement of plaintext emojis ... FTR a list of plaintexts and their unicode equivalents can be found here - https://github.com/vector-im/riot-web/issues/4554#issuecomment-314374303 Pressing space after a matching emoji will replace the plaintext emoji with the equivalent unicode emoji.	2017-07-13 17:37:43 +01:00
Luke Barnard	7fc10789fc	Merge pull request #1217 from matrix-org/luke/fix-rte-html-links ... Improve RTE HTML link handling	2017-07-13 13:57:58 +01:00
Luke Barnard	f1a4209d6b	Fix indentation	2017-07-13 13:47:08 +01:00
Luke Barnard	5826b6f22a	Instead of sending HTML for any Entity, only send HTML for Links ... Otherwise emoji messages are sent as HTML, needlessly	2017-07-13 13:41:17 +01:00
Luke Barnard	be045a6dc0	Interpret whitespace after entity as the end of the entity ... The easiest way to stop the user from inserting whitespace onto the end of an entity is to toggle the entity state of the whitespace that was just entered. This allows the user to continue drafting a message without editing the link content. This is for pasted `<a>` tags that have been copied from a website. We probably also want to be storing entities for substrings of content that are determined to be URLs.	2017-07-13 13:28:51 +01:00
Luke Barnard	4b96963408	Send HTML if there are any entities present in the composer ... This is so that pasted HTML links that are represented as entities are sent as HTML.	2017-07-13 13:27:49 +01:00
Luke Barnard	55e1202c09	Decorate pasted links so that they look like links ... By default, draftjs will represent pasted `<a>` tags as `LINK` entities, but it doesn't do any default decoration of these links. Add a decorator to do so. Most of this was taken from https://github.com/facebook/draft-js/blob/v0.8.1/examples/link/link.html (note the version, v0.8.1).	2017-07-13 13:26:13 +01:00
David Baker	2a68cce3d5	Merge pull request #1216 from matrix-org/dbkr/history_save_unload_nullcheck ... Prevent exception on page unload	2017-07-13 12:38:28 +01:00
Richard van der Hoff	086304532e	Merge pull request #1213 from matrix-org/rav/bluebird ... Switch matrix-react-sdk to bluebird	2017-07-13 12:06:11 +01:00
David Baker	917133219f	Remove sentHistory save altogether	2017-07-13 11:53:22 +01:00
David Baker	1e80edb43c	Prevent exception on page unload ... Null check when saving sent history	2017-07-13 11:30:25 +01:00
Luke Barnard	04dd98e6e9	Remove references to tabComplete, which are now redundant ... (since the old composer has been removed)	2017-07-13 10:16:59 +01:00
Luke Barnard	0e12e384cb	Remove TabComplete-related files	2017-07-13 10:16:42 +01:00
Richard Lewis	9a1e7ad170	Hide widget panel while it is being deleted.	2017-07-13 00:27:03 +01:00
Richard van der Hoff	33f330d434	Manual fixup for remaining q incantaions ... * don't try to use `finally` as a static method * work around absence of `allSettled`	2017-07-12 18:05:40 +01:00
Richard van der Hoff	0d7cc59d99	replace q method calls with bluebird ones ... ``` find src test -name '*.js' | xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/' ```	2017-07-12 18:05:40 +01:00
Richard van der Hoff	0254d2b3a2	q(...) -> Promise.resolve ... ``` find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/' ```	2017-07-12 18:05:08 +01:00
Richard van der Hoff	a06bd84213	replace imports of q with bluebird ... update `package.json` ``` find src test -name '*.js' | xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' find src test -name '*.js' | xargs perl -i -pe 'if (/import [qQ]/) { $_ = "import Promise from '\''bluebird'\'';\n"; }' ```	2017-07-12 18:05:08 +01:00
Luke Barnard	6ff924fc0d	Remove MessageComposerInputOld	2017-07-12 18:03:13 +01:00
David Baker	a48c7d2364	Only allow http and https widget URLs	2017-07-12 14:16:47 +01:00
David Baker	918f5abe81	Lint correctly	2017-07-12 10:34:50 +01:00
David Baker	53316a76f4	Sandbox app iframes	2017-07-12 10:22:14 +01:00
Luke Barnard	af3b6484cd	Merge pull request #1196 from matrix-org/dbkr/groups_better_groupview ... Add more features to Group View	2017-07-11 17:03:47 +01:00
David Baker	4e49ebd6ce	Change incorrect refs to this.props	2017-07-11 14:31:07 +01:00
Kegsay	cf158530f5	Implement new widget API (#1201) ... * Implement new widget API This allows clients to see who provisioned which widgets. * Update to make state_key the wid * Update to latest API * Only show widgets which have required fields * Don't constantly show apps dialog * Fix example to include data key	2017-07-11 12:15:27 +01:00
David Baker	ac4be03f7b	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-10 14:51:13 +01:00
Luke Barnard	b104228a7b	Remove redundant functions, bindings, props	2017-07-10 14:27:41 +01:00
David Baker	696c72be2b	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-10 14:03:30 +01:00
Luke Barnard	c9df079464	Merge pull request #1176 from matrix-org/luke/feature-enable-RTE ... Take RTE out of labs! 🎉	2017-07-10 13:56:00 +01:00
Luke Barnard	9643f0c00b	Merge pull request #1167 from matrix-org/dbkr/my_groups ... Implement 'Groups' page	2017-07-10 09:37:06 +01:00
David Baker	1e713557bb	PR feedback	2017-07-07 18:34:40 +01:00
Luke Barnard	7a8f524f4a	Remove two possible sources for the "AutoComplete stays visible bug ... which is now https://github.com/vector-im/riot-web/issues/4537 <- there. This does two things: - Track which query was the most recent one requesting completion and only process completions for that one. (In this case the empty string "" doesn't have any completions but we still track it so that previous calls with non-empty queries would not race and cause completions to be shown when we actuall don't want any.) - Make the "do we want to show the AutoComplete box?" logic a bit more sane	2017-07-07 15:30:31 +01:00
David Baker	c1833f9833	Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview	2017-07-07 13:44:35 +01:00
David Baker	c21f90338d	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-07 12:02:15 +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
David Baker	fea0a941ce	Fix lint	2017-07-07 11:01:54 +01:00
David Baker	183f45bc1f	Fix lint errors	2017-07-07 10:41:59 +01:00
David Baker	45986306cc	Merge remote-tracking branch 'origin/develop' into dbkr/my_groups	2017-07-07 10:32:37 +01:00
David Baker	fa37d03db6	Improve the Group View page ... Show the rooms in the group in thir various categories, etc	2017-07-06 19:13:14 +01:00
Richard Lewis	d091550ccb	Use app ID for element key and pass screen parameter to scalar.	2017-07-06 15:59:59 +01:00
Luke Barnard	6404f7603c	Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u ... Allow underline through MD and in RTE (MD) using <u> which works with CM	2017-07-06 14:08:01 +01:00
Luke Barnard	d9a67355d2	Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on ... Only insert HTML into the composer in RTE mode	2017-07-06 13:59:52 +01:00
Michael Telatynski	ff7ae5b995	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u	2017-07-06 13:56:20 +01:00
Michael Telatynski	fcd8321a63	Allow underline through MD and in RTE (MD) using <u> which works with CM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 13:49:13 +01:00
Michael Telatynski	6149b37245	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl	2017-07-06 13:30:40 +01:00
Michael Telatynski	c6d9ec42a2	only show unban button in RoomSettings if user has sufficient PL to do so ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-06 12:51:55 +01:00
Luke Barnard	bdefb35c64	Only insert HTML into the composer in RTE mode ... If MD mode is enabled, paste the plaintext equivalent.	2017-07-06 11:52:02 +01:00
Richard van der Hoff	c29863362f	Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key ... Fix a React duplicate key error	2017-07-06 11:08:03 +01:00
Richard van der Hoff	4f8d9d869e	mention preserving ordering in comment	2017-07-06 10:47:15 +01:00
Kegan Dougal	42ba3ff410	Linting	2017-07-06 10:44:32 +01:00
Richard van der Hoff	6a2d6b2e6e	Fix a React duplicate key error ... If a single message contains the same link twice, we get an error from React about the clashing keys. De-dup the links to keep it quiet.	2017-07-06 10:02:25 +01:00
Kegsay	e0e321783b	Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182)	2017-07-06 09:28:48 +01:00
Luke Barnard	0bf1124f1b	Merge pull request #1181 from matrix-org/luke/fix-rte-draft-persist ... Implement MessageComposerStore to persist composer state when room switching	2017-07-05 18:24:27 +01:00
Luke Barnard	7f1d8e3c90	Merge pull request #1188 from matrix-org/luke/feature-rte-visual-bell ... Add visual feedback for when there are no completions available	2017-07-05 18:23:10 +01:00
Luke Barnard	29e793f591	Merge pull request #1180 from matrix-org/luke/fix-rte-force-immediately ... When hitting "tab" use an autocompleteDelay of 0	2017-07-05 18:20:48 +01:00
Luke Barnard	d78168d407	Add visual feedback for when there are no completions available ... Attempts to kep parity with old composer by using the same #faa colour but uses an animation instead of a js timeout. Fixes https://github.com/vector-im/riot-web/issues/4490	2017-07-05 18:14:22 +01:00
Luke Barnard	5c9d3edec4	Revert #1170, fde7d5eaf4 ... There were a few issues with this, namely that links were no longer linkified and an error was logged to the console: `Warning: Stateless function components cannot be given refs (See ref "topic" in EmojiText created by RoomHeader). Attempts to access this ref will fail.`	2017-07-05 14:46:00 +01:00
Luke Barnard	3d5b3ed7ad	Use ContentState instead and persist over localStorage	2017-07-05 11:49:34 +01:00
David Baker	3b06db0725	Pass with, height & resizeMethod through ... Was spelt wrong anyway	2017-07-05 11:39:22 +01:00
Luke Barnard	084a933dbd	Implement MessageComposerStore to persist composer state across room switching ... This behaviour was present in the old composer but implemented using local storage. This is unecessary as we don't really care about our drafts across clients, the important thing is that our draft is kept when switching rooms. As a bonus, ifnore vertical arrow key presses when a modifier key is pressed so that the room switching keys (alt + up/down arrow) don't also cause history browsing (or autocomplete browsing).	2017-07-05 10:24:55 +01:00
Luke Barnard	5f6c3e5afc	When hitting "tab" use an autocompleteDelay of 0 ... So that there's no delay when tab completing. Fixes https://github.com/vector-im/riot-web/issues/4497	2017-07-04 17:49:50 +01:00
Luke Barnard	77348e6201	Remove spurious, unused code	2017-07-04 15:20:00 +01:00
Luke Barnard	e3f2eb5232	Take RTE out of labs! 🎉 ... This stops react-sdk from tracking any state previously stored for the purposes of enabling or disabling the lab feature that enabled the new MessageComposer. It is now enabled permanently. This is being done with the hope that we can get more feedback for it so that when we release we can be confident that people will be OK with the changes it brings.	2017-07-04 14:44:55 +01:00
Richard van der Hoff	fb86534ba3	Merge pull request #1171 from matrix-org/t3chguy/delintify ... De-Lint 23 files	2017-07-04 10:40:49 +01:00
Luke Barnard	664f3acc3c	Only move through history if caret at start or end of line ... As suggested by @dbkr (because this is what we do for the old composer), only move through history when the caret is that the beginning of the first line (block) or end of the last. This has the nice property of being able to move the caret up to a really long message: fixes https://github.com/vector-im/riot-web/issues/4471	2017-07-04 10:12:06 +01:00
Michael Telatynski	34c9bbfd86	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/delintify ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/rooms/RoomHeader.js	2017-07-03 19:15:38 +01:00
Michael Telatynski	827c38d4a5	fix variable clash ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-03 19:13:07 +01:00
David Baker	72eed70a84	Merge pull request #1173 from matrix-org/luke/fix-rte-forgets-me ... Strip out "/me" after committing to RTE history	2017-07-03 15:59:07 +01:00
David Baker	a7bb546b1f	Merge pull request #1172 from matrix-org/luke/fix-rte-md-format-without-selection ... When formatting with MD enabled, move selection inside ** or equivalent	2017-07-03 15:58:02 +01:00
Luke Barnard	775f5a0e5b	Strip out "/me" after committing to RTE history ... So that history can include emotes Fixes https://github.com/vector-im/riot-web/issues/4472	2017-07-03 15:47:03 +01:00
Luke Barnard	86889b8e8c	When formatting with MD enabled, move selection inside ** or equivalent ... Fixes https://github.com/vector-im/riot-web/issues/3225 Also insert `\n` after code-block and blockquote to fix https://github.com/vector-im/riot-web/issues/2746	2017-07-03 15:23:24 +01:00
David Baker	a89ea39dba	Merge pull request #1170 from matrix-org/t3chguy/emojione-room-topic ... make RoomHeader Topic use EmojiText to be emojione-friendly	2017-07-03 10:27:47 +01:00
Michael Telatynski	9ef83b8dc0	de-lint views/voip/* ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:58:46 +01:00
Michael Telatynski	e56203f2a1	de-lint RoomHeader, Avatar, SdkConfig, SlashCommands ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 14:13:32 +01:00
Michael Telatynski	fde7d5eaf4	make RoomHeader Topic use EmojiText to be emojione-friendly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-01 13:36:28 +01:00
David Baker	8468a118b5	Merge remote-tracking branch 'origin/develop' into dbkr/my_groups	2017-06-30 16:15:41 +01:00
Luke Barnard	0b46184a21	Merge pull request #1166 from matrix-org/luke/fix-rte-wrong-history-format ... Always store sent MD messages as MD in history	2017-06-30 16:05:45 +01:00
David Baker	c07057d1d4	Extract props we don't want to pass to BaseAvatar	2017-06-30 16:05:19 +01:00
Luke Barnard	6bc40a112c	Always store sent MD messages as MD in history ... Because converting them to HTML when they got sent as HTML seems a bit pointless when they're just going to get transformed back again when retrieved from history. Fixes regression https://github.com/vector-im/riot-web/issues/4465	2017-06-30 15:47:48 +01:00
Kegan Dougal	b8941f76d3	Fix bug which breaks the close button on scalar	2017-06-30 15:42:36 +01:00
Luke Barnard	15cfe5b8e4	Only allow history selection when on the first or last line ... (of a multi-line or otherwise message in the editor)	2017-06-30 14:27:26 +01:00
Luke Barnard	e7a2c3b975	Only send HTML when using RTE when necessary ... When there are no styled blocks or inline styles applied within blocks, just send text instead of HTML. Also, don't add <br /> for the last <p> (the last block). Fixes https://github.com/vector-im/riot-web/issues/3147	2017-06-30 11:27:00 +01:00
David Baker	84e13d5437	Add GroupAvatar to handle fallback images etc. ... And a few misc tidyups	2017-06-29 17:51:38 +01:00
Luke Barnard	8b8260c509	Move cursor to end of editor when quoting ... When quoting a message, move the selection to the end of the input box. Fixes https://github.com/vector-im/riot-web/issues/2336	2017-06-29 17:22:34 +01:00
David Baker	f99c540b3d	Groups page / Create Group dialog	2017-06-29 17:03:05 +01:00
Luke Barnard	e5e7dec131	Fix #4422 by persisting the "currently composed" message ... This allows for browsing through history without losing the message currently being composed.	2017-06-29 17:02:19 +01:00
Luke Barnard	6bd7284161	Be sensible about handling up/down vs tab/tab-shift ... Fixes https://github.com/vector-im/riot-web/issues/4445	2017-06-29 15:07:06 +01:00
Luke Barnard	8912400675	Add XXX for https://github.com/vector-im/riot-web/issues/4445	2017-06-28 18:05:39 +01:00
Luke Barnard	a3e02f470f	Merge pull request #1156 from matrix-org/luke/fix-rte-debounce ... Do debouncing for autocomplete in a sane way	2017-06-28 18:03:36 +01:00
Luke Barnard	de81188b13	Do debouncing for autocomplete in a sane way ... - Fixes https://github.com/vector-im/riot-web/issues/4419 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285901871 - Fixes https://github.com/matrix-org/matrix-react-sdk/pull/518#issuecomment-285910503 - Fixes bug where the setting being used was the `autocompleteDelay` "syncedSetting" when it should have been the "localSetting" (so the setting being used was always the default)	2017-06-28 17:27:21 +01:00
Luke Barnard	d5585e29b1	Merge pull request #1155 from matrix-org/luke/fix-rte-cursor-at-start-of-history ... Fix issue where the cursor is put at the start of selected history item	2017-06-28 17:17:56 +01:00
Richard Lewis	d61525e420	Merge pull request #1152 from matrix-org/rxl881/apps ... Add support for apps	2017-06-28 16:06:20 +01:00
Richard Lewis	ea83d7eee2	Add missing import and fix apps reference.	2017-06-28 15:53:18 +01:00
Luke Barnard	d696373bc2	Fix issue where the cursor is put at the start of selected history item ... Leading to strange behaviour when selecting all and deleting it. Fixes https://github.com/vector-im/riot-web/issues/4450	2017-06-28 15:29:07 +01:00
Luke Barnard	bcb67bb273	Refactor shared code between onUpArrow and onDownArrow	2017-06-28 15:20:16 +01:00
Richard Lewis	3a10cda2ca	Add translations.	2017-06-28 13:55:18 +01:00
Richard Lewis	f8c064ec25	REmove redundant call to _getApps	2017-06-28 13:45:29 +01:00
Richard Lewis	e70eca0b0c	Comment unused code and add TODO to handle scalar errors.	2017-06-28 12:58:09 +01:00
Richard Lewis	d06d066050	Move getInitialState to top of file.	2017-06-28 12:54:47 +01:00
Richard Lewis	e752cc8557	Use 'this' in preference to local reference.	2017-06-28 12:32:38 +01:00
Richard Lewis	481a66ef3c	Fix header.	2017-06-28 12:26:05 +01:00
Richard Lewis	93bdfc99df	i18n "Cancel" alt text.	2017-06-28 12:25:36 +01:00
Richard Lewis	ddea1f35d2	Fix header.	2017-06-28 12:23:33 +01:00
Luke Barnard	f73fa4b49b	Move processing into renamed function processHtmlforSending ... And explain why this fix is necessary	2017-06-28 11:49:50 +01:00
Luke Barnard	1523d304f2	WIP to prevent RTE from deleting current message input when up arrow pressed	2017-06-28 10:30:59 +01:00
Richard Lewis	ad2517bd8b	Uppercase the first letter of the app tile name.	2017-06-28 10:27:06 +01:00
Luke Barnard	69589c19e7	Work around draft-js-export-html#62 by post-processing <br>\n ... Fixes https://github.com/vector-im/riot-web/issues/4446 by post-processing the output HTML from draft-js-export-html by replacing `<br>\n` with `<br>`. This works for content within or outside of `<pre>`. If we replace with `\n` instead, the newlines only apply in `<pre>` tags so we use `<br>`.	2017-06-27 18:33:45 +01:00
Richard Lewis	3872f0750c	Only show apps button if labs feature enabled.	2017-06-27 17:40:28 +01:00
Richard Lewis	338a4db87f	Only show apps drawer if matrix apps labs setting ids enabled	2017-06-27 17:40:09 +01:00
Luke Barnard	5307731dfd	Overide default draft-js handling of pasting text/html ... This is surprisingly needed to avoid an issue with draft-js that causes multi-line madness when pasting code and then applying format-as-code to it - https://github.com/vector-im/riot-web/issues/2120#issuecomment-271735729. The issue sounds like it is https://github.com/facebook/draft-js/issues/170#issuecomment-195026203 and the suggstion is to override the text pasting handler https://github.com/facebook/draft-js/issues/170#issuecomment-215983216. Meanwhile they haven't modified the default pasting behaviour afaics. I've discovered a separate issue that is apparent even after this suggested fix. (https://github.com/vector-im/riot-web/issues/4446)	2017-06-27 17:10:28 +01:00
Luke Barnard	4645ba1bba	Merge pull request #1150 from matrix-org/luke/fix-rte-dev-tools-toggle ... Allow toggling of dev tools when RTE focussed	2017-06-27 15:38:19 +01:00
Luke Barnard	ba31a32440	Allow toggling of dev tools when RTE focussed	2017-06-27 15:17:57 +01:00
Richard Lewis	aab4c097e6	Make query parameters generic.	2017-06-27 12:26:13 +01:00
Richard Lewis	ddc0da396d	Merge in changes from develop	2017-06-27 11:44:36 +01:00
Richard Lewis	63b1250385	Add comment	2017-06-27 11:39:20 +01:00
Richard Lewis	1f1352786f	Temporarily disable Jitsi default	2017-06-27 11:38:14 +01:00
Richard Lewis	18ea76b864	Removed commented code	2017-06-27 11:31:00 +01:00
Richard Lewis	e343e99355	Cleaned up unused files and removed commented code	2017-06-27 11:28:38 +01:00
lukebarnard	fbaa3de28b	Null-guard m.video info ... Fixes https://github.com/vector-im/riot-web/issues/4423	2017-06-26 22:22:03 +01:00
Johannes Löthberg	48c32172fd	TextualBody: only highlight code block if language was specified ... The highlight.js autodetection is finicky and often wrong, so disable highlighting unless the language was explicitly specified, or if the user has explicitly enabled it in the settings. Fixes vector-im/riot-web#508. Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>	2017-06-26 17:45:40 +02:00
Luke Barnard	c1bceb81d2	Merge branch 'develop' into luke/fix-rte-strikeout	2017-06-26 09:41:17 +01:00
Luke Barnard	caa0250d30	Merge pull request #1144 from matrix-org/rte-fixes2 ... RTE Fixes	2017-06-26 09:38:14 +01:00
Luke Barnard	9404dd30c5	Use <del> for strikeout ... We've swapped to commonmark, which uses <del> instead of ~~ for strikeout, so make the RTE insert <del> when we apply strikeout. Also, when ~~ is inserted, transform them into <del> for simplicity. This means giving an input of ~~test~~ is effectively the same as giving an input of <del>test</del>.	2017-06-23 18:19:06 +01:00
Luke Barnard	89afcfd897	Linting	2017-06-23 17:35:07 +01:00
Luke Barnard	87609582c6	Merge branch 'develop' into rte-fixes2 ... Conflicts: package.json src/autocomplete/CommandProvider.js src/autocomplete/UserProvider.js src/components/structures/RoomView.js src/components/structures/UserSettings.js src/components/views/rooms/MessageComposerInput.js	2017-06-23 15:30:06 +01:00
David Baker	ec36a348be	comment why we send the empty string	2017-06-23 14:48:15 +01:00
Luke Barnard	c51255da40	Submit empty string username when on phone number login	2017-06-23 14:34:19 +01:00
Luke Barnard	f5353fcdc5	Only submit phone number when phone loginType is selected ... Otherwise submit a phoneNumber and phoneCountry of `null` (when logging in with email or username). Fixes https://github.com/vector-im/riot-web/issues/4000	2017-06-23 13:43:52 +01:00
turt2live	a22f14e910	Use 12h timestamps when enabled in RR ... Fixes vector-im/riot-web#4393 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-06-22 08:54:34 -06:00
Richard Lewis	2cb2c44bd8	Remove unused logging	2017-06-20 17:57:48 +01:00
Richard Lewis	68473e118f	Ensure that Scalar Messaging is started and stopped on component mount / unmount	2017-06-20 17:56:45 +01:00
Luke Barnard	2c2091438e	Fix ability to invite users with caps in their user IDs ... By lowercasing only when testing against local user IDs/display names. The user_directory shouldn't care. And when we make the placeholder "We didn't get any results, but here's the user with the exact mxid you typed in", use the original query.	2017-06-20 15:46:54 +01:00
Luke Barnard	f15292becf	Merge branch 'develop' into luke/fix-email-cancel-button-text	2017-06-20 13:30:34 +01:00
Richard van der Hoff	0c431887b0	Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests ... Pop up a dialog when we get a room key request	2017-06-20 13:20:58 +01:00
Richard Lewis	a449588c1c	Replace add app dialog with scalar interface	2017-06-20 10:54:41 +01:00
Richard van der Hoff	a0534e7477	Merge branch 'develop' into rav/handle_received_room_key_requests	2017-06-20 00:25:14 +01:00
David Baker	b1ca83bb9d	Internationalise the drop targets ... Unsure how these had got missed (and yet still had the translation strings in the json)	2017-06-19 17:49:22 +01:00
daniel tygel	13c12811e7	typo	2017-06-19 13:22:23 -03:00
daniel tygel	aebe4fb88f	add two strings to translation	2017-06-19 13:21:23 -03:00
daniel tygel	c418076c32	add two strings to translation	2017-06-19 13:20:16 -03:00
Luke Barnard	83d5822c85	Show a "Skip" button instead of "Cancel" in SetEmailDialog ... Fixes https://github.com/vector-im/riot-web/issues/4309	2017-06-19 13:17:12 +01:00
Richard Lewis	80c5a58fc3	Fix custom widget form styling	2017-06-19 12:06:16 +01:00
Matthew Hodgson	032650e095	Merge branch 'develop' into t3chguy/fix_forwarding	2017-06-19 01:53:35 +01:00
Michael Telatynski	7b4cd31124	make forward_message be friendly with the RVS stuffs ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-16 16:12:52 +01:00
David Baker	aa7ddfe86e	Remove unused collapse_rhs ... Remove all the places we pass collapse_rhs through to places it's never used. Remove the commented RHS collapse button from SimpleRoomHeader.	2017-06-16 15:47:40 +01:00
David Baker	2a01e638b7	Make sure captcha disappears when container does ... Should fix https://github.com/vector-im/riot-web/issues/4095	2017-06-16 10:25:51 +01:00
David Baker	9ecf82a1f2	Show correct text in set email password dialog (2) ... Fixes https://github.com/vector-im/riot-web/issues/4311 The cancel button onClick was hooked directly up to onFinished, so the mouse event ended up as the boolean for whether an email had been set.	2017-06-14 16:06:28 +01:00
David Baker	449c65b784	Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set ... Give password confirmation correct title, description	2017-06-14 15:16:36 +01:00
Luke Barnard	1d4a3ae5a3	Give password confirmation correct title, description ... Fixes https://github.com/vector-im/riot-web/issues/4311 This was due to `BaseDialog` calling `onFinished` with a mouse event instead of `false` (and it was assumed to call with `true/false`, but doesn't)	2017-06-14 14:58:39 +01:00
David Baker	57ef6f3cf8	Make enter submit change password form ... Fixes https://github.com/vector-im/riot-web/issues/4302	2017-06-14 14:50:48 +01:00
Robert Swain	edb11d805e	AppsDrawer: Open add app widget if opening empty drawer ... This felt much better than having to also click the add app widget button.	2017-06-14 15:05:29 +02:00
Robert Swain	5f020423bc	AddAppDialog: Put the submit button inside the form	2017-06-14 15:05:11 +02:00
Robert Swain	2d3c886646	AppsDrawer: Generate room alias for vrdemo	2017-06-14 13:27:15 +02:00
Robert Swain	9c8ab2691b	AppsDrawer: Only append queryParams once	2017-06-14 13:26:43 +02:00
Robert Swain	880e7149f3	ModularWidgets: Add a quick VR demo widget	2017-06-14 13:05:43 +02:00
Luke Barnard	57dfbc4701	Remove unused imports	2017-06-14 10:53:02 +01:00
David Baker	0566e5d992	Merge pull request #1090 from matrix-org/luke/set-email-after-password-2 ... Ask for email address after setting password for the first time	2017-06-14 09:57:07 +01:00
Luke Barnard	4344af58ee	Ask for email address after setting password for the first time ... So that the user can reset their password.	2017-06-14 09:31:16 +01:00
Matthew Hodgson	9dad5d0132	Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings ... remove mx_filterFlipColor from verified e2e icon so its not purple :/	2017-06-13 17:45:56 +01:00
Michael Telatynski	f4aadafed9	remove mx_filterFlipColor from verified e2e icon so its not purple :/ ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-13 17:42:30 +01:00
Robert Swain	d67e7289e8	Merge branch 'develop' into rob/apps	2017-06-13 15:50:43 +02:00
Robert Swain	03ba3bd431	Merge branch 'rxl881/apps' into rob/apps	2017-06-13 15:41:52 +02:00
Robert Swain	91eabbba60	MessageComposer: Trigger Jitsi app from call buttons	2017-06-13 15:35:13 +02:00
Robert Swain	5d898dd098	AuxPanel: Add type checking for userId and showApps properties	2017-06-13 15:34:05 +02:00
Robert Swain	b63edcb390	AppTile: Support deletion of apps from room state	2017-06-13 15:33:17 +02:00
Robert Swain	bcb2f8408b	AppTile: Fix typo in property name	2017-06-13 15:32:40 +02:00
Robert Swain	2aa0aa61e3	AddAppDialog: Support adding apps to room state	2017-06-13 15:31:37 +02:00
Robert Swain	a72cb794f2	AppsDrawer: Populate apps from room state	2017-06-13 15:28:37 +02:00
David Baker	bd00c1d4b1	Merge pull request #1083 from matrix-org/t3chguy/width_height_int ... width and height must be int otherwise synapse cries	2017-06-13 13:23:12 +01:00
Michael Telatynski	ad7c835471	width and height must be int otherwise synapse cries ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-13 12:19:20 +01:00
Richard Lewis	876899948f	Merge in upstream changes	2017-06-13 11:44:23 +01:00
Luke Barnard	10ba5f8c3c	Only process user_directory response if it's for the current query	2017-06-13 11:03:22 +01:00
Richard Lewis	2da30137ec	Fix import path and add LG widget	2017-06-13 10:31:16 +01:00
Luke Barnard	1ce1984858	Fix regressions with starting a 1-1.	2017-06-13 10:15:29 +01:00
David Baker	7b0565e9d1	Merge branch 'master' into develop	2017-06-12 15:53:04 +01:00
Matthew Hodgson	6133186583	fullstop fails	2017-06-12 15:36:24 +01:00
Richard Lewis	b893887707	Fix merge conflict	2017-06-12 14:52:41 +01:00
Richard Lewis	f9f924bbd6	Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps	2017-06-12 14:50:25 +01:00
Richard van der Hoff	cc74a09abd	Remove start_upgrade_registration dispatch handler ... This dispatch is no longer raised anywhere, so we may as well get rid of the code that it executes, as well as the state which is only set there.	2017-06-12 08:38:29 +01:00
Richard van der Hoff	e6d7eedbe6	Remove NeedToRegisterDialog ... - since it's no longer used anywhere	2017-06-12 08:36:41 +01:00
Will Hunt	3ddbf83c62	Add userid back	2017-06-11 07:13:50 +01:00
Will Hunt	f940d2c100	Add reason for ban in room settings	2017-06-10 16:57:09 +01:00
Matthew Hodgson	3b7ce49eab	Merge pull request #1070 from matrix-org/t3chguy/dark_theme/e2e_icons ... adds mx_filterFlipColor so that the dark theme will invert this image	2017-06-10 01:06:31 +01:00
Michael Telatynski	34caf5586f	adds mx_filterFlipColor so that the dark theme will invert this image ... making it more suitable for the said theme Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-10 00:08:40 +01:00
Matthew Hodgson	a4a0acc28d	fullstop fails	2017-06-09 22:19:14 +01:00
David Baker	d6b85c9d4d	Fix translations on conf call banner ... * You can't substitute react elements into a text string * Substituting in undefined gives the string 'undefined', so initialise it to the empty string.	2017-06-09 22:06:43 +01:00
Robert Swain	9e0b476b72	Merge branch 'develop' into rob/apps	2017-06-09 12:06:44 +02:00
Luke Barnard	ce0977373e	Merge pull request #1058 from matrix-org/luke/fix-event-id-state ... Control currently viewed event via RoomViewStore	2017-06-08 18:10:29 +01:00
Matthew Hodgson	df625b0d31	hit MemberInfo with Gemini to fix vector-im/riot-web#4223	2017-06-08 17:26:40 +01:00
Matthew Hodgson	f26aeef2bf	Merge pull request #1056 from matrix-org/kegan/translation-tamarin ... Add remaining translations	2017-06-08 15:06:26 +01:00
Kegan Dougal	9baaf5499f	Linting	2017-06-08 14:58:54 +01:00
David Baker	71eb405859	Add comments & remove redundant check	2017-06-08 14:53:21 +01:00
Kegan Dougal	f2efdf8a4f	Review comments	2017-06-08 14:45:59 +01:00
David Baker	b40636a425	Merge pull request #1040 from ollieh/issues/1974 ... Added button that copies code to clipboard	2017-06-08 14:45:58 +01:00
Matthew Hodgson	c173861b27	Merge pull request #1021 from Bitim/feature/rtl-languages-support ... Better RTL support	2017-06-08 14:43:18 +01:00
Kegan Dougal	e3ac78bd28	Self-review	2017-06-08 14:36:20 +01:00
Luke Barnard	ea97d16aa2	Merge branch 'develop' into luke/fix-event-id-state ... Conflicts: src/components/structures/MatrixChat.js	2017-06-08 14:33:58 +01:00
Matthew Hodgson	29e792b642	make mels emoji capable	2017-06-08 14:21:14 +01:00
Kegan Dougal	c57823a31d	Merge branch 'develop' into kegan/translation-tamarin	2017-06-08 14:19:56 +01:00
Luke Barnard	d3cf78ff5a	Control currently viewied event via RoomViewStore ... Fix for https://github.com/vector-im/riot-web/issues/4224 Due to the way `MatrixChat` does a state update when the `view_room` dispatch fires and a second update when `RoomViewStore` sends an update, the current event ID and room ID were becoming out of sync. The solution devised was to have the event ID managed by the `RoomViewStore` itself and do any defaulting there (for when we revisit a room that we saved scroll state for previously). This required a few changes: - The addition of `update_scroll_state` in `RoomViewStore` allows the `RoomView` to save scroll state for a room before swapping to another one. Previously the caching of scroll state was done in `RoomView`. - The `view_room` dispatch now accepts an `event_id`, which dictates which event is supposed to be scrolled to in the `MessagePanel` when a new room is viewed. It also accepts `event_offset`, but currently, this isn't passed in by a dispatch in the app, but it is clobbered when loading the default position when an `event_id` isn't specified. Finally, `highlighted` was added to distinguish whether the initial event being scrolled to is also highlighted. This flag is also used by `viewRoom` in `MatrixChat` in order to decide whether to `notifyNewScreen` with the specified `event_id`.	2017-06-08 14:17:49 +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
Kegan Dougal	1c58a9cd5e	Everything but src/components/views/rooms	2017-06-08 12:33:29 +01:00
Matthew Hodgson	bc0eb4294c	rename welcome page to home	2017-06-08 10:27:35 +01:00
Kegan Dougal	0f4028da07	Add more translations..	2017-06-08 09:44:58 +01:00
Matthew Hodgson	8228db88d2	oops, fix more i18n var name typos	2017-06-07 18:28:49 +01:00
Matthew Hodgson	ef2fedc3a9	fix missing translations and typos in i18n	2017-06-07 18:24:35 +01:00
David Baker	0370b7c5e8	Merge pull request #1050 from matrix-org/luke/feature-user-directory-invite ... Use user_directory endpoint to populate ChatInviteDialog	2017-06-07 18:06:35 +01:00
Luke Barnard	29da25529c	Make it backwards compatible ... Hit the user_directory API and if M_UNRECOGNIZED, do a local search and continue to search locally therein.	2017-06-07 17:53:58 +01:00
Luke Barnard	68ddf35db4	Use then, catch, done and display any errors that occur during search	2017-06-07 17:33:15 +01:00
Luke Barnard	49b22fb6c6	Use an arrow function to allow this ... This was causing `TypeError: Cannot read property '_getEmptyContent' of undefined` for those with custom tags.	2017-06-07 16:13:40 +01:00
Luke Barnard	3b6599dcdc	Use user_directory endpoint to populate ChatInviteDialog ... Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.	2017-06-07 16:05:36 +01:00
Richard van der Hoff	27e5098e00	Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests	2017-06-07 15:44:33 +01:00
Richard Lewis	a09001933a	git status	2017-06-07 15:39:27 +01:00
Richard van der Hoff	c1151fd31c	Merge branch 'develop' into rav/handle_received_room_key_requests	2017-06-07 15:37:38 +01:00
Luke Barnard	53ea41e8a5	Merge branch 'develop' into new-guest-access	2017-06-07 12:08:37 +01:00
Richard Lewis	c552f7f336	App icon styling	2017-06-07 10:55:49 +01:00
Richard Lewis	f6f660fa9a	Initial app icon tiles	2017-06-06 23:45:17 +01:00
Matthew Hodgson	184c2d5e58	Merge pull request #1015 from matrix-org/t3chguy/random_fix_1 ... fix copy and paste derp and rip out unused imports	2017-06-06 18:02:35 +01:00
Richard Lewis	e8353edb06	Disable test postmessag	2017-06-06 15:57:40 +01:00
Richard Lewis	e9f110a4c5	Don't show add widget if there are more than one existing widgets	2017-06-06 14:50:43 +01:00
Oliver Hunt	dd6171a39e	Review changes ... Signed-off-by: Oliver Hunt <oliver@hunt.bz>	2017-06-06 12:34:03 +01:00
Oliver Hunt	a640e943f7	Added button that copies code to clipboard ... Signed-off-by: Oliver Hunt <oliver@hunt.bz>	2017-06-06 12:33:44 +01:00
David Baker	22df03944c	Merge branch 'develop' into new-guest-access	2017-06-06 10:35:28 +01:00
David Baker	f8198ba9c9	Merge branch 'develop' into new-guest-access	2017-06-06 10:33:01 +01:00
David Baker	e7af9bde23	Merge pull request #1036 from matrix-org/luke/fix-people-section-disappearing-again ... Remove DM-guessing code (again)	2017-06-06 10:20:44 +01:00
Matthew Hodgson	d77a09adba	quick and dirty override to disable MD globally	2017-06-05 21:33:01 +01:00
Luke Barnard	4ab6dc9ddd	Merge branch 'new-guest-access' into luke/ilag-i18n	2017-06-05 20:28:51 +01:00
Richard Lewis	dc4f321707	Pass room and user id to apps draw	2017-06-05 18:21:31 +01:00
Richard van der Hoff	32e3ea0601	Address review comments	2017-06-05 17:58:11 +01:00
David Baker	ad87e9bd50	Apply 9cae667c06 to ilag branch	2017-06-05 17:28:36 +01:00
Luke Barnard	cc8078837d	Remove DM-guessing code (again) ... Seems this got reverted somehow: >the revert of https://github.com/matrix-org/matrix-react-sdk/pull/807 (ebfafb3639) also included the revert of https://github.com/matrix-org/matrix-react-sdk/pull/829	2017-06-05 16:57:30 +01:00
Luke Barnard	619830617a	Merge branch 'develop' into luke/ilag-i18n ... In order to get ILAG internationalised Conflicts: src/components/structures/LoggedInView.js src/components/structures/MatrixChat.js src/components/views/dialogs/ChatCreateOrReuseDialog.js src/components/views/dialogs/SetDisplayNameDialog.js src/createRoom.js src/i18n/strings/en_EN.json	2017-06-05 16:08:03 +01:00
Luke Barnard	6125395675	_t for SetMxIdDialog	2017-06-05 15:36:10 +01:00
Richard Lewis	c6991fd33c	Periodically pass messages to embedded iframe	2017-06-04 23:00:52 +01:00
saul.kredi@krutt.org	159a920dc8	Better RTL support	2017-06-03 18:52:45 +03:00
Michael Telatynski	1bbdb6c985	actually pass ev through ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-03 15:51:20 +01:00
Michael Telatynski	4032a820f0	move KEY_M to KeyCode ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:46:08 +01:00
Michael Telatynski	464863acd6	remove unused imports ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:35:55 +01:00
Michael Telatynski	ae91f0ca62	catch ev arg so the disable stuff works ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:34:18 +01:00
Michael Telatynski	5e85723b5a	fix typo and missing import ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:09:19 +01:00
Luke Barnard	953a573f81	Merge pull request #1006 from matrix-org/luke/new-guest-access-user-action-chat ... Implement /user/@userid:domain?action=chat	2017-06-02 12:03:11 +01:00
Luke Barnard	6e84b6e996	Display profile errors better	2017-06-02 11:50:58 +01:00
Luke Barnard	defecb1b14	Implement /user/@userid:domain?action=chat ... This is a URL that can be used to start a chat with a user. - If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in. - If the user is registered, they will not see the setMxId dialog. fixes https://github.com/vector-im/riot-web/issues/4034	2017-06-02 11:36:18 +01:00
Luke Barnard	be7c2612e8	Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips ... Show People/Rooms emptySubListTip even when total rooms !== 0	2017-06-02 11:10:48 +01:00
Kegan Dougal	f54c182eb1	Add remaining strings for vector-im/riot-web#4151	2017-06-02 10:47:08 +01:00
Richard van der Hoff	a3a262b150	Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests	2017-06-02 10:31:14 +01:00
Kegan Dougal	d2e766e4f0	First round	2017-06-02 10:18:31 +01:00
Matthew Hodgson	c7285b9053	fix fr layout	2017-06-02 00:21:00 +01:00
Matthew Hodgson	6a225d1ac2	use new sign-in string	2017-06-02 00:16:17 +01:00
Matthew Hodgson	6c56fa3381	Merge pull request #990 from matrix-org/kegan/translation-marmoset ... Translation fixes for everything but src/components	2017-06-01 21:22:00 +01:00
Matthew Hodgson	8e34b59d32	Revert "Revert "add labels to language picker""	2017-06-01 19:46:25 +01:00
Richard van der Hoff	d5bc24d9f7	Initial implementation of KeyRequestHandler, KeyShareDialog etc	2017-06-01 18:40:04 +01:00
Richard van der Hoff	b3e9716126	Revert "add labels to language picker"	2017-06-01 17:52:25 +01:00
Kegan Dougal	547f10bcbb	Add translations for slash command failures	2017-06-01 15:44:56 +01:00
Matthew Hodgson	ecbc724a3f	Merge pull request #988 from matrix-org/matthew/room-avatar-event ... Matthew/room avatar event	2017-06-01 14:43:29 +01:00
Matthew Hodgson	e6cf93e237	switch to imports	2017-06-01 14:42:44 +01:00
daniel tygel	b8e26ddf3d	add labels to language picker	2017-06-01 09:48:36 -03:00
Matthew Hodgson	00750b4686	quick and dirty RoomAvatarEvent	2017-06-01 13:31:24 +01:00
Matthew Hodgson	d689d4e1fa	quick and dirty RoomAvatarEvent	2017-06-01 13:31:15 +01:00
Luke Barnard	dd48b3f055	Add comment	2017-06-01 10:08:02 +01:00
Matthew Hodgson	3d91b31637	i18n invited, and delete stale warning	2017-06-01 01:29:07 +01:00
turt2live	165dfeccb9	Fix rare case where presence duration is undefined & i18n	2017-05-31 11:56:04 -06:00
Richard van der Hoff	cbbed3f544	Fixes to i18n code	2017-05-31 18:31:10 +01:00