element-web

mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 19:51:47 +03:00

Author	SHA1	Message	Date
Luke Barnard	aa914098dc	Return null if TagOrderStore is loading The view should decide the default state.	2017-12-11 17:19:29 +00:00
Luke Barnard	991ea4ebe5	Fix a few bugs with TagOrderStore: - Have TagOrderStore listen for MatrixSync actions so that it can initialise tag ordering state. - Expose an empty list until the client has done its first sync and has fetched list of joined groups	2017-12-11 17:17:05 +00:00
David Baker	bb9376098a	Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning Warn when migrating e2e data to indexeddb	2017-12-08 16:52:05 +00:00
David Baker	0d38e7510d	Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show Don't Auto-show UnknownDeviceDialog	2017-12-08 16:33:25 +00:00
Luke Barnard	8f0774496f	Remove redundant MatrixChat	2017-12-08 11:29:21 +00:00
Luke Barnard	72550961e5	Move 'commit_tags' to action creator	2017-12-08 10:52:20 +00:00
Luke Barnard	ee6df105fe	Introduce action creators These can be used to dispatch actions immediately, or after some asynchronous work has been done. Also, create GroupActions.fetchJoinedGroups as an example. The concept of async action creators can be used in the following cases: - stores or views that do async work, dispatching based on the results - actions that have complicated payloads, would make more sense as functions with documentation that dispatch created actions.	2017-12-07 14:17:32 +00:00
David Baker	1a3671d241	remove stray param	2017-12-06 19:04:29 +00:00
David Baker	5bca5a7a8e	More underscore	2017-12-06 19:02:26 +00:00
David Baker	aa99b898ce	Add that it might not work now either also a comma	2017-12-06 18:57:48 +00:00
David Baker	4462694438	lint	2017-12-06 16:06:33 +00:00
David Baker	65c210cdde	Warn when migrating e2e data to indexeddb	2017-12-06 15:28:20 +00:00
Luke Barnard	7e1f1cdbd9	Move DragDropContext to wrap LoggedInView Becuase the tests rely on being able to inspect the state of MatrixChat	2017-12-06 15:01:16 +00:00
Luke Barnard	35a108eecc	Simplify render of TagPanel - remove sorting	2017-12-06 14:17:26 +00:00
Luke Barnard	7aa5dcef69	Move DragDropContext to wrap entire app	2017-12-06 13:10:58 +00:00
Luke Barnard	a8a650c24a	Move TagTile to separate file, and make it dragable	2017-12-06 11:25:46 +00:00
Luke Barnard	8178496457	Implement Store for ordering tags in the tag panel	2017-12-05 14:45:44 +00:00
Richard Lewis	c9b8aab0e0	Workings for future posterity - Can't access iframe content from parent. iframe needs to initiate. Postmessage data up the stack.	2017-12-03 19:44:59 +00:00
Luke Barnard	b26cf23574	Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics Implement shift-click and ctrl-click semantics for TP	2017-12-01 12:04:21 +00:00
Luke Barnard	363fe04a10	isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent	2017-12-01 10:44:00 +00:00
Luke Barnard	ddd0e161c0	Fix broken imports	2017-12-01 10:41:56 +00:00
Luke Barnard	fe81fcb8c6	Factor out isCtrlOrCmdKeyEvent, use that in TagPanel as opposed to the incorrect ctrl \|\| meta	2017-12-01 10:30:49 +00:00
Luke Barnard	eaaa9fe747	Don't show group when clicking tag panel	2017-11-30 15:35:40 +00:00
Luke Barnard	3bcb3195c4	Implement shift-click and ctrl-click semantics for TP	2017-11-30 14:48:54 +00:00
Luke Barnard	f708250d44	Add feature flag for Tag Panel	2017-11-29 18:00:42 +00:00
Luke Barnard	ead30fae9d	Use unmounted instead of mounted	2017-11-29 17:07:43 +00:00
Luke Barnard	45bcb6f2ed	Implement TagPanel (or LeftLeftPanel) for group filtering This allows for filtering of the RoomList by group. When a group is selected, the room list will show: - Rooms in the group - Direct messages with members in the group A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.	2017-11-29 16:53:43 +00:00
Luke Barnard	55b5f2b249	Merge branch 'develop' into luke/allow-guest-view-group	2017-11-28 14:06:43 +00:00
Luke Barnard	a8594a58e5	Allow guest to see MyGroups, show ILAG when creating a group	2017-11-28 13:32:46 +00:00
Luke Barnard	7ec4010881	Make GroupStore use MatrixClientPeg To avoid weirdness with using a cached matrix client	2017-11-28 11:54:05 +00:00
Luke Barnard	1a3ad5a342	Allow guests to view individual groups For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715), start ILAG.	2017-11-28 11:52:46 +00:00
David Baker	bbaa46f773	Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings Move group publication toggles to UserSettings	2017-11-28 11:02:45 +00:00
Richard van der Hoff	8be3862e68	Merge branch 'master' into develop	2017-11-28 10:29:40 +00:00
David Baker	81ae081f15	Merge pull request #1617 from turt2live/travis/granular-theme Pull the theme through the default process	2017-11-27 18:07:09 +00:00
lukebarnard	9ed9422af8	Move group publication toggles to UserSettings	2017-11-27 17:24:42 +00:00
Richard van der Hoff	80b8cbb473	Ignore unrecognised login flows Update the Login component so that if it sees an unrecognised login flow, it just ignores it and uses another one, so that riot can still be used with homeservers supporting custom login types.	2017-11-27 16:47:49 +00:00
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	f61f858cf7	Add Analytics Info and add Piwik to SdkConfig.DEFAULTS Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-11-19 15:33:07 +00:00
David Baker	1675737e7d	Merge remote-tracking branch 'origin/master' into develop	2017-11-17 17:48:42 +00:00
David Baker	6d23182f5f	Fix the force TURN option The call object is created within the js-sdk for inbound calls, so we never got the chance to set it.	2017-11-17 14:54:44 +00:00
Travis Ralston	33a3b07d88	Pull the theme through the default process This is to ensure the `config` level is respected. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-16 20:52:12 -07:00
David Baker	196eafdc7f	Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show	2017-11-16 15:59:16 +00:00
Luke Barnard	b54e563cb6	Merge branch 'develop' into luke/linting-keyword-spacing	2017-11-16 13:23:42 +00:00
Luke Barnard	dad797d4a2	Run linting --fix	2017-11-16 13:19:36 +00:00
Matthew Hodgson	f62b04c3be	Merge branch 'develop' into travis/granular_bugs	2017-11-16 13:12:03 +00:00
Travis Ralston	10a1d9cb29	Language is a local setting Fixes https://github.com/vector-im/riot-web/issues/5611 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 21:16:12 -07:00
Travis Ralston	022e40a127	Use SettingsStore for default theme Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-15 19:04:49 -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	aeca83ff2e	Unused import	2017-11-15 15:20:45 +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
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	060a890275	Merge pull request #1516 from turt2live/travis/granular-settings Granular settings	2017-11-15 10:55:55 +00:00
David Baker	63919befd0	Catch call failures due to unknown devices And show a specific dialog that you can then launch the UDD from (although currently with a 'Send Anyway' button which makes little sense for VoIP)	2017-11-15 10:49:29 +00:00
Matthew Hodgson	e91e94fd42	fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601	2017-11-15 09:56:44 +00:00
Travis Ralston	bd4102eb3d	Merge branch 'develop' into travis/granular-settings	2017-11-14 19:12:48 -07:00
Matthew Hodgson	546b062d82	automatically and correctly retint when changing theme	2017-11-15 01:45:51 +00:00
Matthew Hodgson	f05958e334	Merge pull request #1482 from turt2live/travis/presence Implement user-controlled presence	2017-11-14 23:53:16 +00:00
Stefan Parviainen	df6d5cc2b4	Pass plain components, rather than functions returning them	2017-11-14 20:09:52 +01:00
Matthew Hodgson	7c98558b6a	fix neglible race when loading CSS	2017-11-14 16:07:48 +00:00
Matthew Hodgson	1fd7ac30e4	turns out i made up the .complete property on link elements	2017-11-14 16:04:11 +00:00
Matthew Hodgson	8d6e3dd27d	fix lint	2017-11-14 15:37:03 +00:00
Matthew Hodgson	dcfbe93409	fix race when loading CSS fixes https://github.com/vector-im/riot-web/issues/5590	2017-11-14 15:28:34 +00:00
Matthew Hodgson	8c218557df	fix disable_custom_urls	2017-11-14 15:17:50 +00:00
David Baker	55260becc9	Revert "Lowercase all usernames"	2017-11-14 14:13:22 +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
Travis Ralston	63bebe9dfd	Split out avatar and display name hiding Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-13 12:58:10 -07: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
Matthew Hodgson	46387e135e	Merge branch 'develop' into matthew/status	2017-11-11 23:50:48 +00:00
Matthew Hodgson	2827bc0718	replace some of the status.im theme with general config options	2017-11-11 23:46:43 +00:00
David Baker	39763d668c	Revert "Lowercase all usernames"	2017-11-11 15:59:43 +00:00
David Baker	bce4815851	Initialise unread messages value correctly	2017-11-11 15:57:20 +00:00
Matthew Hodgson	a0cdaf29f9	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-10 15:29:42 -08:00
Luke Barnard	0d174ffe9a	Fix tests	2017-11-10 11:13:52 +00:00
Luke Barnard	f4428267a1	Refactor onboarding redirect, add groups to the onboarding starters	2017-11-10 10:51:28 +00:00
Luke Barnard	266a504981	Use the same MatrixClient for the duration of GroupView lifecycle Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.	2017-11-10 10:49:14 +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
Travis Ralston	030633fa90	Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings	2017-11-08 17:43:38 -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
Matthew Hodgson	58ee4d0a76	rewrite the tinter to be ES6, and correctly cache fixups per theme	2017-11-08 06:55:07 -08:00
Matthew Hodgson	e729bc431d	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-11-08 04:29:52 -08:00
Luke Barnard	120e7b821f	Merge pull request #1585 from matrix-org/luke/groups-inviter-profile Use the getProfileInfo API for group inviter profile	2017-11-08 10:24:00 +00:00
Luke Barnard	10778e075e	Merge branch 'develop' into luke/groups-inviter-profile	2017-11-08 10:10:43 +00:00
Luke Barnard	4bb083d959	Style	2017-11-08 10:08:04 +00:00
Luke Barnard	f53f9ed8ca	inviterProfile = null initially	2017-11-08 10:07:43 +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
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
Luke Barnard	80d4873542	Disable RoomDetailList in GroupView when editing Otherwise the rooms can be clicked on.	2017-11-07 16:54:28 +00:00
Luke Barnard	ed709f52d1	Use the getProfileInfo API for group inviter profile	2017-11-07 16:42:43 +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
Luke Barnard	9019fee49e	Adjust long desc placeholder text	2017-11-07 10:48:56 +00:00
Luke Barnard	956c5ff343	Use a constant for easy reading of long desc placeholder	2017-11-06 18:52:55 +00:00
Luke Barnard	477051cfa6	Add placeholder for when a long desc hasn't been set this is only visible to group admins.	2017-11-06 18:35:52 +00:00
Luke Barnard	137f1311b3	Add useful placeholder for the long description textarea	2017-11-06 18:35:23 +00:00
Luke Barnard	36cd22663a	Open group settings when the group is created	2017-11-06 18:02:50 +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	10519f9465	Fix the tests Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-05 14:56:41 -07:00
Travis Ralston	7ce4316cc8	Initial support for notification settings Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 21:47:18 -07:00
Travis Ralston	3958e32672	Ensure blacklistUnverifiedDevices persists reloads Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-11-04 20:13:23 -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
Matthew Hodgson	68115f5b9c	tint when theming correctly	2017-11-05 00:40:38 +00:00
Matthew Hodgson	e72e30197a	calculate new CSS tinting when we change theme	2017-11-04 23:50:57 +00: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
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
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
Luke Barnard	71c59eff2c	Add a GeminiScrollbar to Your Communities	2017-11-03 11:19:29 +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
Matthew Hodgson	64d8c81897	Merge branch 'develop' into matthew/status	2017-11-01 15:24:30 +00:00
Stefan Parviainen	d6f1e12bee	Fix merge conflict Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-11-01 15:50:45 +01:00
Luke Barnard	16dca08b77	Use constants instead of string literals	2017-10-31 16:13:13 +00:00
Luke Barnard	5bfed67463	Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state	2017-10-31 14:25:10 +00:00
Luke Barnard	d6cbc44e0f	If groupRoomsLoading, replace RoomDetailList entirely with Spinner	2017-10-31 14:21:00 +00:00
Luke Barnard	45e15fd865	Merge branch 'develop' into luke/groups-expose-ready-state	2017-10-31 11:50:12 +00:00
Luke Barnard	775468e71a	Display whether the group summary/room list is loading This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.	2017-10-31 11:42:09 +00:00
Luke Barnard	20bf69c3c2	Prevent non-members from opening group settings	2017-10-31 10:54:44 +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
Luke Barnard	14d600a69f	Fix initial in GroupAvatar in GroupView	2017-10-30 15:04:12 +00: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	e8acb0e102	Use getValueAt() Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-29 16:02:51 -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
Matthew Hodgson	672fbb2873	hopefully fix NPE on toLowerCase	2017-10-28 18:33:38 +01:00
David Baker	858c3a2548	Merge remote-tracking branch 'origin/develop' into matthew/status	2017-10-27 18:59:57 +01:00
David Baker	580d8dce19	Merge pull request #1549 from matrix-org/luke/groups-fix-mygroups-avatar-scale-method Use "crop" method to scale group avatars in MyGroups	2017-10-27 18:40:19 +01:00
Luke Barnard	5209f29a5c	Use "crop" method to scale group avatars in MyGroups	2017-10-27 18:27:54 +01:00
Stefan Parviainen	95b2392104	Merge branch 'develop' into departify	2017-10-27 19:23:13 +02:00
David Baker	4eb8fe3e6a	Lowercase all usernames As synapse doesn't accept usernames with capitals in them now Fixes https://github.com/vector-im/riot-web/issues/5445	2017-10-27 17:49:44 +01:00
Matthew Hodgson	5d0629ff73	resolve matrix.status.im v. matrix.org confusion	2017-10-27 14:23:16 +01:00
Luke Barnard	e094c32c62	Simplify GroupStore listener registration	2017-10-27 11:38:10 +01:00
Matthew Hodgson	e3f896c5e0	don't forget login prompt class	2017-10-27 01:35:21 +01:00
Matthew Hodgson	1bf3ef6de4	fix password reset	2017-10-27 01:23:50 +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
Matthew Hodgson	655d0c615a	remove spurious Sign In button and legacy Return to App buttons	2017-10-26 17:57:49 +01:00
David Baker	c8a489ca77	Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members Only show group settings cog to members	2017-10-26 14:52:16 +01:00
Luke Barnard	9643784f85	Only show group settings cog to members Non-members have no settings to change.	2017-10-26 14:31:27 +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
Matthew Hodgson	5c32b5b11a	fix i18n	2017-10-26 02:10:03 +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
Matthew Hodgson	5a9dae5ff1	use generic 'text button' for delete buttons in UserSettings	2017-10-26 01:44:05 +01:00
Matthew Hodgson	ac7a94afb2	apply theme tint at launch	2017-10-26 01:43:42 +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
Stefan Parviainen	53e983f9c7	Fix merge conflict Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-25 18:19:27 +02: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
Luke Barnard	813d0cd64c	Merge pull request #1537 from matrix-org/t3chguy/missing_date_sep fix missing date sep caused by hidden event at start of day	2017-10-25 14:07:28 +01:00
Michael Telatynski	1bbc26a27f	fix missing date sep caused by hidden event at start of day if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-25 12:52:51 +01:00
Luke Barnard	37b55984ec	Fix group Leave button tooltip	2017-10-25 12:09:13 +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
Matthew Hodgson	ae40ef4460	fix error layouts	2017-10-25 02:18:14 +01:00
Matthew Hodgson	eb4b7c78a0	skin register screen	2017-10-25 02:04:02 +01:00
Matthew Hodgson	67cc02df3b	hide header when error is up	2017-10-25 01:37:06 +01: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
Stefan Parviainen	4ff369c884	Merge branch 'develop' into departify	2017-10-24 18:27:24 +02:00
Luke Barnard	459ffc47d6	Prevent editing of UI requiring user privilege if user unprivileged	2017-10-24 15:25:35 +01:00
Stefan Parviainen	115772d526	Fix merge conflict Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-10-23 19:57:52 +02: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
Matthew Hodgson	37fd19290f	concept of default theme	2017-10-20 18:42:29 +01:00
Luke Barnard	1a7710c192	Adjust wording on placeholder	2017-10-20 18:10:14 +01:00
Luke Barnard	a0e218d107	Add placeholder to MyGroups page, adjust CSS classes - This is part of a general improvement in the look of MyGroups - Wording on "Create a community to..." modified to not have the word "community" twice	2017-10-20 17:38:02 +01:00
Luke Barnard	a85a011db9	Fix faulty translation in GroupView	2017-10-19 18:06:32 +01:00
Luke Barnard	b0f8619754	Improve MyGroups UI as per design layed out by @tur2live!	2017-10-19 17:24:45 +01:00
Luke Barnard	2be0ebdd1d	More Groups->Communities	2017-10-19 15:01:16 +01:00
Luke Barnard	bafa2c6be0	Fix typo	2017-10-19 12:03:59 +01:00
Luke Barnard	c3f143acc3	Merge branch 'develop' into luke/groups-are-communities	2017-10-19 11:31:00 +01:00
Matthew Hodgson	7fe8c9cb01	fix lint	2017-10-19 01:48:49 +02:00
Matthew Hodgson	1087b36597	fix editing visuals on groupview header	2017-10-18 17:49:49 +01:00
Luke Barnard	a40704f085	Merge branch 'develop' into luke/groups-are-communities	2017-10-18 15:57:37 +01:00
Luke Barnard	677c8e95ee	Merge branch 'develop' into luke/groups-move-buttons	2017-10-18 10:31:54 +02:00
Luke Barnard	df9e037bfc	Default values when GETing instead of when POSTing	2017-10-17 18:11:00 +01:00
Luke Barnard	3bbff627fc	Fix bug preventing partial group profile When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.	2017-10-17 17:26:34 +01:00
Luke Barnard	49b7525a67	Actually move the buttons in GroupView - The "Leave" button is now in the top-right - The "Publish" button is not a checkbox	2017-10-17 16:10:34 +01:00
Luke Barnard	0415869b8c	Add useful functions to GroupView to inspect user flags	2017-10-17 16:08:19 +01:00
Luke Barnard	626f007f4e	Move membership section above long description textarea	2017-10-17 12:00:31 +01:00
Luke Barnard	7df3335570	Only show membership settings when editing	2017-10-17 11:59:52 +01:00
Luke Barnard	495465e865	Put invite accept/decline buttons in correct div to align them to the right	2017-10-17 11:59:16 +01:00
Luke Barnard	0c34e943fb	Merge branch 'develop' into luke/groups-are-communities	2017-10-16 17:34:06 +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
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	03800b7476	Support more positioning options on context menus Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-14 21:43:47 -06:00
Travis Ralston	c34b55c6c7	Merge branch 'develop' into travis/pinned_messages	2017-10-14 16:10:32 -06:00
Matthew Hodgson	9f64261707	Merge branch 'develop' into travis/alone_warning	2017-10-14 22:43:36 +01: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	8d6f0db3e2	be explicit in remove button height	2017-10-14 22:13:00 +01:00
Michael Telatynski	c7c28c7ad2	make linter happy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-10-14 19:53:08 +01: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
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
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	3468abc975	Use GeminiScrollbar instead of ScrollPanel	2017-10-13 17:49:52 +01:00
Luke Barnard	aaf32ac9a0	Lint	2017-10-13 16:57:52 +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
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
Travis Ralston	df7f1b46bf	Stop peeking if anything went wrong, not just explicit failure Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-12 07:24:20 -06:00
Travis Ralston	f1032bb115	Set isPeeking to false if peeking failed Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-12 07:05:09 -06:00
Travis Ralston	f3b1baa3c0	Suggest to invite people when speaking in an empty room Adds vector-im/riot-web#1053 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-11 21:15:00 -06:00
Travis Ralston	6ce7eb952a	Don't send RR or RM when peeking at a room Fixes vector-im/riot-web#696 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-10-11 18:43:24 -06:00
Luke Barnard	e0e5d51451	Merge pull request #1460 from matrix-org/dbkr/show_send_message_error Show failures when sending messages	2017-10-11 19:46:32 +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
David Baker	5626c06b3c	Show failures when sending messages This is useful for the spam checking where otherwise you don't really know why your message has failed to send	2017-10-11 17:42:54 +01: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
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	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	4017fa7f1d	Factor-out GroupStore and create GroupStoreCache In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required. The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore. (We're running out of words to describe the hierachy of things that store things)	2017-10-04 16:56:35 +01:00
Stefan Parviainen	a96169e80e	Fix merge conflict	2017-10-02 17:57:22 +02:00
Travis Ralston	f71e07670d	Send toggle handler for the cancel button in the pinned events pane Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 08:56:21 -06:00
Travis Ralston	874d383a8f	Add dock for pinned messages at the top of the room Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 08:56:21 -06:00
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	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
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
David Baker	8d0983ab02	Fix group membership publicity * Read the new flag in the summary API (the one we were reading was actually whether the group server listed you as a member to non-members). * Remove call to now-dead _loadGroupFromServer andf use the store instead	2017-09-26 14:46:57 +01:00
David Baker	af2df77b8e	Merge pull request #1418 from matrix-org/luke/groups-summary-store Create GroupSummaryStore for storing group summary stuff	2017-09-25 14:59:32 +01:00
Luke Barnard	83e6218930	Remove listeners from group summary store on unmount	2017-09-25 14:49:12 +01:00
Luke Barnard	8e7d58797d	_loadGroupFromServer -> _initGroupSummaryStore	2017-09-25 14:48:49 +01:00
David Baker	1a82f121c0	lint	2017-09-25 13:17:07 +01:00
Luke Barnard	b8dca58f4f	Pass matrixClient as an argument to GSS constructor	2017-09-25 10:02:13 +01:00
Stefan Parviainen	14bce1119c	Make theme names translatable Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-23 21:36:10 +02:00
Stefan Parviainen	d4929b558e	Add dummy translation function to mark translatable strings Signed-off-by: Stefan Parviainen <pafcu@iki.fi>	2017-09-22 21:43:27 +02:00
David Baker	af73f1c3bb	Add status & toggle for publicity This doesn't work at the moment because it looks like it's broken in synapse as per https://github.com/matrix-org/sytest/pull/391 But if it did work, the client side code might look something like this.	2017-09-22 19:27:02 +01:00
Luke Barnard	791bc5e7ac	Create GroupSummaryStore for storing group summary stuff - Acts as a layer between GroupView and the group APIs that modify the summary individually. This allows for abstraction of getting the new summary once a successful API hit has been done. - The plan is to also control the avatar, topic, body of the summary via the same class	2017-09-22 18:52:06 +01:00
Luke Barnard	4c1a85cb71	Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users Implement removal function of features users/rooms	2017-09-22 16:32:40 +01:00
Luke Barnard	3f9d20de97	Implement removal function of features users/rooms With the appeareance of a "X" in the top right of each featured item when editing. NB: No reloading of summary is done after adding/removing a user/room. The plan is to better than threading a callback all the way down.	2017-09-22 15:56:35 +01:00
Luke Barnard	c19ee66565	Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign Redesign membership section in GroupView	2017-09-21 17:49:47 +01:00
Luke Barnard	3351770b54	Fix dodgy merge	2017-09-21 17:26:16 +01:00
Luke Barnard	d75efb83f1	Merge branch 'develop' into luke/groups-membership-section-redesign	2017-09-21 17:25:12 +01:00
Luke Barnard	cf23ac5931	Merge branch 'develop' into luke/groups-add-feature-rooms	2017-09-21 17:20:12 +01:00
David Baker	3c2e6fdf9e	Honour the is_privileged flag in GroupView	2017-09-21 16:55:56 +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
Luke Barnard	16f5a667c6	Redesign membership section in GroupView	2017-09-21 15:03:30 +01:00
Luke Barnard	3f0e596e97	Only show "Add" button when editing the group	2017-09-21 12:44:17 +01:00
Luke Barnard	4d9c43b3c8	Display dialog when errors occur whilst featuring users	2017-09-21 12:34:16 +01:00
Luke Barnard	03ddb63507	Remove redundant slice	2017-09-21 10:34:11 +01:00
Luke Barnard	5471431ee5	Disable "Add a Room" button for when we have a room picker	2017-09-20 17:02:20 +01:00
Luke Barnard	adf0a79585	Implement avatar, displayname for featured users Profile data has been added to the API response for users in the group summary	2017-09-20 16:54:12 +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
Luke Barnard	1c6cecbd43	Add "Add a User/Room" buttons and always display default lists	2017-09-20 14:41:29 +01:00
Luke Barnard	e9fb5712bd	Merge branch 'develop' into dbkr/group_userlist	2017-09-19 13:26:55 +01:00
David Baker	658285ebbf	Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined Fix RoomView stuck in 'accept invite' state	2017-09-19 10:34:39 +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
Matthew Hodgson	6a53b7b149	Merge pull request #1389 from turt2live/travis/ignored_users Add ignore user API support	2017-09-17 22:05:02 +01:00
Travis Ralston	2605004edb	Update ignored users when js-sdk on UserSettings on change Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-17 15:04:03 -06:00
Matthew Hodgson	bc565ba925	Merge pull request #1392 from turt2live/travis/no_emoji Add option to disable Emoji suggestions	2017-09-17 21:40:43 +01:00
David Baker	c265ec9571	Fix RoomView stuck in 'accept invite' state After accepting a 3pid invite. Rather than clear the joining flag when the join request completes, leave it so the RoomView can see that we're expecting the user to be joined in the various stages that might go through (waiting for join request, waiting for room object, waiting for 'joined' member event). The problem in this case was that we had to wait a bit for the last one, and there was no bit of state to represent it. This hopefully also makes the logic somewhat simpler. Fixes https://github.com/vector-im/riot-web/issues/5041	2017-09-15 15:07:09 +01:00
turt2live	b2de016b35	Add option to disable Emoji suggestions Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 21:28:12 -06:00
turt2live	0363f73e28	Fix the MessagePanel test Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 20:57:28 -06:00
turt2live	6e00f70320	Hide read receipts and typing notifs for ignored users Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 20:25:51 -06: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	2bc866b997	Clean up UserSettings for linting Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 16:08:20 -06:00
David Baker	1f837d2ae1	Make /join join again The auto_join parameter to view_room got broken at some point so /join took you to the room and then sat there like a lemon. Fixes https://github.com/vector-im/riot-web/issues/5029	2017-09-14 23:06:00 +01:00
Travis Ralston	4579d20fd0	Unignore people from the settings Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 15:33:36 -06:00
Travis Ralston	4df16e8245	Display which users are ignored in the user settings Adds https://github.com/vector-im/riot-web/issues/1767 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 12:51:53 -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
David Baker	3c3328c5f1	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-09-13 16:34:39 +01:00
David Baker	d90aa6ec20	Merge pull request #1368 from matrix-org/t3chguy/fix_theme fix radio for theme selection	2017-09-12 11:54:49 +01:00
David Baker	6cb98d7196	Hopefully make comment clearer	2017-09-11 18:39:30 +01:00
David Baker	531fc3ac54	Fix 'Failed to load timeline position' regression Ignore the update that comes in from the RoomViewStore when the current room changes or we save our scoll state against the new room rather than the old one. Fixes https://github.com/vector-im/riot-web/issues/5010	2017-09-11 17:57:52 +01:00
Matthew Hodgson	0e8bd856bc	remove obsolete this._roomViewStoreToken.remove();	2017-09-08 20:14:27 +02:00
David Baker	663dc3e513	Don't re-render matrixchat unnecessarily ...on room switch. We were setting most of the state in viewRoom, but getting the current room ID from the RoomViewStore, but this meant we did one setState from the RoomViewStore updating, re-rendered and then setState again in viewRoom causing another render. This just sets the room ID in viewRoom.	2017-09-08 18:56:57 +01:00
David Baker	aee2f3cdef	Rename onHaveRoom And move some code out of it which didn't really have any reason to be hanging out there rather than just be where we set the room a few lines above.	2017-09-08 18:11:13 +01:00
David Baker	bf982004f6	Give onHaveRoom the info it needs explicitly Rather than giving it a state object which is not actually the whole state but happens to be everything it actually wants (currently)	2017-09-08 17:56:53 +01:00
David Baker	03dcded72f	Blank line to make comment clearer	2017-09-08 17:39:10 +01:00
David Baker	1be35a77ec	Don't wait for setState to run onHaveRoom onHaveRoom sets some more state (among other things) so putting it in the setState callback so it could observe the new state caused us to have to re-render again unnecessarily. Just give it the new state as a parameter.	2017-09-08 17:06:46 +01:00
David Baker	984d639a37	Merge remote-tracking branch 'origin/develop' into dbkr/scroll_state_store	2017-09-08 15:58:38 +01:00
David Baker	13b094a3f6	Merge pull request #1369 from matrix-org/dbkr/dont_always_paginate Don't always paginate when mounting a ScrollPanel	2017-09-08 15:51:55 +01:00
David Baker	78a2e49705	Don't always paginate when mounting a ScrollPanel Calling just checkFill on DidMount did not initially set the scrollTop which meant that one back pagination request is always performed regardless. This meant we would end up rending the first batch of events, then paginating and re-rendering again after the pagination got another batch, causing unnecessary render churn.	2017-09-08 15:41:19 +01:00
David Baker	59c54d3756	Remove redundant code	2017-09-08 13:39:22 +01:00
Michael Telatynski	3df379cb49	fix radio for theme selection Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-07 18:54:41 +01:00
David Baker	82d1afcc47	Correct comment	2017-09-07 17:16:32 +01:00
David Baker	408b8c18ea	Introduce a RoomScrollStateStore to keep the place we're scrolled to in rooms. This mainly eleimates the extra, superfluous onRoomViewStoreUpdate callback that happened when the previous room saved back its scroll state. Moving the scroll state to a separate store means we can have this not emit events because nothing needs to know when the scroll state changes.	2017-09-07 17:08:36 +01:00
David Baker	d71f15adf4	Remove unused scrollStateMap from LoggedinView	2017-09-06 22:51:10 +01:00
David Baker	609d61d53c	Revert "Implement sticky date separators"	2017-09-06 17:40:58 +01:00
David Baker	289c3a5fbd	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-09-05 14:20:02 +01:00
David Baker	262d66f579	Merge pull request #1353 from matrix-org/luke/feature-sticky-date-separators Implement sticky date separators	2017-09-05 14:15:47 +01:00
David Baker	79ee41351c	Fix typo	2017-09-04 15:45:28 +01:00
Luke Barnard	c9c0771355	Spelling	2017-08-31 16:29:45 +01:00
Luke Barnard	cdb28f956e	Add comment for StickyContainer extension	2017-08-31 16:29:31 +01:00
David Baker	a2f2070966	Put setSate in the promise constructor Avoids local variables. Also typo in comment.	2017-08-30 21:44:10 +01:00
David Baker	225fe67586	Fix room change sometimes being very slow If the js-sdk had a lot of history in memory for a particular room, riot would paginate all that history into the DOM and render it when switching to that room (before then removing it all again). This obviously made switching to that room very slow. This was caused by the fact that we relied on the setState that happens in TimelinePanel after the pagination taking effect such that ScrollPanel sees that it no longer needs to paginate, but in some situations (as far as I can see, in electron...?) this setState would not take effect until the pagination stopped fulfiling requests from memory and hit the network. Fix: don't resolve the promise returned by the pagination request until the setState has actually happened.	2017-08-30 19:14:26 +01:00
David Baker	9efa604706	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-30 17:39:47 +01:00
Luke Barnard	a29e7da06b	Merge branch 'develop' into luke/feature-sticky-date-separators	2017-08-30 14:06:06 +01:00
David Baker	32b33c66b9	Merge pull request #1346 from matrix-org/t3chguy/shouldHideEvent_RoomStatusBar apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar	2017-08-30 13:58:40 +01:00
Luke Barnard	d516906b36	Implement sticky date separators Use `react-sticky` to implement sticky date separators. This will pin a date separator to the top of the timeline panel when the separator scrolls out of the top of the view. A known issue of this is that the spinner, which is in line with event tiles in the timeline, will appear to push the stuck date separator down. In reality the first date separator after the spinner is in line with event tiles and is not stuck because the spinner forces the timeline to be scrolled slightly further down than it would be otherwise. But also, date separators in the timeline (not "stuck") have a greater height. Ideally the date separator would be suppressed whilst back paginating, but this will cause the stuck separator to flicker on and off. This is why the suppression has been removed.	2017-08-30 13:52:46 +01:00
David Baker	22bb635ff3	Merge pull request #1352 from matrix-org/fix_hide_rr_regression separate concepts of showing and managing RRs to fix regression	2017-08-30 13:50:44 +01:00
Michael Telatynski	05c232c8c3	revert fancy indents Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-30 13:32:07 +01:00
Michael Telatynski	282618d5a1	separate concepts of showing and managing RRs to fix regression	2017-08-30 13:18:14 +01:00
Luke Barnard	3f11f9148f	Merge pull request #1348 from matrix-org/dbkr/fix_forgot_password_percent_encode Percent encoding isn't a valid thing within _t	2017-08-29 15:02:26 +01:00
David Baker	6d5b1b7a55	Percent encoding isn't a valid thing within _t Just use a plain apostrophe	2017-08-29 14:18:24 +01:00
David Baker	ec983b838a	Unbreak password reset with a non-default HS Broken by the change from onHsUrlChanged to onServerConfigChanged in https://github.com/matrix-org/matrix-react-sdk/pull/811 where ForgotPassword got missed.	2017-08-29 14:07:43 +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	315f7a3ae7	apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar prevents N new message(s) when a hidden message comes in.	2017-08-28 13:46:09 +01:00
David Baker	299db845ff	PR feedback	2017-08-25 12:10:13 +01:00
David Baker	814e08d843	Merge pull request #1334 from matrix-org/dbkr/update_on_event_decrypted Force update on timelinepanel when event decrypted	2017-08-24 13:35:39 +01:00
Richard van der Hoff	b65e1769d7	Dispatch incoming_call synchronously - this should fix a race where if the 'hangup' arrives hard on the tail of the Call.incoming, we don't ignore it. (We still have a problem in that we blip the hangup tone and UI, but that is arguably a separate problem)	2017-08-24 13:05:17 +01:00
David Baker	a2943ac348	Check room ID matches	2017-08-24 11:55:39 +01:00
David Baker	67824e9acc	Force update on timelinepanel when event decrypted Partially fixes https://github.com/vector-im/riot-web/issues/4865 (the part about messages not appearing in the timeline until you move the cursor over the window). Requires https://github.com/matrix-org/matrix-js-sdk/pull/529	2017-08-24 11:35:01 +01:00
David Baker	5f816666e1	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-22 10:08:02 +01:00
David Baker	ac64e9b705	Lint	2017-08-21 19:34:07 +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
Luke Barnard	caff761df7	Merge pull request #1308 from matrix-org/t3chguy/mels_fix Change OOO so that MELS generation will continue over hidden events	2017-08-18 13:08:35 +01:00
Michael Telatynski	615d96a065	catch hidden event being RM Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-18 11:53:52 +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
David Baker	ddf1017799	Make group invites work	2017-08-16 14:58:30 +01: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
Michael Telatynski	14903274c0	Change OOO so that MELS generation will continue over hidden events this fixes the scenario of N Member events, then an invisible event e.g. (m.room.aliases) then more Member events. Pre hide-join-parts this is how it worked. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-16 13:20:32 +01:00
David Baker	e1ddd3781d	Merge branch 'dbkr/userpicker' into dbkr/group_userlist	2017-08-15 14:10:45 +01:00
David Baker	a15c2100d1	Sort out right panel callapsing on GroupView	2017-08-15 13:12:39 +01:00
David Baker	64f352dda7	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-15 10:49:07 +01:00
David Baker	1b66e88b6e	ChatInviteDialog -> UserPickerDialog pt 2 The other changes I forgot to add	2017-08-14 17:43:00 +01:00
Luke Barnard	e48c4911b8	Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel Revert "At /user, view member of current room"	2017-08-14 16:31:24 +01:00
Luke Barnard	0079e70006	Display RM when it = a standalone member event Standalone = not next to any member events in the timeline. fixes vector-im/riot-web#4694	2017-08-14 15:40:49 +01:00
Luke Barnard	2844b574d5	Re-add useful comment	2017-08-14 14:41:03 +01:00
Luke Barnard	b59de7964c	Wait for first sync before dispatching view_user on /user the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.	2017-08-14 14:37:49 +01:00
Luke Barnard	d9e8292a5e	Revert "At /user, view member of current room"	2017-08-14 14:06:54 +01:00
Luke Barnard	3d5d7fa9c8	Lint	2017-08-14 13:59:12 +01:00
Luke Barnard	cbd8018ac8	Support semi-perma-disabling of lab features Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.	2017-08-14 12:26:31 +01:00
David Baker	02217c8bd2	Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel At /user, view member of current room	2017-08-11 10:49:22 +01:00
Luke Barnard	12966d06cd	Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics un-i18n Modal Analytics	2017-08-10 15:35:46 +01:00
Luke Barnard	d3ba1f40dc	Merge pull request #1272 from matrix-org/t3chguy/hide_other_events allow hiding of avatar/display name changes	2017-08-10 15:35:11 +01:00
Luke Barnard	89254e77f4	When no member, use `null` `roomId`	2017-08-10 15:23:14 +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	ab3abd2f7f	fix string casing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:59:55 +01:00
Michael Telatynski	b19c1010aa	Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/Analytics.js	2017-08-10 13:54:55 +01:00
Michael Telatynski	24599ace32	don't track error messages Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:49:11 +01:00
Marcel	60c1ba4f4d	Add LanguageDropdown to LoginPage (#1284 )	2017-08-10 13:29:10 +01:00
Luke Barnard	07633fe67f	At /user, view member of current room With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name). To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change. Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.	2017-08-10 13:12:50 +01:00
David Baker	c1546ceb59	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-08-09 13:46:15 +01:00
Richard van der Hoff	38114711fd	Make MatrixChat do fewer render cycles during mount This is mostly with the intent of making the login tests more reliable, but it seems generally worthwhile: * keep screenAfterLogin in the object props rather than `state` so that we can clear it without triggering a rerender * also move our record of the window width to the object props, and call `handleResize` from componentWillMount rather than componentDidMount so that we don't trigger a rerender by updating `state.width` * Remove update of unused `loading` state	2017-08-08 22:31:40 +01:00
Luke Barnard	bef6726290	Lint	2017-08-08 13:42:51 +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
Michael Telatynski	ffdffb643d	allow hiding of avatar/display name changes	2017-08-04 17:22:01 +01:00
David Baker	fe19dbee02	Remove unused component	2017-08-03 09:26:41 +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	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
Michael Telatynski	bf98c0da7c	un-i18n Modal Analytics Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-27 17:19:18 +01:00
Luke Barnard	c4f049effe	Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2 T3chguy/hide join part (attempt) 2	2017-07-26 17:15:43 +01:00
Michael Telatynski	2348c24369	revert the rm-always-moves-down loop as thats done Server side...	2017-07-26 14:33:48 +01:00
Michael Telatynski	3eb87e2aa3	change lastShownEventIndex -> lastShownEvent since some places do not have the same i reference (namely MELS generation) this way a member event at bottom of MELS (if is the last event in the timeline will have last set appropriately)	2017-07-26 12:17:05 +01:00
Michael Telatynski	f42ae1662b	change wording of comment as per Luke's review	2017-07-26 11:46:59 +01:00
David Baker	7469a9ae2a	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-07-25 17:20:16 +01:00
David Baker	c2034d5335	Add user list to groups	2017-07-25 15:56:16 +01:00
Michael Telatynski	8e66e64621	fix for loop - check happens before pre-inc so cause issues at end of TL Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 13:16:16 +01:00
Michael Telatynski	c9b547368b	add algo to ensure that RM always moves forwards this is needed so that if a client which does not hide any events sets and RM at bottom of timeline, then riot-web which hides events sets the RM it'd set it at X-N where X is bottom and N is the amount of hidden events at bottom of the timeline, this way now an RM will fall through to the hidden events below a seen event. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 13:10:57 +01:00
Michael Telatynski	a4abd1baa7	fix comment and remove unused const Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 12:03:32 +01:00
Michael Telatynski	ae973e1e99	unrevert some more... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-22 11:37:21 +01:00
Michael Telatynski	7e355f7cda	unrevert most of the logic. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 23:18:18 +01:00
Michael Telatynski	1fa4fe0b9a	remove comments/commented code Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 22:51:31 +01:00
Michael Telatynski	5808fce60e	fix logic ordering Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 22:45:19 +01:00
Michael Telatynski	17758cd1db	attempt to incorporate more code #2 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 20:43:03 +01:00
Michael Telatynski	e47e14ed19	attempt to incorporate more code #1 Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-21 20:22:01 +01:00
Michael Telatynski	928294eba3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2	2017-07-21 19:23:42 +01:00
David Baker	f9cff50ef5	_loadGroupFromServer doesn't return a promise	2017-07-21 14:41:29 +01:00
David Baker	d48924e768	Lint	2017-07-21 14:30:09 +01:00
David Baker	be7228996a	This should be null rather than false	2017-07-21 14:18:28 +01:00
David Baker	4eda2ab083	Swap classes instead of using 0 height elements	2017-07-21 14:13:57 +01:00
David Baker	f2afd852d8	Make group editing work	2017-07-21 14:03:10 +01:00
David Baker	571fada77e	Make group profile editing mostly work apart from avatars	2017-07-21 11:12:15 +01:00
David Baker	859239f881	Lint / comment out line correctly	2017-07-17 18:13:20 +01:00
David Baker	7041106bf2	Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit	2017-07-17 17:23:02 +01:00
David Baker	6f65128928	Disable edit button again until we have an API to edit group profile info	2017-07-17 17:18:46 +01:00
David Baker	1cd79fc918	Rename group settings to 'Edit Group'	2017-07-17 17:17:18 +01:00
David Baker	a32113ad97	Add onChange handlers & tabIndexes	2017-07-17 14:40:38 +01:00
David Baker	f6f80bf9ce	Remove now unused 'edit' block And add some css classes	2017-07-14 17:22:17 +01:00
David Baker	381f685013	Start on editing groups	2017-07-13 18:41:51 +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
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
Luke Barnard	ce0f9e8803	Merge pull request #1214 from matrix-org/luke/fix-rte-remove-old-disable-md-setting Remove `disableMarkdown` setting	2017-07-13 11:33:42 +01:00
Luke Barnard	4d844ebc34	Merge pull request #1215 from matrix-org/luke/remove-old-composer Remove MessageComposerInputOld	2017-07-13 11:33:23 +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	4cc8b5621d	Merge pull request #1212 from matrix-org/luke/fix-ctrl-k Enable ctrl+k room filter focus	2017-07-12 18:20:45 +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	0585fa048f	Remove `disableMarkdown` setting This was used by the old composer to control whether to interpret text as markdown prior to sending. The new setting is `MessageComposerInput.isRichTextEnabled`.	2017-07-12 17:35:19 +01:00
Luke Barnard	6547a55852	Update to reflect previous implementation Which was originally `a74bbb424c`	2017-07-12 17:12:57 +01:00
Luke Barnard	0dbd1d988e	Enable ctrl+k room filter focus By using the `focus_room_filter` dispatch	2017-07-12 13:51:55 +01:00
David Baker	53316a76f4	Sandbox app iframes	2017-07-12 10:22:14 +01:00
David Baker	eb4e4a66ff	Merge pull request #1206 from matrix-org/rav/login_unmounted_guard Give Login an unmounted guard	2017-07-11 18:37:50 +01:00
Luke Barnard	3bab720a7b	Merge pull request #1208 from matrix-org/rav/timelinepanel_test_flakiness Fix a flaky test in the timelinepanel code	2017-07-11 18:10:55 +01:00
Richard van der Hoff	1139dd2be5	Fix a flaky test in the timelinepanel code Sometimes it was possible for there to be a scroll event before the initial pagination completed, which then upset the rest of the test. Just give it a few ms to sort itself out instead.	2017-07-11 17:34:46 +01:00
Richard van der Hoff	67372d4fed	Give Login an unmounted guard	2017-07-11 17:04:19 +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	ff3c21ef10	Lint, including putting key in right place	2017-07-11 15:16:58 +01:00
David Baker	8690ed2181	Make the category functions React components	2017-07-11 14:28:44 +01:00
David Baker	222ca054c5	Use PropTypes.shape to define our required inputs	2017-07-11 13:41:00 +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	29990296d2	Lint	2017-07-11 11:02:23 +01:00
David Baker	925d5bd480	Add featured users to Group View	2017-07-10 19:32:02 +01:00
David Baker	0e67a9158c	hide settings button until it's wired up	2017-07-10 15:32:57 +01:00
David Baker	048912a241	Remove commented ordering code No lomger needed now roosm come down in order	2017-07-10 15:17:58 +01:00
David Baker	49ca29e422	Lint	2017-07-10 14:07:16 +01:00
David Baker	696c72be2b	Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview	2017-07-10 14:03:30 +01:00
David Baker	1e713557bb	PR feedback	2017-07-07 18:34:40 +01:00
David Baker	681fd512d7	Lint	2017-07-07 13:46:05 +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	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	1deb406294	Fix race	2017-07-07 10:12:06 +01:00
Luke Barnard	32a01b54b8	Merge branch 'develop' into erikj/group_server	2017-07-07 10:08:49 +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
David Baker	8468a118b5	Merge remote-tracking branch 'origin/develop' into dbkr/my_groups	2017-06-30 16:15:41 +01:00
David Baker	e5c1aeb14c	Make the Groups page look more like the design	2017-06-30 13:59:49 +01:00
David Baker	3892362386	Make my groups page a bit saner	2017-06-29 18:30:16 +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
David Baker	d6ecec1987	Behave better on rooms with no avatar / name Also add translation strings	2017-06-29 17:17:43 +01:00
David Baker	f99c540b3d	Groups page / Create Group dialog	2017-06-29 17:03:05 +01:00
David Baker	a2ff289ed8	Add 'groups' page	2017-06-28 13:56:18 +01:00
Richard Lewis	ff1636aaf5	Simplify boolean assignment.	2017-06-28 12:21:05 +01:00
Richard Lewis	06dafdc099	Remove unused state variable.	2017-06-28 12:20:07 +01:00
Richard Lewis	bf2a4afce5	Change to allow setting of DEBUG at run-time.	2017-06-28 12:02:07 +01:00
Richard Lewis	8dfd047f03	Don't show widgets when editing room settings and lint fixes.	2017-06-27 17:39:29 +01:00
David Baker	aa7a113324	More PR feedback	2017-06-27 13:41:43 +01:00
David Baker	6c9716637e	Fix linting errors	2017-06-27 13:13:00 +01:00
Richard Lewis	ad9a3d9ddc	Remove unused case statement.	2017-06-27 11:55:32 +01:00
Richard Lewis	89f051e693	Fix automerge error.	2017-06-27 11:52:49 +01:00
David Baker	2aeaaf26ca	remove inline css	2017-06-27 11:52:23 +01:00
Richard Lewis	ddc0da396d	Merge in changes from develop	2017-06-27 11:44:36 +01:00
Richard Lewis	e343e99355	Cleaned up unused files and removed commented code	2017-06-27 11:28:38 +01:00
David Baker	971f7ad045	Fix avatars	2017-06-27 10:32:21 +01:00
David Baker	867b47f4a2	PR feedback: remove phases	2017-06-27 10:28:46 +01:00
David Baker	f0aaca0a31	Fix some PR feedback	2017-06-27 10:05:05 +01:00
David Baker	c033d5defd	Missing React import	2017-06-27 09:58:29 +01:00
David Baker	09b1012388	Merge remote-tracking branch 'origin/develop' into erikj/group_server	2017-06-26 17:49:06 +01:00
David Baker	812b3643de	Add message for HSes that don't support groups Also add an unrelated missed translation	2017-06-26 17:47:17 +01:00
David Baker	a26498bc6c	Make 'group not found' work	2017-06-26 17:38:10 +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	f091d209b9	Merge branch 'develop' into luke/fix-rte-tab-complete-after-join	2017-06-26 09:39:49 +01:00
David Baker	f0f4a16e97	Translate autocomplete delay	2017-06-23 18:28:02 +01:00
Luke Barnard	ddb84f034e	Update tab-complete state onRoom received after joining As opposed to doing it when the component mounts. Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)	2017-06-23 17:52:50 +01:00
Luke Barnard	89afcfd897	Linting	2017-06-23 17:35:07 +01:00
David Baker	2efa099de2	Use function from HTMLUtils for sanitizing Encapsulates things a little nicer	2017-06-23 17:02:54 +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	8f3eb89f8b	Fix potential race in setting client listeners	2017-06-23 10:48:21 +01:00
David Baker	75ef80ecd4	Merge remote-tracking branch 'origin/develop' into erikj/group_server	2017-06-23 09:51:24 +01:00
David Baker	ac3e039e2a	Merge pull request #1019 from matrix-org/t3chguy/updating_stuff manual check for updates	2017-06-22 17:36:55 +01:00
Richard van der Hoff	fcd945afc2	Fix an incorrect console error ... this error is thrown when registering as guest or loading from localstorage, not when using tokenparams.	2017-06-22 15:08:30 +01:00
David Baker	72e73c05ac	Merge pull request #1127 from matrix-org/t3chguy/reset_favicon_on_logout reset page subtitle and favicon on_logged_out	2017-06-21 14:58:26 +01:00
David Baker	9ef9d09d44	Fix another race with first-sync Set the first sync variables in onWillStartClient, as they race if set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124)	2017-06-21 11:27:18 +01:00
Michael Telatynski	a2a26a9ac9	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout	2017-06-20 18:43:50 +01:00
Matthew Hodgson	d441ba1fd0	Merge pull request #1129 from matrix-org/luke/fix-logout Don't allow UserSettings to render if !MatrixClientPeg.get()	2017-06-20 18:43:33 +01:00
Michael Telatynski	7f6a252bcb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout	2017-06-20 18:39:59 +01:00
Richard van der Hoff	1cd152e5f7	Merge pull request #1130 from matrix-org/rav/log_fixes Various logging cleanups	2017-06-20 17:55:07 +01:00
Richard van der Hoff	cd73139af5	Various logging cleanups * don't just log errors without any context as to where they came from or what they mean * avoid the use of '%s' and multi-argument console.log because it looks awful under karma.	2017-06-20 17:38:02 +01:00
Luke Barnard	3320df4cdd	Don't allow UserSettings to render if !MatrixClientPeg.get() Now that it has state that updates following the nulling of the MCP (userHasGeneratedPassword) we need to stop it from rendering if the MCP is null. Fixes https://github.com/vector-im/riot-web/issues/4319	2017-06-20 17:13:06 +01:00
Michael Telatynski	b712a15a14	move in case it is racey ---- somehow? Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-20 16:15:42 +01:00
Michael Telatynski	04aed416d2	Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/MatrixChat.js	2017-06-20 15:37:05 +01:00
Michael Telatynski	5460b0f5b2	reset page subtitle on_logged_out Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-20 15:31:12 +01:00
Luke Barnard	c337485d90	Redesign the warning to be red text, move below "Sign out"	2017-06-20 15:01:53 +01:00
David Baker	a2dc17256a	Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff	2017-06-20 13:44:27 +01:00
Luke Barnard	4f9c1fe199	Merge branch 'develop' into luke/feature-user-settings-password-warning	2017-06-20 13:40: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
David Baker	e15aedfeb2	Fix another infinite spin on register Don't set ready on logging_in, set it before we start the client, as commented	2017-06-20 12:03:37 +01:00
Luke Barnard	e16d1b3cfb	Implement password nag warning in user settings account section "To return to your account in future you need to set a password" in the account section when a user has not yet set a password (is a PWLU).	2017-06-20 11:22:07 +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
Richard van der Hoff	3a6dabdc08	Merge pull request #1116 from matrix-org/rav/no_more_guestcreds Get rid of guestCreds	2017-06-19 14:34:12 +01:00
Luke Barnard	57f01b83be	Revert "Save scroll state immediately before updating" This reverts commit `4124a8dcff` from PR https://github.com/matrix-org/matrix-react-sdk/pull/1076	2017-06-19 13:19:17 +01:00
Richard Lewis	f676b58c00	Add google ardboard logo	2017-06-19 11:47:03 +01:00
Richard Lewis	9d89bfe264	Fix jitsi logo references	2017-06-19 11:36:15 +01:00
Luke Barnard	513a585a3e	Merge pull request #1076 from ollieh/issues/reduce-save-restore-window Reduce save-restore window in ScrollPanel to reduce scrolling jumps	2017-06-19 11:23:10 +01:00
Richard van der Hoff	a5d65ee391	Get rid of guestCreds -- we just keep the MatrixClient running in the background, so it is easy to resume.	2017-06-19 10:36:25 +01:00
Richard van der Hoff	3b518f2c59	Fix race in registration for pusher config we no longer immediately create the MatrixClient, so don't assume we do.	2017-06-19 10:22:18 +01:00
Richard van der Hoff	115a3deed9	Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states Refactor the state machine in MatrixChat	2017-06-19 08:53:50 +01:00
Richard van der Hoff	cb29d92912	Merge pull request #1110 from matrix-org/rav/fix_token_redirect Avoid transitioning to loggedIn state during token login	2017-06-19 08:52:22 +01:00
Matthew Hodgson	032650e095	Merge branch 'develop' into t3chguy/fix_forwarding	2017-06-19 01:53:35 +01:00
Luke Barnard	ba95d7a16c	Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create Don't peek when creating a room	2017-06-16 18:35:20 +01:00
Luke Barnard	be58e1095e	Don't peek when creating a room This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196	2017-06-16 18:24:07 +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	8e8af5eb5c	Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server	2017-06-16 15:59:18 +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
Richard van der Hoff	db3d9c0573	Make Lifecycle.loadSession return an explicit result - rather than inferring it from the fact it didn't call logging_in.	2017-06-16 15:23:09 +01:00
Richard van der Hoff	5f689b7929	Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp	2017-06-16 15:20:47 +01:00
Richard van der Hoff	eb1fc9ae2d	Avoid transitioning to loggedIn state during token login Fixes riot-web#4334 When we do a token login, don't carry on with the normal app startup (transitioning to the loggedIn state etc) - instead tell the app about the successful login and wait for it to redirect. Replace onLoadCompleted with onTokenLoginCompleted so that the app can see what it's supposed to be doing.	2017-06-16 15:05:53 +01:00
Michael Telatynski	8c333dc3f7	remove debug and add comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-16 14:39:31 +01:00
David Baker	236cf1efb2	Merge remote-tracking branch 'origin/develop' into erikj/group_server	2017-06-16 14:19:54 +01:00
Richard van der Hoff	3884c5ccf0	Log an error on unknown state instead of throwing	2017-06-16 11:51:12 +01:00
Richard van der Hoff	5e5639b730	Fix half-written comment	2017-06-16 11:50:53 +01:00
Luke Barnard	82b2da7833	Correctly inspect state when rejecting invite So that we view_next_room if we're looking at the room we're rejecting	2017-06-16 11:27:47 +01:00
David Baker	64b555dfe3	Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview Make sure to pass the roomAlias to the preview header if we have it	2017-06-16 11:21:03 +01:00
Luke Barnard	807f01b57e	Make sure to pass the roomAlias to the preview header if we have it	2017-06-16 11:10:55 +01:00
David Baker	af6392d7ca	Fix URL previews and also things like the unsent message error and encryption warning. Stuff that we need to do at room view mount time had got moved into a clause of the if statement in onHaveRoom and so wasn't being executed. Fixes https://github.com/vector-im/riot-web/issues/4327	2017-06-15 22:57:41 +01:00
Michael Telatynski	f0f721aa32	make hiding redactions use new pattern Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-15 20:22:38 +01:00
Michael Telatynski	cebb7182f0	try to make hiding events work with read markers Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-15 20:17:59 +01:00
Michael Telatynski	a097357baf	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part	2017-06-15 20:10:32 +01:00
Michael Telatynski	c53fb08453	pass user settings from above Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-15 20:02:17 +01:00
Michael Telatynski	4b34a2b169	modernize imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-15 19:57:48 +01:00
Michael Telatynski	a0a4fe62d5	make hide joins/parts work for MELS and highlighted/permalink event Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-15 19:53:34 +01:00
Richard van der Hoff	7b526308fd	Rearrange MatrixChat.render for sanity no-op to make it into a nice simple switch-like arrangement	2017-06-15 17:57:24 +01:00
Richard van der Hoff	90213ce72e	MatrixChat: Replace state.{loading,loggedIn,loggingIn} with views MatrixChat is essentially a glorified state machine, with its states partially determined by the loading, loggedIn and loggingIn state flags. If we actually make each of the states implied by those flags an explicit 'view', then everything gets much clearer.	2017-06-15 17:57:24 +01:00
Richard van der Hoff	ce42a9a06f	Replace MatrixChat.state.screen with 'view' 'screen' is overloaded, as it us used for the parameter of `showScreen` (and, by implication, `state.screenAfterLogin`). Attempt to clear up the confusion by replacing 'screen' with 'view' and using some constants for the potential values. This should be a no-op!	2017-06-15 16:41:17 +01:00
Richard van der Hoff	1f48b4caa6	Merge pull request #1098 from matrix-org/rav/test_rts_login Groundwork for tests including a teamserver login	2017-06-15 16:12:28 +01:00
Luke Barnard	9d74001f4f	Show a spinner when accepting an invite and waitingForRoom	2017-06-15 15:32:01 +01:00
Luke Barnard	cc46fd34d7	Only stop peeking if at some point we were joined	2017-06-15 14:21:23 +01:00
David Baker	8f9bf5f093	Merge branch 'develop' into erikj/group_server	2017-06-15 14:19:46 +01:00
Luke Barnard	5c37d591b0	Unbreak auto joining	2017-06-15 13:35:19 +01:00
Luke Barnard	fc7da536d6	Add forceUpdate for memberships !== join	2017-06-15 13:32:56 +01:00
Luke Barnard	30566beb43	Fix if-statement thinko	2017-06-15 13:28:52 +01:00
Luke Barnard	d55d61e456	Remove redundant isUserJoined	2017-06-15 12:37:01 +01:00
Luke Barnard	b90ceaa111	Display a spinner until new room object after join success If we successfully join, display a spinner until the js-sdk indicates (via room membership event or room event) that we can start using the room normally. A room event indicates we have never seen that room which means we need to use the new room object to clobber state.room. This is to make sure we replace the room that is set up for peeking with the room that can be used normally. For historical rooms, this isn't a problem. This is a workaround for the fact that when peeking, the js-sdk calls onRoom, which is difficult to handle from the clients perspective because onRoom should only be called for rooms that you've never seen before. But if you peek a room that you've joined and left and get an onRoom, you run into trouble. You also can't just always use onRoomMembership because this won't be triggered for the first time you see the room. So we end up using a combination of both. See https://github.com/matrix-org/matrix-js-sdk/issues/464 for discussion on improving this	2017-06-15 12:01:16 +01:00
Richard van der Hoff	65f351ff22	Clear Lifecycle.RtsClient on MatrixChat.mount - otherwise it ends up sitting around and failing later tests.	2017-06-15 02:15:13 +01:00
David Baker	8840625045	Merge pull request #1097 from matrix-org/luke/attempt-fix-peeking-regression Luke/attempt fix peeking regression	2017-06-14 17:33:45 +01:00
Luke Barnard	58554cce53	Remove racey condition joining might become false before we get the room down the sync	2017-06-14 17:13:13 +01:00
Luke Barnard	ed5f01d46f	Add logging for diagnosis	2017-06-14 16:53:21 +01:00
Luke Barnard	b5fd78a97f	Only attempt to peek once in the lifetime of RoomView	2017-06-14 16:50:46 +01:00
Luke Barnard	2d6ba056d1	Attempt to follow closely what RoomView did pre-ILAG In terms of peeking and what happens to the state when joining. This is another attempt to mitigate https://github.com/vector-im/riot-web/issues/4307	2017-06-14 16:48:34 +01:00
Robert Swain	880e7149f3	ModularWidgets: Add a quick VR demo widget	2017-06-14 13:05:43 +02:00
Richard van der Hoff	5d649626b0	Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login	2017-06-14 11:08:16 +01:00
Richard van der Hoff	498ea53995	Don't create a guest login if user went to /login This fixes an unintuitive behaviour where, if you follow a link to riot.im/app/#/login, we take you to the login page, but not before we've registered a guest account (or restarted the MatrixClient with the stored creds). This actually ends up simplifying some of the startup dance, as we special-case the registration flows earlier on.	2017-06-14 11:02:38 +01:00
Luke Barnard	040f28463d	Merge pull request #1045 from ollieh/issues/4009 Fixed pagination infinite loop caused by long messages	2017-06-14 10:40:02 +01:00
Richard van der Hoff	9e70884415	Merge pull request #1085 from matrix-org/rav/clear_storage_on_login Clear persistent storage on login and logout	2017-06-14 10:34:26 +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	e2759774fc	RoomView: Correctly pass userId from matrix client It isn't set in the state anywhere.	2017-06-13 15:19:38 +02:00
Robert Swain	99b1de7f0e	RoomView: Display AppsDrawer if apps in room state	2017-06-13 15:19:06 +02:00
Richard van der Hoff	392cd7861d	Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener remove RoomViewStore listener from MatrixChat on unmount	2017-06-13 13:10:49 +01:00
Richard van der Hoff	68e1a7be74	Clear persistent storage on login and logout Make sure that we don't end up with sensitive data sitting around in the stores from a previous session.	2017-06-13 12:51:47 +01:00
Richard van der Hoff	1ea9ed5d8c	remove RoomViewStore listener from MatrixChat on unmount ... to avoid spurious warnings from the tests.	2017-06-13 12:39:26 +01:00
Richard Lewis	876899948f	Merge in upstream changes	2017-06-13 11:44:23 +01:00
Richard Lewis	2da30137ec	Fix import path and add LG widget	2017-06-13 10:31:16 +01:00
Michael Telatynski	c1d1a1377c	allow forcing of TURN, pass account val per-call until UX is designed. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-12 20:20:27 +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
Michael Telatynski	c1cbdbcc4f	Merge branches 'develop' and 'kegan/hide-join-part' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/UserSettings.js	2017-06-12 13:22:52 +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	9e96e8e87f	Remove guest-only bits of UserSettings There is now no way to open UserSettings as a guest, so we might as well lose the dead code.	2017-06-12 08:36:41 +01:00
Richard van der Hoff	56efe7d2f2	Merge pull request #1064 from matrix-org/rav/delinting Delinting	2017-06-12 08:34:58 +01:00
Oliver Hunt	4124a8dcff	Save scroll state immediately before updating Signed-off-by: Oliver Hunt <oliver@hunt.bz>	2017-06-12 06:19:12 +01:00
Michael Telatynski	ccad1013a7	don't return null in case it breaks things Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-11 23:42:22 +01:00
Michael Telatynski	1069bd33f0	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/updating_stuff Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-11 23:21:50 +01:00
Michael Telatynski	6ead97c7a6	change interface to UpdateCheckBar and change launching mechanism Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-11 19:12:40 +01:00
Luke Barnard	ecc8abbfc9	When ChatCreateOrReuseDialog is cancelled by a guest, go home	2017-06-09 13:46:45 +01:00
Robert Swain	9e0b476b72	Merge branch 'develop' into rob/apps	2017-06-09 12:06:44 +02:00
David Baker	924c08b143	Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room Goto /home when forgetting the last room	2017-06-09 11:03:14 +01:00
Luke Barnard	19bb879fbf	Handle only 1 room in the list	2017-06-09 10:54:42 +01:00
Luke Barnard	c7229967a6	Goto /home when forgetting the last room	2017-06-09 10:28:45 +01:00
Luke Barnard	a21b6e61a6	Default to home page when settings is closed If the current room isn't set.	2017-06-09 10:08:26 +01:00
Richard van der Hoff	105c6b2b87	delint MatrixChat once more. with feeling.	2017-06-09 03:09:03 +01:00
Richard van der Hoff	20bdae6079	delint UserSettings.js	2017-06-09 03:08:57 +01: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
Luke Barnard	5588e115eb	Clarify doc for highlighted	2017-06-08 17:57:37 +01:00
Luke Barnard	9892566007	Highlighted means highlighted	2017-06-08 17:54:41 +01:00
Luke Barnard	c02dbd1cdc	Rename initial state variables	2017-06-08 17:26:08 +01:00
David Baker	5e55b6a643	PR feedback	2017-06-08 16:23:43 +01:00
David Baker	9def0bb5c2	Oops, fix email check	2017-06-08 16:08:19 +01:00
David Baker	8dc20606c8	Use comma for list of three things	2017-06-08 16:07:29 +01:00
Luke Barnard	000a045e35	Rename RVS state (event -> initialEvent) and redocument	2017-06-08 15:52:21 +01:00
David Baker	d691c891e7	Move all login error string generation into view This makes all the various hits done by login report the same useful error messages and gets rid of the broken ones like printing the http status code even if it was undefined. Also add text for the case of overzealous browser extensions because lots of people get bitten by it.	2017-06-08 15:49:48 +01:00
Luke Barnard	1792fa45f4	Null-guard roomId before sending a dispatch to update scroll state Otherwise we pointlessly assign the null key to something	2017-06-08 15:45:50 +01:00
Luke Barnard	59e649f326	Add comment about roomId potentially not being resolved following an update from RoomViewStore	2017-06-08 15:43:45 +01:00
Luke Barnard	e58e4db628	Explain why search results are cleared when eventId changes	2017-06-08 15:38:58 +01:00
Luke Barnard	dca2be6325	Add RoomView initial state and docs	2017-06-08 15:37:30 +01:00
Luke Barnard	2e82bf40fb	Explain setting of highlighted in room/$eventId showScreen handling.	2017-06-08 15:34:20 +01:00
Luke Barnard	8ddc38c9b1	Doc _viewRoom highlighted	2017-06-08 15:32:31 +01:00
Luke Barnard	aa20ad706e	Remove redundant `currentRoomAlias`	2017-06-08 15:30:43 +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
Luke Barnard	f320f7d475	Remove redundant action id	2017-06-08 14:30:45 +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
David Baker	6d1fa775a0	Formatting	2017-06-08 14:14:45 +01:00
Richard van der Hoff	566fb2caeb	Add some logging around switching rooms ... which I wish had been there when I was staring at a rageshake.	2017-06-07 22:41:02 +01:00
Matthew Hodgson	ef2fedc3a9	fix missing translations and typos in i18n	2017-06-07 18:24:35 +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
David Baker	1dbdbc163b	Cancel 'join room' action if 'log in' is clicked or 'choose different server' We canceled the deferred action in the MatrixChat SetMxId dialog but not the one in roomview. Fixes https://github.com/vector-im/riot-web/issues/4217	2017-06-07 11:55:24 +01:00
Kegan Dougal	4127e7121c	Translate src/components/structures Includes some pluralisation! Tested them manually to make sure they work.	2017-06-07 11:40:46 +01:00
Richard Lewis	c552f7f336	App icon styling	2017-06-07 10:55:49 +01:00
Oliver Hunt	3d59d72aaa	Fixed pagination infinite loop caused by long messages Signed-off-by: Oliver Hunt <oliver@hunt.bz>	2017-06-07 04:49:41 +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
David Baker	9f15e8e152	Merge branch 'master' into develop	2017-06-06 17:41:05 +01:00
David Baker	00ccf4bb51	Revert "Call MatrixClient.clearStores on logout" This reverts commit `c3d37c1ff9`. This commit was introducing a bug where no rooms would be shown if you want straight to /#/login and logged in (because this causes a guest session to be created but the indexeddb store not to be cleared, so the new login picks up the stale indexedb sync data.	2017-06-06 17:33:50 +01:00
Luke Barnard	205fd1fad4	Allow password reset when logged in	2017-06-06 17:22:49 +01:00
David Baker	c27f50207d	comment	2017-06-06 11:43:07 +01:00
David Baker	12d2480916	Reset 'first sync' flag / promise on log in Otherwise on any logins after the first,we always think the first sync has completed.	2017-06-06 11:36:33 +01:00
David Baker	f8198ba9c9	Merge branch 'develop' into new-guest-access	2017-06-06 10:33:01 +01:00
Matthew Hodgson	ed7c138d91	quick and dirty override to disable MD globally	2017-06-05 21:38:25 +01:00
David Baker	a99f6525c9	Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action Cancel deferred actions	2017-06-05 21:27:13 +01:00
Luke Barnard	4ab6dc9ddd	Merge branch 'new-guest-access' into luke/ilag-i18n	2017-06-05 20:28:51 +01:00
David Baker	f6cfff9098	Cancel deferred actions if the set mxid dialog is canceled	2017-06-05 18:37:38 +01:00
Richard Lewis	dc4f321707	Pass room and user id to apps draw	2017-06-05 18:21:31 +01:00
David Baker	5924654f9d	Defer an intention for creating a room	2017-06-05 17:45:01 +01:00
Erik Johnston	998a55a590	Add basic group view	2017-06-05 17:10:08 +01:00
David Baker	3dbea45426	Comment	2017-06-05 16:50:00 +01:00
David Baker	3c0290588c	Always show the spinner during the first sync Before, we were relying on the fact that `ready` would still have been false from before. This was not the case, for example, if we naviagted straight to /#/login (which causes a guest session to be set up and the sync for that completes after we navigate to the login screen). We should always mark ourselves as not-ready after login since we will always have to wait for the sync.	2017-06-05 16:17:32 +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
David Baker	c5cd6aecd6	Revert "Call MatrixClient.clearStores on logout" This reverts commit `c3d37c1ff9`. This commit was introducing a bug where no rooms would be shown if you want straight to /#/login and logged in (because this causes a guest session to be created but the indexeddb store not to be cleared, so the new login picks up the stale indexedb sync data.	2017-06-05 15:54:44 +01:00
David Baker	85aa3f6f13	Merge pull request #1032 from matrix-org/luke/fix-welcome-user-background Only view welcome user if we are not looking at a room	2017-06-05 14:38:55 +01:00
David Baker	d8e3423060	Merge pull request #1031 from matrix-org/luke/fix-deferred-start-chat-settings Keep deferred actions for view_user_settings and view_create_chat	2017-06-05 14:10:29 +01:00
Luke Barnard	c82e79ab5f	Only view welcome user if we are not looking at a room	2017-06-05 14:07:24 +01:00
Luke Barnard	3195b9f964	Keep deferred actions for view_user_settings and view_create_chat This will bring up the correct UI as intended instead of defaulting to the home page with welcome user in the room list. Fixes https://github.com/vector-im/riot-web/issues/4162	2017-06-05 13:41:52 +01:00
Luke Barnard	beafb68538	Don't do a deferred start chat if user is welcome user There's no point in deferring creating a new DM with the welcome user because the setMxId dialog will do so anyway.	2017-06-05 13:14:55 +01:00
Luke Barnard	239874ccce	Introduce state `peekLoading` to avoid collision with `roomLoading` The room loading spinner will now be displayed if the alias is being resolved (roomLoading) or if the peek is being loaded for the room `peekLoading`.	2017-06-05 09:52:39 +01:00
Michael Telatynski	98e99d542b	i18n things Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-03 15:49:28 +01:00
Michael Telatynski	0f4dc5c072	first iter of manual update control Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-03 15:49:28 +01:00
Michael Telatynski	464863acd6	remove unused imports Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 21:35:55 +01:00
David Baker	2cc9f9c403	Fix accepting a 3pid invite Fixes https://github.com/vector-im/riot-web/issues/4123	2017-06-02 16:25:14 +01:00
David Baker	ec0ad93ad7	Merge pull request #1007 from matrix-org/dbkr/propagate_room_join_errors Propagate room join errors to the UI	2017-06-02 16:09:34 +01:00
Kegan Dougal	bfb313ce9d	riot-bot only if english please	2017-06-02 14:13:45 +01:00
Matthew Hodgson	375b435dfe	hide analytics settings if no piwik url	2017-06-02 13:34:01 +01:00
Matthew Hodgson	adfeff34ae	Merge pull request #1004 from matrix-org/t3chguy/hide_redactions allow hiding redactions, restoring old behaviour	2017-06-02 12:27:52 +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
David Baker	03f4f269ce	Propagate room join errors to the UI Dispatch so we can set the state in RoomViewStore. Show the error when the room join fails (unsure if it's better to do this from the component or the store). Remove unused joinError from roomview.	2017-06-02 11:53:10 +01:00
Luke Barnard	e88b52fa8f	Add comment	2017-06-02 11:42:47 +01:00
Luke Barnard	6a9781f023	Remove redundant state	2017-06-02 11:41:09 +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
Kegan Dougal	a8ca7c899f	Review comments	2017-06-02 11:16:08 +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
Michael Telatynski	5e2e550bf9	don't lose date seperator when the first event of the new day is redacted Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 04:39:44 +01:00
Michael Telatynski	d2d0ba952a	allow hiding redactions. no point onAccountData as it'd cause a full refresh, this may need to be handled differently in the future. Currently handling same as the new timestamp stuff Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 04:23:07 +01:00
Michael Telatynski	b1973d7998	undefined =/= '' Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 00:42:19 +01:00
Michael Telatynski	f4db83a031	try empty string as falsey key Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 00:31:43 +01:00
Michael Telatynski	6b4daf02a9	i18 missed things Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 00:27:20 +01:00
Michael Telatynski	0bafd6458a	Revert voodoo	2017-06-02 00:26:31 +01:00
Michael Telatynski	46a9326607	special case default - CallMediaHandler can figure it out Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-02 00:20:34 +01:00
Michael Telatynski	3eb519b227	this is just endless Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-01 23:54:17 +01:00
Michael Telatynski	beedeec163	copy the arrays so we're not making a mess Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-01 23:50:14 +01:00
Michael Telatynski	0f2c89d525	lets actually make things work, eh? Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-01 23:39:54 +01:00
Michael Telatynski	4e36c10c38	only unshift default if there is no deviceId===default Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-01 23:33:36 +01:00
Michael Telatynski	dd4480f8c3	change device data structure to array of objects so that we can set falsey values, for unsetting device most dolphinately needs testing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-01 23:26:43 +01:00
Michael Telatynski	aa90d6b097	fix AMAZING C&P derp Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-01 23:00:25 +01:00
Michael Telatynski	dbba1dedb6	i18nize all the things and change show logic Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-06-01 22:58:17 +01:00
Michael Telatynski	04b86e5d1d	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings and i18nize webrtc stufffs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/structures/UserSettings.js	2017-06-01 22:56:31 +01:00
Matthew Hodgson	ee965a89a7	Merge pull request #986 from uhoreg/compact enable useCompactLayout user setting an add a class when it's enabled	2017-06-01 21:32:54 +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
Richard van der Hoff	7d55f3e75d	handle room key request cancellations	2017-06-01 18:40:04 +01:00
Richard van der Hoff	d5bc24d9f7	Initial implementation of KeyRequestHandler, KeyShareDialog etc	2017-06-01 18:40:04 +01:00
Matthew Hodgson	33214b8752	Merge pull request #991 from turt2live/travis/date-sep-12hr Support 12hr time on DateSeparator	2017-06-01 18:26:13 +01:00
Luke Barnard	16c4c14a16	Fix to show the correct room	2017-06-01 18:01:30 +01:00
Richard van der Hoff	53ebc8d7bd	Merge pull request #983 from matrix-org/rav/clear_storage_on_logout Call MatrixClient.clearStores on logout	2017-06-01 17:34:21 +01:00
turt2live	ab1e277f5f	Support 12hr time on DateSeparator Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-06-01 09:53:24 -06:00
Kegan Dougal	ced68f2719	Find a way to translate the name of RTE in user settings I never said it was a nice way...	2017-06-01 15:53:08 +01:00
Matthew Hodgson	00750b4686	quick and dirty RoomAvatarEvent	2017-06-01 13:31:24 +01:00
Hubert Chathi	92d1a9a6ff	enable useCompactLayout user setting an add a class when it's enabled Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>	2017-05-31 22:00:30 -04:00
Matthew Hodgson	b4284cf000	fix up Can't connect to HS i18n with _tJsx	2017-06-01 01:17:39 +01:00
Richard van der Hoff	cbbed3f544	Fixes to i18n code	2017-05-31 18:31:10 +01:00
Richard van der Hoff	c3d37c1ff9	Call MatrixClient.clearStores on logout ... to make sure that we don't have any sensitive data sitting around in the stores.	2017-05-31 18:28:21 +01:00
Luke Barnard	7abaadddde	Merge pull request #977 from matrix-org/luke/session-store-null-on-logout Remove cachedPassword from localStorage on_logged_out	2017-05-31 16:00:24 +01:00
Luke Barnard	d0e270bd1c	Only re-render LoggedInView if MatrixClientPeg.get() is truthy	2017-05-31 15:15:27 +01:00
Richard van der Hoff	2d73f094ff	Delint MatrixChat, again (#979 ) grrr.	2017-05-31 15:09:09 +01:00
Kegan Dougal	fc93517094	WIP join/part hiding - Doesn't work with MELS - Doesn't work with read markers - Doesn't work with jumping to events Shelving this for now as I fix some of this mess.	2017-05-31 13:36:19 +01:00
Michael Telatynski	dcd99ac3de	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings # Conflicts: # src/components/structures/UserSettings.js # src/i18n/strings/en_EN.json First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-30 23:54:57 +01:00
Michael Telatynski	0d930c0553	change wording and i18n it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-30 23:46:51 +01:00
Matthew Hodgson	e30e45a82c	Merge branch 'develop' into new-guest-access	2017-05-30 21:05:07 +01:00
Matthew Hodgson	93a35dc07a	Merge branch 'develop' into t3chguy/piwik	2017-05-30 15:58:55 +01:00
Marcel	70e7d81093	More i18n strings (#963 ) * Add i18n for E2E import and Export Dialogs Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add various previous missing i18n strings Signed-off-by: MTRNord <mtrnord1@gmail.com> * Translate CreateRoomButton Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ChatInviteDialog and fix missing to. Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ConfitmRedactDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeactivateAccountDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeviceVerifyDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add SessionRestoreErrorDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add SetDisplayNameDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UnknownDeviceDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add AddressTile translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add DeviceVerifyButtons translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add Dropdown translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UserSelector translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CaptchaForm translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CasLogin translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add CustomServerDialog translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add InteractiveAuthEntryComponents translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add LoginFooter translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add RegistrationForm translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add ServerConfig translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MAudioBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MImageBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add MVideoBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add TextualBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UnknownBody translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add UrlPreviewSettings translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add AuxPanel translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * Add PresenceLabel translations Signed-off-by: MTRNord <mtrnord1@gmail.com> * fix syntax error * weird space :P * missing ',' * fix missing value * fix json fail * remove acidential added file * fix another json fail	2017-05-30 15:09:57 +01:00
Luke Barnard	2baef643e3	Add /start to show the setMxId above HomePage	2017-05-30 14:27:02 +01:00
Michael Telatynski	ee6789ed15	change aux order so room settings is top most, forwarding could go weird if you clicked roomsettings whilst forwarding Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-30 11:22:27 +01:00
Michael Telatynski	baba2e12e2	fix weird indentation Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-30 11:21:33 +01:00
Michael Telatynski	ff9141e424	add a hideCancel flag as some things have own cancel etc on RoomHeader Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-30 11:20:41 +01:00
Luke Barnard	9536e1ef36	Merge pull request #954 from matrix-org/matthew/ilag-login add login link to SetMxIdDialog	2017-05-30 09:48:33 +01:00
Matthew Hodgson	ad1b14967b	hide rightpanel on welcome page	2017-05-30 03:59:06 +01:00
Michael Telatynski	7e02977c27	i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-29 22:32:45 +01:00
Michael Telatynski	a2229ced11	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings	2017-05-29 21:56:45 +01:00
Michael Telatynski	9b8dcaf274	make analytics setting use new thing Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-29 15:11:37 +01:00
Michael Telatynski	97d0c41d30	fix ugly special casing in generic settings renderer Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-29 15:08:11 +01:00
Michael Telatynski	f5d336103e	add opt out / un opt out toggle Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-29 14:36:50 +01:00
Michael Telatynski	7e8123e5fe	move all init/enable/disable logic to Analytics/MatrixChat Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-29 14:26:29 +01:00
Matthew Hodgson	df599890c5	add login link to SetMxIdDialog	2017-05-29 01:32:31 +01:00
Matthew Hodgson	5c885922d9	Merge branch 'develop' into new-guest-access	2017-05-28 22:58:18 +01:00
Michael Telatynski	0a1b361141	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik	2017-05-28 13:21:33 +01:00
Matthew Hodgson	accc17a39a	Merge pull request #812 from t3chguy/forward_message Message Forwarding	2017-05-28 02:37:31 +01:00
Matthew Hodgson	10a9313bba	Merge pull request #944 from matrix-org/t3chguy/fix-focus-steal don't focus_composer on window focus	2017-05-27 23:30:00 +01:00
Michael Telatynski	45cd80dedb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik	2017-05-27 20:59:35 +01:00
Michael Telatynski	98c2f9201b	initial piwik stuff Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-27 20:47:09 +01:00
Marcel	8935e9706e	Change variable name as mentioned by t3chguy	2017-05-27 21:21:23 +02:00
Marcel	a30110b5d3	Fix vector-im/riot-web#4042	2017-05-27 21:11:00 +02:00
Michael Telatynski	4cd7964b58	remove window onFocus handling entirely Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-27 18:43:59 +01:00
Matthew Hodgson	3703306a9e	oops	2017-05-27 18:35:18 +01:00
Matthew Hodgson	3302fc690f	fix all missing translations picked up by check-i18n.pl	2017-05-27 18:20:44 +01:00
Matthew Hodgson	1eb7993aa7	Merge pull request #946 from matrix-org/t3chguy/fix_imports import _t, drop two unused imports	2017-05-27 18:08:00 +01:00
Michael Telatynski	8524f5868c	import _t, drop two unused imports without this FilePanel would ever-load Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-27 17:59:11 +01:00
Michael Telatynski	8e1db84bee	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal	2017-05-27 14:29:06 +01:00
Michael Telatynski	2bcb381aa7	maybe window focus should be ignored so focus is left as what it was but with this at least clicking on a text input will not make you be thrown into composer instead Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-27 14:19:34 +01:00
Matthew Hodgson	03194e66b3	actually wire up alwaysShowTimestamps	2017-05-27 00:14:16 +01:00
Luke Barnard	fd27d6dab1	Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings Block user settings with view_set_mxid	2017-05-26 18:48:55 +01:00
David Baker	97aeb57a8b	Merge remote-tracking branch 'origin/develop' into dbkr/translations	2017-05-26 18:15:32 +01:00
Luke Barnard	276d3cad9c	Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix Remove suffix and prefix from login input username	2017-05-26 18:07:10 +01:00
David Baker	62ffe929e4	Translate Add Threepid labels	2017-05-26 18:03:24 +01:00
David Baker	23fbce66a2	Translate 'email' threepid label	2017-05-26 17:56:51 +01:00
David Baker	c22978d033	Merge remote-tracking branch 'origin/develop' into dbkr/translations	2017-05-26 17:30:02 +01:00
Matthew Hodgson	3d688a6ada	Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart Set the displayname to the mxid once PWLU	2017-05-26 17:17:23 +01:00
Matthew Hodgson	1c7785535f	Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room Fix view_next_room, view_previous_room and view_indexed_room	2017-05-26 17:09:35 +01:00
Matthew Hodgson	fbc3f83625	Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early Use RVS to indicate "joining" when setting a mxid	2017-05-26 17:08:34 +01:00
Matthew Hodgson	fde553a809	Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp Kierangould/12hourtimestamp	2017-05-26 16:52:09 +01:00
Luke Barnard	9f902c1190	Merge pull request #932 from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest Don't show notif nag bar if guest	2017-05-26 16:42:12 +01:00
David Baker	e3e848d09e	Fix missing full stop on translation key	2017-05-26 13:19:46 +01:00
Luke Barnard	5e136863b0	Block user settings with view_set_mxid	2017-05-26 13:18:44 +01:00
Luke Barnard	ad3373789f	Warn about LifecycleStore not explicitly being used	2017-05-26 11:50:32 +01:00
Luke Barnard	c0f43a14fd	Improve comment	2017-05-26 11:47:55 +01:00
Luke Barnard	2dcc03960a	Set the displayname to the mxid once PWLU	2017-05-26 11:46:33 +01:00
Luke Barnard	b5b157a0fb	Don't show notif nag bar if guest	2017-05-26 10:34:36 +01:00
David Baker	2d6bf5fa91	Remove messages with HTML formatting The translations strings are not HTML and it gets escaped.	2017-05-25 20:04:28 +01:00
David Baker	ab92cc2254	Question marks do not internationalise	2017-05-25 19:55:54 +01:00
David Baker	e7fbf889fa	Make current language more accurate Make it reflect reality if it's been taken from the browser langs by just getting what was saet in counterpart rather than the saved setting. Also fix style.	2017-05-25 19:53:27 +01:00
David Baker	443ab1add7	Put back default strings on dialogs But make them work by calling _t in render rather than getDefaultProps(). Also sort out some 'Warning!' strings	2017-05-25 18:20:48 +01:00
David Baker	9112fc231a	More translation string fixups	2017-05-25 17:35:18 +01:00
Luke Barnard	0849b0e205	Fix view_next_room, view_previous_room and view_indexed_room These must now make a dispatch to RoomViewStore instead of calling `viewRoom` directly on MatrixChat. This will call both `viewRoom` of MatrixChat _and_ the logic in RVS so there is some redundancy here. It'd be best to move as much as possible of viewRoom out to the RVS itself. But for now, this fixes a bug that occures when leaving (the viewed room would not change).	2017-05-25 17:10:49 +01:00
Luke Barnard	91edc06441	Use RVS to indicate "joining" when setting a mxid This prevents RoomView from doing any peeking whilst the join/registration is in progress, causing weirdness with TimelinePanel getPendingEventList (which throws an error if called when peeking).	2017-05-25 17:04:42 +01:00
David Baker	3a379d09de	Update translations Actually translate the language dropdown label & add the string. Remove some unused ones.	2017-05-25 16:52:15 +01:00
Luke Barnard	51c8ee6db2	Allow teamServerConfig to be missing	2017-05-25 14:38:12 +01:00
David Baker	5c359e63ab	Bulk change counterpart imports to use languageHandler wrapper func	2017-05-25 11:39:08 +01:00
Luke Barnard	c894c83fbe	Remove GuestWarningBar	2017-05-25 11:02:48 +01:00
Luke Barnard	f3fc459875	Merge pull request #922 from matrix-org/luke/new-guest-access-default-welcome Implement default welcome page and allow custom URL /w config	2017-05-25 10:08:34 +01:00
Luke Barnard	8fc44a9b66	Add comment to explain sync_state dispatch	2017-05-25 09:31:14 +01:00
Michael Telatynski	8158ec6d54	touchups Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-25 01:25:17 +01:00
Michael Telatynski	09d0ab7df5	attempt to make media selector work everywhere (TM) loadDevices not only in electron Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-25 01:01:40 +01:00
Michael Telatynski	a4b2bacc7e	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings	2017-05-25 00:26:38 +01:00
Luke Barnard	fffe425730	Add non-null RoomView key	2017-05-24 18:04:04 +01:00
Luke Barnard	5f36f797da	Implement default welcome page and allow custom URL /w config This changes the default behaviour of displaying the room directory to instead displaying the default homepage. If specified, the config "welcomePageUrl" can be used to override the default '/home.html'.	2017-05-24 17:55:36 +01:00
Luke Barnard	298c5e4df3	Implement a store for RoomView This allows for a truely flux-y way of storing the currently viewed room, making some callbacks (like onRoomIdResolved) redundant and making sure that the currently viewed room (ID) is only stored in one place as opposed to the previous many places. This was required for the `join_room` action which can be dispatched to join the currently viewed room. Another change was to introduce `LifeCycleStore` which is a start at encorporating state related to the lifecycle of the app into a flux store. Currently it only contains an action which will be dispatched when the sync state has become PREPARED. This was necessary to do a deferred dispatch of `join_room` following the registration of a PWLU (PassWord-Less User). The following actions are introduced: - RoomViewStore: - `view_room`: dispatch to change the currently viewed room ID - `join_room`: dispatch to join the currently viewed room - LifecycleStore: - `do_after_sync_prepared`: dispatch to store an action which will be dispatched when `sync_state` is dispatched with `state = 'PREPARED'` - MatrixChat: - `sync_state`: dispatched when the sync state changes. Ideally there'd be a SyncStateStore that emitted an `update` upon receiving this, but for now the `LifecycleStore` will listen for `sync_state` directly.	2017-05-24 16:56:13 +01:00
Michael Telatynski	b9ac1222ed	remove listener on unmount Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-24 15:55:37 +01:00
Michael Telatynski	1186207658	Initial Electron Settings - for Auto Launch (opens path for Proxy Settings) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-24 15:51:11 +01:00
David Baker	b677a2002f	Minimal UI fixes Add a label. Make css selector match style. Also fix import.	2017-05-24 14:36:14 +01:00
David Baker	aef068b00e	Indenting	2017-05-24 14:28:30 +01:00
David Baker	f412552c2c	Fix imports/exports	2017-05-23 18:32:45 +01:00
David Baker	d419c42a4f	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00
David Baker	46bb29a3af	Merge pull request #910 from matrix-org/t3chguy/version_anchor_newtab Make the linked versions open a new tab, turt2live complained :P	2017-05-23 13:51:40 +01:00
Michael Telatynski	a10c2faac1	lets not open an attack vector :) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-23 13:12:21 +01:00
Luke Barnard	b0a824c941	Remove double declaration of TextInputDialog	2017-05-22 16:28:23 +01:00
Luke Barnard	05aaa599cc	Merge branch 'develop' into new-guest-access Conflicts: src/components/structures/MatrixChat.js	2017-05-22 16:19:10 +01:00
Richard van der Hoff	fc08dc33c6	Group e2e keys into blocks of 4 characters Hopefully this will make them a bit easier to compare.	2017-05-22 12:01:09 +01:00
Kieran Gould	47e5e8d678	Moved isTwelveHour alllll the way up to TimelinePanel.	2017-05-19 23:04:37 +01:00
Maxwell Kepler	008cc95e9c	Add 12 hour support	2017-05-19 22:29:49 +01:00
Michael Telatynski	cc3673d2d2	Make the linked versions open a new tab, turt2live complained :P Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 17:39:21 +01:00
Richard van der Hoff	e3dbf057fb	Fix 'missing page_type' error LoggedInView will complain if it is instantiated without a page_type, so let's keep showing the syncing spinner until we have one.	2017-05-19 14:09:20 +01:00
Richard van der Hoff	c61294f71c	Delintify some of MatrixChat (#907 ) ... it annoyed me too much.	2017-05-19 13:53:11 +01:00
Luke Barnard	2bec44a517	Remove suffix and prefix from login input username This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736	2017-05-19 10:03:51 +01:00
Michael Telatynski	cc7edbf86d	allow for sending arbitrary events, also override highlight with event currently being forwarded while forwardingEvent is set Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 01:29:11 +01:00
Michael Telatynski	a2ab36f598	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 00:33:36 +01:00
Michael Telatynski	0e7e4d8595	replace weird sidebar snapping with better ui_opacity Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-19 00:20:32 +01:00
Luke Barnard	e38437e6ce	Invite the welcome user after registration if configured This will shift focus to the welcome user DM. We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.	2017-05-18 11:14:56 +01:00
Richard Lewis	7e1de2ac35	Show/hide apps panel and misc formatting and lint fixes	2017-05-17 21:15:57 +01:00
Luke Barnard	e1089574ae	Write some tests for the RTS UI Add tests that make assertions about the UI during registration when registration is done with a user recognised as a team member (by the mock rtsClient).	2017-05-17 09:46:17 +01:00
David Baker	75eea89c08	Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings" This reverts commit `a29d8c2af2`, reversing changes made to `1d836c7d02`.	2017-05-16 16:12:57 +01:00
David Baker	ebfafb3639	Revert "Merge pull request #807 from matrix-org/matthew/quick-search" This reverts commit `0ad1d8caf3`, reversing changes made to `1189368aab`.	2017-05-16 16:11:01 +01:00
Luke Barnard	c6350379dc	Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password Remove "Current Password" input if mx_pass exists	2017-05-16 12:29:23 +01:00
Luke Barnard	eb36e979c2	Reference store token, call .remove on it on unmount	2017-05-16 11:52:51 +01:00
Luke Barnard	d7eec27c4b	Merge pull request #889 from matrix-org/luke/new-guest-access-need-to-set-mx-id Replace NeedToRegisterDialog /w SetMxIdDialog	2017-05-15 18:36:20 +01:00
Luke Barnard	f199f3599e	Replace NeedToRegisterDialog /w SetMxIdDialog This uses MatrixChat's `view_set_mxid`	2017-05-15 17:31:26 +01:00
Luke Barnard	269fd51130	Remove SessionStore listener on unmount	2017-05-15 17:17:32 +01:00
Luke Barnard	eb0041d21a	Remove redundant state	2017-05-15 17:03:54 +01:00
Luke Barnard	f73cf772fb	Move sessionStore ref from MatrixChat to LoggedInView MatrixChat didn't actually use the sessionStore, so this is one less prop to pass.	2017-05-15 14:56:05 +01:00
Luke Barnard	da3cb0ee48	SessionStore extends flux.Store	2017-05-15 14:52:19 +01:00
Michael Telatynski	8715b5233c	link to #/register Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-15 10:31:17 +01:00
Michael Telatynski	83cb1e6e29	tell guests they can't use filepanel until they register Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-15 10:15:35 +01:00
Matthew Hodgson	317e24852d	explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531	2017-05-15 03:03:17 +01:00
Matthew Hodgson	7d8c104cb8	Merge pull request #884 from matrix-org/t3chguy/tiny_usersettings_fixes I broke UserSettings for webpack-dev-server	2017-05-15 01:57:45 +01:00
Matthew Hodgson	7f78e737eb	Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing various fixes to RoomHeader	2017-05-15 01:52:42 +01:00
Matthew Hodgson	38cb123506	Merge pull request #883 from matrix-org/t3chguy/file_panel_fixes show error if we can't set a filter because no room	2017-05-15 00:19:45 +01:00
Michael Telatynski	6ec799a028	I broke UserSettings for webpack-dev-server where version file doesn't exist, version starts as null then gets set to undefined by the promise this wasn't handled and now undefined is understood to be unknown rather than null also picked up on a small casing error threePids vs threepids, most things using the latter apart from the init Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-13 15:04:20 +01:00
Michael Telatynski	29568feb95	show error if we can't set a filter this way it still works for a room we've been in before Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-12 22:38:57 +01:00
Luke Barnard	683f1b8a1a	Invite the welcome user after registration if configured This will shift focus to the welcome user DM. We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.	2017-05-12 17:39:38 +01:00
Luke Barnard	536724e7c5	ES6 SessionStore	2017-05-12 15:58:44 +01:00
Luke Barnard	5c8187dc8f	Explicitly pass thru userHasGeneratedPassword	2017-05-12 15:47:37 +01:00
Luke Barnard	1176573f39	Implement SessionStore This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)	2017-05-12 12:02:45 +01:00
Luke Barnard	8725ef3863	Remove "Current Password" input if mx_pass exists If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.	2017-05-11 17:47:45 +01:00
Michael Telatynski	5e4467adce	hide settings/search appropriately pass inRoom prop to RoomHeader (defaults to false) remove default onSettingsClick, handle if it is passed EVERYWHERE if onSettingsClick is passes, show that button show search button only if we are in the room, seems to fail otherwise this seems to handle all cases I could throw at it. Give it your best Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-11 17:35:06 +01:00
Luke Barnard	cfa108a28c	No need to dispatch, just call setMxId	2017-05-11 17:07:03 +01:00
Luke Barnard	6326a95b39	Prevent ROUs from creating new chats/new rooms Spawn a SetMxIdDialog instead and do nothing.	2017-05-11 17:04:11 +01:00
Luke Barnard	2437eb7910	Merge pull request #874 from matrix-org/luke/fix-rm-not-updating Fix RM not updating if RR event unpaginated	2017-05-11 15:54:49 +01:00
Luke Barnard	5151264f60	Merge branch 'develop' into new-guest-access Conflicts: src/component-index.js	2017-05-11 13:22:30 +01:00
Luke Barnard	852e1eb720	Rename some variables `ReadUpTo` -> `RR` `ReadReceipt` -> `RR` `ReadMarker` -> `RM`	2017-05-11 09:31:59 +01:00
Luke Barnard	3815ad6cd0	Sent -> Event	2017-05-11 09:20:34 +01:00
Luke Barnard	856ef58d46	fix commen	2017-05-10 14:55:58 +01:00
Luke Barnard	fe8ea4ffe7	Rename vars, linting	2017-05-10 14:51:47 +01:00
Luke Barnard	30e183a7f1	Only send RR if we should	2017-05-10 14:48:01 +01:00
Luke Barnard	7f766d89c3	Rename variables, more comments	2017-05-10 14:42:06 +01:00
Luke Barnard	ad2ed12980	Redesign mxID chooser, add availability checking Requires https://github.com/matrix-org/matrix-js-sdk/pull/432 for availability checking. Changes: - Redesign the dialog to look more like https://github.com/vector-im/riot-web/issues/3604#issuecomment-299226875 - Attempt to fix wrong password being stored by generating one per SetMxIdDialog (there's no issue tracking this for now, I shall open one if it persists) - Backwards compatible with servers that don't support register/availability - a spinner will appear the first time a username is checked because server support can only be determined after a request. - Rate-limited by a 2s debounce - General style improvements	2017-05-10 14:22:17 +01:00
Luke Barnard	ca79d9bb6e	Separate predicates for RM/RR Instead of modifying the condition for updating the RR, separate the RM and RR conditions and use an OR to decide when to set both. Make some logs only log when DEBUG.	2017-05-09 17:36:19 +01:00
Luke Barnard	ac25fd6d87	Remove log	2017-05-09 10:16:37 +01:00
Luke Barnard	488fa3745b	Fix RM not updating if RR event unpaginated If the RR event has been unpaginated, the logic in `sendReadReceipt` will now fallback on the event ID of the RM which in theory is always =< RR event ID stream-wise.	2017-05-09 10:03:40 +01:00
Luke Barnard	fe121126f5	Merge branch 'develop' into rte-fixes Conflicts: src/UserSettingsStore.js src/autocomplete/EmojiProvider.js src/components/views/rooms/MessageComposerInput.js	2017-05-08 17:08:59 +01:00
David Baker	85ed39b9d8	Put room name in 'leave room' confirmation dialog https://github.com/vector-im/riot-web/issues/3850	2017-05-08 16:49:40 +01:00
Pablo Saavedra	17262ad80d	Added TextInputWithCheckbox dialog	2017-05-08 12:18:31 +02:00
Matthew Hodgson	5900c879ce	Merge pull request #851 from t3chguy/warn_on_unload Warn on unload	2017-05-07 18:17:18 +01:00
Michael Telatynski	b944fff5c5	unscrew merge	2017-05-05 20:57:18 +01:00
Michael Telatynski	110ca22c4c	Merge branch 'develop' into webrtc_settings	2017-05-05 20:56:20 +01:00
Luke Barnard	6f4eb9d8b1	Show password nag bar when user is PWLU	2017-05-05 16:31:33 +01:00
David Baker	e00605571b	Fix the spinner to actually appear We started with clientSyncState being null, which it remained until the SYNCING event was emitted. We need to set clientSyncState's initial value correctly.	2017-05-05 10:48:54 +01:00
Luke Barnard	8e3851b380	Merge pull request #860 from t3chguy/patch-4 Guests can't send RR so no point trying	2017-05-04 17:53:59 +01:00
Michael Telatynski	f76b9b4489	remove link to issue not very useful	2017-05-04 17:25:23 +01:00
Luke Barnard	7918ff2fc2	Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements T3chguy/settings versions improvements	2017-05-04 16:56:45 +01:00
Michael Telatynski	da4c2f8b31	Guests can't send RR so they shouldn't try lets not hit the HS quite as much	2017-05-04 16:42:41 +01:00
Michael Telatynski	3c6e301f7f	Improve regex to ignore trailing -dirty and for rc tags Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-04 16:22:39 +01:00
Michael Telatynski	2edfc3e598	remove commented out code as per review Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-04 15:51:31 +01:00
Michael Telatynski	cb478f1194	no idea why those got in there... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-04 15:50:52 +01:00
Luke Barnard	694fc26a55	Merge pull request #855 from matrix-org/luke/fix-jump-to-rm-in-mels Fix jumping to an unread event when in MELS	2017-05-04 13:03:30 +01:00
Luke Barnard	6d9a1f047d	Typo	2017-05-04 13:03:04 +01:00
Luke Barnard	bfa3123f9b	Combine data-scroll-token and -contained-scroll-tokens - Instead of using one attribute, use one that might just contain one token - Use the first token when tracking a child - Mandate that no commas can be in individual tokens	2017-05-04 10:00:13 +01:00
Michael Telatynski	9d92f93fcb	consolidate call onPageUnload handler into RoomView Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-03 16:39:19 +01:00
Michael Telatynski	356d29939c	also warn when quitting mid-call Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-03 16:25:27 +01:00
Michael Telatynski	74b2c86f93	tidy up UserSettings Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-02 21:17:12 +01:00
Michael Telatynski	76e98d4267	improve version hyperlinking removed redundant v prefix (key already says version) links to most applicable version/tag tag-commit -> commit commit1-commit2-commit3 -> commit1 (v)x.y.z -> tag<x.y.z> commit -> commit Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-05-02 21:12:58 +01:00
Luke Barnard	af137f8867	Validate phone number on login To prevent confusion when accidently inputting mxid or email. Fixes https://github.com/vector-im/riot-web/issues/3637	2017-05-02 18:30:46 +01:00
Luke Barnard	4febc63aee	Add comment to _scrollToToken	2017-05-02 17:41:09 +01:00
Luke Barnard	fe83a99ab7	Update ScrollPanel docs	2017-05-02 17:36:59 +01:00
Luke Barnard	3f25928380	Fix jumping to an unread event when in MELS This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child. MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS).	2017-05-02 16:34:39 +01:00
Michael Telatynski	daae3bd1ec	warn on unload when uploading file(s) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-29 06:27:06 +01:00
Michael Telatynski	c6262d62a6	webrtc config electron init on LoggedInView mounting configurable via UserSettings new class: CallMediaHandler Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-28 18:21:22 +01:00
Luke Barnard	5a5768a4ec	Try to fix tests	2017-04-28 13:38:35 +01:00
Luke Barnard	d12b1903f2	Fix defer promise logic	2017-04-28 13:29:30 +01:00
Luke Barnard	6dff4a4415	Return early after cancelled mxid dialog	2017-04-28 13:28:34 +01:00
Luke Barnard	8774100508	Initial implementation: SetDisplayName -> SetMxIdDialog - Replaces SetDisplayNameDialog with SetMxIdDialog. This new dialog will use InteractiveAuth to authenticate a user with their chosen mxid. De-scoped: - style tweaks for the InteractiveAuth in the dialog (capcha) and error message. - checking for mxid availability	2017-04-28 13:22:55 +01:00
David Baker	b91f53652d	Merge pull request #848 from matrix-org/luke/room-directory-improve Improve RoomDirectory Look & Feel	2017-04-27 18:28:28 +01:00
Luke Barnard	791f7f7f6b	Merge branch 'luke/room-directory-remove-rhs' into luke/room-directory-improve	2017-04-27 17:57:19 +01:00
Luke Barnard	9d57e8b959	Merge pull request #845 from matrix-org/luke/rm-fix Only show jumpToReadMarker bar when RM !== RR	2017-04-27 17:01:39 +01:00
Luke Barnard	6313193aa8	Null check readMarkerEventId, update comment	2017-04-27 16:52:40 +01:00
Luke Barnard	50831796bb	Remove RHS when viewing RoomDirectory	2017-04-27 16:49:23 +01:00
Luke Barnard	2012513c0e	Allow MELS to have its own RM This inserts a RM if any of the events in a MELS if the RM is tracking an event within it. Fixes https://github.com/vector-im/riot-web/issues/3749	2017-04-27 14:16:50 +01:00
Luke Barnard	8f7359fce1	Only show jumpToReadMarker bar when RM !== RR If RM !== RR, use the pos. of the RM to determine whether it is visible, as before.	2017-04-27 14:03:54 +01:00
David Baker	4910a225d1	Fix spinner that shows until the first sync Listen for the sync event and update when it changes	2017-04-26 17:26:53 +01:00
Luke Barnard	9ac06d4c79	Merge pull request #839 from matrix-org/dbkr/spinner_until_sync Show spinner until first sync has completed	2017-04-26 14:34:08 +01:00
David Baker	df283dae47	Show spinner until first sync has completed Shows the 'forward paginating' spinner until the first sync has completed. Fixes https://github.com/vector-im/riot-web/issues/3318	2017-04-26 14:05:09 +01:00
David Baker	04f44e9201	Style fixes for LoggedInView PRing this becaise I was going to change LoggedInView, so did some code style updates, but then decided the do the change elsewhere.	2017-04-26 13:48:03 +01:00
David Baker	fa9c2d1373	Fix specifying custom server for registration Broken by `9cd7914ea5` (ServerConfig interface changed but Registration not updated)	2017-04-25 19:21:09 +01:00
Luke Barnard	96e7479d8b	Show "jump to message" when message is not paginated	2017-04-25 17:19:36 +01:00
Matthew Hodgson	29e48d1801	Merge pull request #826 from matrix-org/matthew/mels-profile-changes summarise profile changes in MELS	2017-04-25 00:18:19 +01:00
Michael Telatynski	3997974f0f	remove debug console log (ignore its content pls) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-24 22:16:15 +01:00
Michael Telatynski	bfba25f3da	we don't care about rhs state anymore as we can just restore it sanely Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-24 22:10:14 +01:00
Michael Telatynski	4cf9e0c1ae	Create a way to restore last state of the rhs panel. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-24 22:00:59 +01:00
Michael Telatynski	ee560a969a	upon forwarding message to current room, explicitly remove clear from aux Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-24 20:17:29 +01:00
Michael Telatynski	fbca0e0d0d	correct cancel appearing when it shouldn't Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-24 20:03:07 +01:00
Michael Telatynski	4285c395f5	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into forward_message Conflicts: src/components/structures/RoomView.js	2017-04-24 18:36:33 +01:00
Richard van der Hoff	96e733b487	Merge pull request #825 from matrix-org/matthew/missing-keyboard-modifiers limit our keyboard shortcut modifiers correctly	2017-04-23 12:02:29 +01:00
Matthew Hodgson	24f2aed45f	summarise profile changes in MELS fixes https://github.com/vector-im/riot-web/issues/3463	2017-04-23 04:05:50 +01:00
Matthew Hodgson	a2be764681	display err.message to user if available in error msgs	2017-04-23 01:48:27 +01:00
Matthew Hodgson	7854cac61d	hook up keyb shortcuts for roomdir	2017-04-23 01:00:44 +01:00
Matthew Hodgson	fa033e6116	limit our keyboard shortcut modifiers correctly fixes https://github.com/vector-im/riot-web/issues/3614	2017-04-23 00:49:14 +01:00
Matthew Hodgson	e18e965eb8	missing key attr	2017-04-22 16:26:39 +01:00
Michael Telatynski	33e841a786	move user settings outward and use built in read receipts disabling Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-22 15:40:29 +01:00
Matthew Hodgson	6c177bc617	Merge pull request #806 from t3chguy/t3chguy/show_access_token Show Access Token under Advanced in Settings	2017-04-22 02:51:54 +01:00
Matthew Hodgson	ad76dd0dd1	Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements Link tags/commit hashes in the UserSettings version section	2017-04-22 02:38:30 +01:00
Matthew Hodgson	febd9c637e	Merge pull request #813 from t3chguy/RoomSettings_close_focus_composer On return to RoomView from auxPanel, send focus back to Composer	2017-04-22 02:08:48 +01:00
Matthew Hodgson	872d0e0f50	Merge branch 'develop' into travis/hide-read-receipts	2017-04-22 01:36:38 +01:00
turt2live	64e416e117	Add option to not send typing notifications Addresses vector-im/riot-web#3220 Fix applies to both the RTE and plain editor. Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 14:50:26 -06:00
turt2live	e4c4adc517	Add option to hide other people's read receipts. Addresses vector-im/riot-web#2526 Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-04-21 14:28:28 -06:00
Michael Telatynski	fdc26a490a	On return to RoomView from auxPanel, send focus back to Composer Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 18:45:28 +01:00
Luke Barnard	ae8d04b35d	Merge pull request #805 from matrix-org/luke/feature-read-marker Sync RM across instances of Riot	2017-04-21 16:52:46 +01:00
Luke Barnard	29c2bd3d18	reset last_rr_sent on error Indicate that setting the RR was a failure and that hitting the API should be retried (in the case where the errcode !== "M_UNRECOGNISED")	2017-04-21 16:46:36 +01:00
Luke Barnard	19d6d1ef4b	Merge pull request #811 from matrix-org/luke/login-ui First iteration on improving login UI	2017-04-21 16:25:16 +01:00
Luke Barnard	9c4c706120	Remove :server.name for custom servers Custom servers may not be configured such that their domain name === domain part.	2017-04-21 16:09:11 +01:00
Michael Telatynski	b6ca16fc2f	add RoomView state for message being forwarded add RoomView action handler for message forward clear forwardingMessage onCancelClick RoomView change var into const in render RoomView load ForwardMessage from rooms.ForwardMessage if there is a messageForwarding object in state show panel in aux Create ForwardMessage class Modify RoomHeader so that it shows the cancel button more greedily reskindex Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 13:50:22 +01:00
Luke Barnard	9cd7914ea5	Finishing off the first iteration on login UI This makes the following changes: - Improve CountryDropdown by allowing all countries to be displayed at once and using PNGs for performance (trading of quality - the pngs are scaled down from 32px to 25px) - "I want to sign in with" dropdown to select login method - MXID login field that suffixes HS domain (whether custom or matrix.org) and prefixes "@" - Email field which is secretly the same as the username field but with a different placeholder - No more login flickering when changing ServerConfig (!) fixes https://github.com/vector-im/riot-web/issues/1517 This implements most of the design in https://github.com/vector-im/riot-web/issues/3524 but neglects the phone number login: ![login_with_msisdn](https://cloud.githubusercontent.com/assets/1922197/24864469/30a921fc-1dfc-11e7-95d1-76f619da1402.png) This will be updated in another PR to implement desired things: - Country code visible once a country has been selected (propbably but as a prefix to the phone number input box. - Use square flags - Move CountryDropdown above phone input and make it show the full country name when not expanded - Auto-select country based on IP	2017-04-21 11:37:08 +01:00
Michael Telatynski	bbd1f34336	Prepend REACT_SDK_VERSION with a v to match riot-web version output Add simple helper to construct version/commit hash urls var -> let/const and prepend olmVersionString with v for same reason for both matrix-react-sdk and riot-web, if unknown/local don't do anything else try to create a link to the commit hash/tag name Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 03:04:34 +01:00
Michael Telatynski	be9b858193	focus on composer after jumping to bottom Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-21 01:06:00 +01:00
Luke Barnard	67089cb527	If new RR-RM API not implemented, fallback to RR-only API	2017-04-20 14:34:59 +01:00
Luke Barnard	a4ba5f041c	Remove log, reinstate comment	2017-04-19 10:46:08 +01:00
Luke Barnard	edeaef8c2f	Initialise last_rm_sent_event_id	2017-04-19 10:28:38 +01:00
Luke Barnard	81bf2be13b	Make note of inconsistant roomReadMarkerTsMap This will become redundant when there is server support for directionality of the RM	2017-04-19 10:27:43 +01:00
Luke Barnard	a787ee8480	Remove spammy log	2017-04-19 10:20:53 +01:00
Luke Barnard	00cf5b5918	Revert change	2017-04-19 10:20:24 +01:00
Luke Barnard	e32f153573	Remove Room.accountData listener on unmount	2017-04-19 10:18:25 +01:00
Luke Barnard	28818b857a	Remove log	2017-04-19 10:17:44 +01:00
Luke Barnard	81bdfe2126	Update to match renamed API	2017-04-19 10:14:57 +01:00
Michael Telatynski	61071b89df	Show Access Token under Advanced in Settings behind a Spoiler, onClick = spoil+select Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-04-18 19:55:08 +01:00
Matthew Hodgson	c1c3956df4	fix bugs, and handle shortcircuit react when updating roomtile	2017-04-18 19:28:24 +01:00
Luke Barnard	c431c9ab22	Clarify comment	2017-04-18 15:18:21 +01:00
Luke Barnard	d38520dfb4	Undo change in ghost RM logic Put a XXX to indicate that the ghost tile should be replaced with something mor e stable. As it stands, the ghost will appear, potentially at a different position to the RMs actual position	2017-04-18 15:17:42 +01:00
Luke Barnard	d33afa99ab	marker -> event_id	2017-04-18 15:13:05 +01:00
Luke Barnard	4b5364e9ae	Merge branch 'develop' into luke/feature-read-marker	2017-04-18 14:45:18 +01:00
Luke Barnard	28ed69b617	m.read_marker -> m.fully_read	2017-04-18 14:44:43 +01:00
Matthew Hodgson	da569c2c8d	add constantTimeDispatcher and use it for strategic refreshes. constantTimeDispatcher lets you poke a specific react component to do something without having to do any O(N) operations. This is useful if you have thousands of RoomTiles in a RoomSubList and want to just tell one of them to update, without either having to do a full comparison of this.props.list or have each and every RoomTile subscribe to a generic event from flux or node's eventemitter UNTESTED	2017-04-17 21:06:37 +01:00
Luke Barnard	a29d8c2af2	Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings Escape closes UserSettings	2017-04-12 15:18:19 +01:00
Luke Barnard	9c9dc84f45	Remove redundant setting of readMarkerEventId	2017-04-12 15:12:37 +01:00
Luke Barnard	249e42747b	Fix bug where `roomId` was expected to be a property on timelineSet	2017-04-12 15:09:56 +01:00
Luke Barnard	1c25ed89b0	Initial implementation of using new RM API As detailed here https://docs.google.com/document/d/1UWqdS-e1sdwkLDUY0wA4gZyIkRp-ekjsLZ8k6g_Zvso/edit, the RM state is no longer kept locally, but rather server-side. The client now uses it's locally-calculated RM to update the server and receives server updates via the per-room account data. The sending of the RR has been bundled in to reduce traffic when sending both. In effect, whenever a RR is sent the RM is sent with it but using the new API. This uses a js-sdk change which has set to be finalised and so might change.	2017-04-12 15:05:39 +01:00
Luke Barnard	424aae6b91	Prevent the ghost and real RM tile from both appearing	2017-04-12 15:04:38 +01:00
David Baker	d4dc16545a	Fix people section vanishing on 'clear cache' Stop the client first Fixes https://github.com/vector-im/riot-web/issues/3610	2017-04-11 18:16:29 +01:00
David Baker	811cd79206	Make the clear cache button work on desktop Fixes https://github.com/vector-im/riot-web/issues/3597	2017-04-10 17:39:27 +01:00
Matthew Hodgson	6dbb4e9002	fix the warning shown to users about needing to export e2e keys apparently when we added the buttons to export e2e keys to the Logout button, we didn't change the text warning the user that e2e export was coming soon. likewise when changing password and forgetting password (where we didn't even have a button to export keys)	2017-04-07 23:34:11 +01:00
Richard van der Hoff	6352784a2c	Merge pull request #795 from matrix-org/luke/fix-pagination3 Fix infinite pagination/glitches with pagination	2017-04-07 13:24:22 +01:00
Luke Barnard	d218f90cde	Fix infinite pagination/glitches with pagination I think this was being caused by a bug introduced in 47f29b that meant that `backwards` was actually being used as `forwards`.	2017-04-07 11:34:31 +01:00
Luke Barnard	a815788af8	Fix issue where teamTokenMap was ignored for guests This was an issue because guests do not log in with a teamToken, it is implicitly set by MatrixChat when it mounts. The fix is to view_home_page when a login occurs and MatrixChat has this._teamToken set.	2017-04-06 17:10:32 +01:00
Luke Barnard	880a48494b	Merge pull request #785 from matrix-org/luke/fix-scroll-past-big-event Fix scroll token selection logic	2017-04-06 12:36:30 +01:00
Luke Barnard	5f8a7b46a8	Remove redundant setState call, always focus composer after sync	2017-04-06 11:44:25 +01:00
Luke Barnard	95b40a976c	Replace sdkReady with firstSyncPromise, add mx_last_room_id - Create a promise that will serve as a lock to be blocked on by things that need to wait for the first sync before accessing state. - Use this promise to block `view_room` calls until a sync has occured instead of just dropping them silently if the sync hasn't happened yet. - Store the current room ID in a localStorage item `mx_last_room_id` when `view_room` fires. This persists the last viewed room ID so that it can be restored on refresh, browser quit. This replaces the previous logic which set the room following a sync based on the most recent unread room.	2017-04-06 11:38:06 +01:00
Luke Barnard	b0a04e6f00	Clarify comment	2017-04-05 17:52:05 +01:00
Luke Barnard	423babdb17	Remove fairly redundant condition Making sure that a node is intersected by the bottom of the wrapper is a bit overkill, given that we iterate from the bottom. This also prevents the scenario of having no nodes that are not precisely intersected, but possibly straddling the bottom of the wrapper.	2017-04-05 17:51:07 +01:00
Luke Barnard	47f29b9454	Simplify simulated unfill	2017-04-05 17:48:24 +01:00
Luke Barnard	5737994957	Clarify and simplfiy unpagination logic	2017-04-04 13:28:26 +01:00
Luke Barnard	94fe9999db	Reimplement _saveScrollState The actual fix to https://github.com/vector-im/riot-web/issues/3175 is this change to `_saveScrollState`, which is to pick the trackedScrollToken based on which node is intersected by the bottom of the scroll panel. This is opposed to the previous logic that picked based on which node was the first from the bottom to be above the bottom of the viewport. In the case where the viewport bottom does not intersect any events, the topmost event is used.	2017-04-04 11:55:53 +01:00
Luke Barnard	8e5a83a056	Reduce number of unpaginated events by 1 When unpaginating in the backwards direction	2017-03-30 18:02:33 +01:00
Luke Barnard	fff83ba234	Fix the onFinished for timeline pos dialog This was causing a blank RoomView because it was trying to work with `room_id = undefined`.	2017-03-30 17:18:22 +01:00
David Baker	dff79984a6	Merge remote-tracking branch 'origin/develop' into dbkr/remove_session_load_error	2017-03-29 18:24:06 +01:00
David Baker	22b0f69ac9	Merge pull request #782 from matrix-org/dbkr/matrixchat_tidy Use Login & Register via component interface	2017-03-29 18:23:36 +01:00
Luke Barnard	5a411ba005	Merge pull request #781 from matrix-org/luke/fix-flaky-tests-maybe Attempt to fix the flakyness seen with tests	2017-03-29 17:32:56 +02:00
David Baker	a6612bb8ad	Remove non-functional session load error MatrixChat was trying to display an error if the session failed to restore, but it was never actually being shown because it was just set as a member variable and therefore never actually caused a re-render for the error to be displayed. Almost all errors are caught by _restoreFromLocalStorage which displays the fancy dialog if your session can't be restored, so I'm not convinced this ever even tried to do anything anyway. Remove it.	2017-03-29 16:23:18 +01:00
David Baker	cee2628b41	Use Login & Register via component interface Login & Register were being imprted directly for some reason, rather than going via the normal component interface. Should be functionally identical.	2017-03-29 15:24:47 +01:00
Luke Barnard	2146e89c09	Attempt to fix the flakyness seen with tests Specifically: ``` JS 2.1.1 (Linux 0.0.0) joining a room over federation should not get stuck at a spinner FAILED Did not find exactly one match (found: 0) for componentType:function (props, context, updater) { ``` actually meant that the room directory wasn't displayed - probably because the dispatch `view_room_directory` ended up on another tick of the event loop, meaning that the directory wasn't displayedi. The fix attempted in ths commit is to use `this._setPage` instead to view the directory. This uses `setState` to set the screen to the directory, so I'm not entirely convinced this will solve the problem (as `setState` may also end up doing things on another tick. and ``` JS 2.1.1 (Linux 0.0.0) loading: MatrixClient rehydrated from stored credentials: shows a room view if we followed a room link FAILED MatrixChat still not ready after 5 tries awaitRoomView@/home/travis/build/vector-im/riot-web/test/all-tests.js:201363:90 ``` was happening probably because in the handler for the `sync` event in `MatrixChat` (around line 840), there was one case in which the `ready` state may not be true (causing all 5 attempts to fail), and this case relied on `starting_room_alias_payload`. This `starting_room_alias_payload` is now redundant because of `initialScreenAfterLogin`, which was added recently.	2017-03-29 15:02:28 +01:00
David Baker	90242c2c85	Only send local echo RR if we're at the end	2017-03-29 14:12:50 +01:00
David Baker	3373f00d90	Only clear the local notification count if needed Only zero the local notification count when we actually send a read receipt, otherwise we cause a re-render of the RoomList every time the user moves the cursor in the window, basically.	2017-03-29 14:08:31 +01:00
David Baker	91d10646b5	Merge pull request #775 from matrix-org/luke/fix-RoomList-notif-flashing Improve zeroing of RoomList notification badges	2017-03-28 11:33:38 +01:00
Luke Barnard	4a0988f83e	Do not send the room with action By not sending the room with the action, we prevent its state from being updated by registered views listening for on_room_read	2017-03-28 11:26:40 +01:00
Luke Barnard	f4dc7ae8b1	Improve zeroing of RoomList notification badges Use an action and force an update when zeroing the number of notifications in a room. This is better than waiting for a `render` to happen at some point. This will hopefully fix https://github.com/vector-im/riot-web/issues/3257	2017-03-28 10:38:57 +01:00
Luke Barnard	ffd8ef84d6	Fix VOIP bar hidden on first render of RoomStatusBar componentDidUpdate is not called for the initial render of a React component (https://facebook.github.io/react/docs/react-component.html#componentdidupdate) componentWillMount is used so that the initial state and props of RoomStatusBar can also trigger props.isVisible. This fixes https://github.com/vector-im/riot-web/issues/3181	2017-03-28 09:30:41 +01:00
Luke Barnard	c650cfffac	logged_in -> loggedIn Also added `loggingIn` to `initialState` and removed some commented code.	2017-03-27 17:14:39 +01:00
Luke Barnard	30c5af35e5	Add state loggingIn to MatrixChat to fix flashing login To prevent the login screen from flashing when refreshing the app, use some state to indicate that a login is in progress, and OR that with the existing `loading` boolean to show the `<Spinner>` instead of the default `<Login>`. This might be too invasive, and a default spinner may be better.	2017-03-27 16:39:04 +01:00
David Baker	a8d85ca2ad	Merge pull request #756 from matrix-org/dbkr/add_msisdn Support adding phone numbers in UserSettings	2017-03-24 10:54:22 +00:00
David Baker	5e3b991ec2	PR feedback fixes	2017-03-24 10:45:38 +00:00
Kegsay	3d71cb8325	Merge pull request #768 from matrix-org/kegan/memleaks-are-bad-mkay Add canResetTimeline callback and thread it through to TimelinePanel	2017-03-22 16:39:07 +00:00
David Baker	4cd24d15d4	Factor out AddPhoneNumber to a separate component	2017-03-22 15:18:27 +00:00
Kegan Dougal	4cebded04f	Add canResetTimeline callback and thread it through to TimelinePanel	2017-03-22 15:06:52 +00:00
David Baker	6a37fc4325	Comment typos	2017-03-22 12:00:16 +00:00
David Baker	6a56828974	Just return the promise if it's a bg request This makes the code a bit neater.	2017-03-22 11:25:33 +00:00
David Baker	5ae7d5e4b2	More comments	2017-03-22 11:13:00 +00:00
David Baker	e5a5ca9efc	Don't set busy state at all for background request	2017-03-22 10:53:15 +00:00
David Baker	ec63e18b42	Show spinner whilst processing recaptcha response The fact that we showed no feedback whilst submitting the captcha response was causing confusion on slower connections where this took a nontrivial amount of time. Takes a new flag from the js-sdk that indicates whether the request being made is a background request, presenting a spinner appropriately. Requires https://github.com/matrix-org/matrix-js-sdk/pull/396	2017-03-21 18:40:41 +00:00
David Baker	d5f7b3983b	Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn	2017-03-21 13:44:55 +00:00
David Baker	4a29d674f8	Merge pull request #750 from matrix-org/dbkr/msisdn_signin_2 Login / registration with phone number, mark 2	2017-03-21 13:43:11 +00:00
Michael Telatynski	69c3bd7f80	Escape closes UserSettings Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-03-20 12:13:21 +00:00
David Baker	92d5f55a46	Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display	2017-03-17 13:55:07 +00:00
David Baker	f8a1634720	Merge pull request #759 from matrix-org/luke/display-redactions-better Display timestamps and profiles for redacted events	2017-03-16 17:14:10 +00:00
Luke Barnard	d4ed9e816b	Display timestamps and profiles for redacted events This is part of fixing https://github.com/vector-im/riot-web/issues/3390	2017-03-16 17:00:10 +00:00
David Baker	b06111202d	Display threepids slightly prettier ie. Put a + on the front of msisdns.	2017-03-16 15:16:24 +00:00
David Baker	af8c3edba6	Support adding phone numbers in UserSettings	2017-03-16 14:56:26 +00:00
Kegan Dougal	544a6593e1	Unregister the UploadBar event listener on unmount	2017-03-16 14:19:17 +00:00
Luke Barnard	b21f016d37	Add "Export E2E keys" option to logout dialog Fixes https://github.com/vector-im/riot-web/issues/3184	2017-03-16 14:18:18 +00:00
David Baker	67757a16f3	Don't remove the line that gets the error message	2017-03-16 12:54:18 +00:00
David Baker	d292a627d8	Handle no-auth-flow error from js-sdk	2017-03-15 16:44:56 +00:00
David Baker	648ad8d66c	Merge pull request #753 from matrix-org/luke/fix-register-not-routing Do routing to /register _onLoadCompleted	2017-03-15 13:18:34 +00:00
Luke Barnard	5330e47b3f	Add null check	2017-03-15 13:05:03 +00:00
Luke Barnard	238e48e4af	Do routing to /register _onLoadCompleted _onLoadCompleted happens straight away because Lifecycle finishes loading the session instantly when registration parameters (client_secret etc.) are set.	2017-03-15 12:02:08 +00:00
Richard van der Hoff	3325dd6ede	Merge pull request #747 from matrix-org/luke/increase-scrollback-window Double UNPAGINATION_PADDING again	2017-03-15 11:46:34 +00:00
Luke Barnard	47958180a6	Add null check to start_login	2017-03-14 15:13:36 +00:00
Luke Barnard	5e93dde0dd	Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus Merge the two RoomTile context menus into one	2017-03-14 14:19:36 +00:00
Luke Barnard	17c9fcbb85	Merge branch 'develop' into luke/UDE-file-upload	2017-03-14 13:59:04 +00:00
David Baker	30b442515e	Merge pull request #743 from matrix-org/luke/fix-screen-after-login Decide on which screen to show after login in one place	2017-03-14 13:44:08 +00:00
David Baker	878413f6a4	Support msisdn signin Changes from https://github.com/matrix-org/matrix-react-sdk/pull/742	2017-03-14 11:50:13 +00:00
Luke Barnard	d8a30aa848	Double UNPAGINATION_PADDING again	2017-03-13 13:48:15 +00:00
Matthew Hodgson	3aaf37df1a	beautify a tonne more errors	2017-03-12 22:59:41 +00:00
Matthew Hodgson	71e0780eee	beautify search fail error	2017-03-12 22:24:16 +00:00
Matthew Hodgson	b7d5d2fd56	beautify UserSettings error msg fix up default dialog cancel button	2017-03-12 20:03:14 +00:00
Richard van der Hoff	2786fb0f46	Revert "Support registration & login with phone number (#742 )" This reverts commit `0269562383`. This breaks against the current synapse release. We need to think more carefully about backwards compatibility.	2017-03-09 18:32:44 +00:00
Luke Barnard	1f788feacd	Merge the two RoomTile context menus into one This will require riot-web changes https://github.com/vector-im/riot-web/pull/3395	2017-03-09 17:03:57 +00:00
David Baker	0269562383	Support registration & login with phone number (#742 ) * WIP msisdn sign in * A mostly working country picker * Fix bug where you'dbe logged out after registering Stop the guest sync, otherwise it gets 401ed for using a guest access token for a non-guest, causing us to beliebe we've been logged out. * Use InteractiveAuth component for registration * Fix tests * Remove old signup code * Signup -> Login Now that Signup contains no code whatsoever related to signing up, rename it to Login. Get rid of the Signup class. * Stray newline * Fix more merge failing * Get phone country & number to the right place * More-or-less working msisdn auth component * Send the bind_msisdn param on registration * Refinements to country dropdown Rendering the whole lot when the component was rendered just makes the page load really slow, so just show 2 at a time and rely on type-to-search. Make type-to-search always display an exact iso2 match first * Propagate initial inputs to the phone input * Support msisdn login * semicolon * Fix PropTypes * Oops, use the 1qst element of the array Not the array of object keys which has no particular order * Make dropdown/countrydropdown controlled * Unused line * Add note on DOM layout * onOptionChange is required * More docs * Add missing propTypes * Don't resume promise on error * Use React.Children to manipulate children * Make catch less weird * Fix null dereference Assuming [0] of an empty list == undefined doesn't work if you're then taking a property of it.	2017-03-09 10:59:22 +00:00
Luke Barnard	4f7914813d	Make UDD appear when UDE on uploading a file This has highlighted the fact that an unsent image looks very much like a sent image (https://github.com/vector-im/riot-web/issues/3391). Also, the "Resend" status bar doesn't appear when an image is unsent.	2017-03-09 10:44:09 +00:00
David Baker	676c5c21c1	Merge pull request #739 from matrix-org/luke/visible-redactions Show message redactions as black event tiles	2017-03-09 09:41:31 +00:00
Luke Barnard	c4001b5c5d	Use else instead of two returns	2017-03-08 15:11:38 +00:00
Luke Barnard	eca82bdb42	Make sure the screen is set, otherwise ignore screenAfterLogin	2017-03-08 10:45:07 +00:00
Luke Barnard	06a05c351d	Decide on which screen to show after login in one place This follows from a small amount of refactoring done when RTS was introduced. Instead of setting the screen after sync, do it only after login. This requires as-yet-to-be-PRd riot-web changes. This includes: - initialScreenAfterLogin, which can be used to set the screen after login, and represents the screen that would be viewed if the window.location at the time of initialising Riot were routed. - guestCreds are now part of state, because otherwise they don't cause the login/registration views to update when set. - instead of worrying about races and using this._setPage, use a dispatch.	2017-03-08 10:25:54 +00:00
Aviral Dasgupta	32dd89774e	add support for autocomplete delay	2017-03-07 04:09:26 +05:30
Aviral Dasgupta	0653343319	order User completions by last spoken	2017-03-07 04:09:26 +05:30
David Baker	341f978743	Fix the team server registration Pass extra info from the UI auth process as a second parameter to onAuthFinished. Allows the email sid & client secret to be used outside of the UI auth process.	2017-03-06 17:31:21 +00:00
Luke Barnard	c0fc3ba3fe	Make redactions appear when the event has been redacted (on Room.redaction)	2017-03-06 14:20:24 +00:00
Luke Barnard	edccfeb20b	No text required, do not continuate after redacted even It's curious, however, that a continuation occured after a redacted event, given that the event shouldn't have a sender	2017-03-06 10:26:26 +00:00
Luke Barnard	2bd9885288	Start to show redacted events	2017-03-03 15:42:24 +00:00
David Baker	62d9439530	Remove old import & pass through result in InteractiveAuthDialog	2017-03-03 14:31:52 +00:00
David Baker	1bdf213d67	Merge pull request #729 from matrix-org/dbkr/register_ui_auth Port registration over to use InteractiveAuth	2017-03-03 13:37:41 +00:00
David Baker	977b8a7379	Make UIAuth Dialog show an error when auth fails	2017-03-03 12:08:26 +00:00
David Baker	8522231d4f	Revery unintentional change to when teamToken was returned	2017-03-03 10:28:10 +00:00
David Baker	9c6782af6f	Oops, lost trackPromise	2017-03-02 15:08:15 +00:00
David Baker	91ef26a7f8	makeRegistrationUrl is required	2017-03-02 15:04:10 +00:00
David Baker	51b2001f70	Remove todo which is now done!	2017-03-02 15:03:24 +00:00
David Baker	0914226327	Actuall pass our proxy makeRegistrationUrl	2017-03-02 14:47:47 +00:00
David Baker	3028b335a4	Oops, re-add referrer param as Registration was still using it	2017-03-02 14:46:18 +00:00
David Baker	dd762cc835	Add makeRegistrationUrl to proptypes	2017-03-02 14:40:55 +00:00
David Baker	a5cf3a964b	doc	2017-03-02 14:39:25 +00:00
David Baker	770c1ce11f	Remove redundant prop	2017-03-02 14:35:08 +00:00
David Baker	8be66d0f04	Merge pull request #730 from Half-Shot/hs/video-gif-autoplay Autoplay videos and GIFs if enabled by the user.	2017-03-02 13:41:30 +00:00
David Baker	0035a91596	Merge pull request #731 from matrix-org/luke/warn-users-e2e-first-time Warn users about using e2e for the first time	2017-03-02 13:28:15 +00:00
David Baker	95cff17698	Merge pull request #721 from matrix-org/luke/fix-refactor-UnknownDeviceDialog Show UDDialog on UDE during VoIP calls	2017-03-02 13:13:45 +00:00
David Baker	9c5fb00da4	Fix syntax	2017-03-01 18:33:45 +00:00
David Baker	ef5d2bca91	Get errorText from error in stageUpdated	2017-03-01 16:59:25 +00:00
David Baker	c9ef879afa	PR feedback: Move the email token request here	2017-03-01 16:04:15 +00:00
Luke Barnard	b7bd93c613	var -> const	2017-03-01 15:55:15 +00:00
Luke Barnard	187c91b76a	Adjust warning message	2017-03-01 15:42:05 +00:00
Luke Barnard	6d296a0e7a	Warn users about using e2e for the first time	2017-03-01 15:41:13 +00:00
Luke Barnard	39427839b9	Use ES6 export style	2017-03-01 14:33:25 +00:00
David Baker	dd33624454	Merge remote-tracking branch 'origin/develop' into dbkr/register_ui_auth (This ended up mostly being merged by hand as git made a complete mess of the merge)	2017-03-01 10:45:17 +00:00
Luke Barnard	0ef8e2a8f4	Various fixes	2017-02-28 15:18:00 +00:00
Luke Barnard	48a3d0d595	Refactor to not set team token in bad ways Use the on_logged_in dispatch instead. Call setPage in one place, _onLoggedIn, when deciding which page to view on login. Change some require to import, var to const. Remove onTeamMemberRegistered and just use a nullable argument to onRegistered	2017-02-28 15:05:49 +00:00
Will Hunt	1995c16013	Add a user option to enable autoplaying gifs and videos.	2017-02-27 22:17:43 +00:00
David Baker	c22db1db5f	Fix race when signup is completed elsewhere as commented	2017-02-27 18:22:26 +00:00
David Baker	e5853a6571	Put back server picker for registration * Also fix bug where you couldn't picxk a different server if you were already registered as a guest (because it still sent the access token which the new server rejected) * Propagate errors from UI auth back to registration so it goes back to the registration screen	2017-02-27 17:24:28 +00:00
Luke Barnard	7221900497	Refactor remove resend_all_events and cancel_all_events dispatches	2017-02-27 13:39:12 +00:00
David Baker	454aa0757a	Poll for authentication completion on registration (both for email validation and completion of the whole auth session).	2017-02-24 17:24:10 +00:00
David Baker	51467506f8	Port registration over to use InteractiveAuth These changes are moved over from the dbkr/msisdn_signin branch	2017-02-24 11:41:23 +00:00
Luke Barnard	e1a40a8ef0	Notify MatrixChat of teamToken after login	2017-02-23 16:30:26 +00:00
David Baker	fd3c1ab9e1	Merge pull request #718 from matrix-org/luke/ignore-no-tile-events Do not push a dummy element with a scroll token for invisible events	2017-02-23 10:17:16 +00:00
David Baker	8737112a8c	Merge pull request #715 from matrix-org/luke/mels-scrolling-fix MELS: check scroll on load + use mels-1,-2,... key	2017-02-23 10:12:26 +00:00
Luke Barnard	f92708fbe6	In practice the MELS-1,2,3 solves nothing, revert it	2017-02-22 16:54:32 +00:00
Luke Barnard	436e6b36f1	Move UDE handling to a its own file, adjust wording	2017-02-22 16:42:14 +00:00
Luke Barnard	f230b0a3c0	Fix status bar expanded on tab-complete This had regressed when `_getSize` was introduced. It didn't consider tab completing.	2017-02-22 14:03:30 +00:00
Luke Barnard	c13ff254b1	Add "Retry" button to UDE	2017-02-22 10:21:43 +00:00
Luke Barnard	878e31eba2	Show UDDialog on m.call.invite failure Requires https://github.com/matrix-org/matrix-js-sdk/pull/378 Also, refactored UDDialog creation into its own dispatch event, because there will be other parts of the code that will want to spawn one.	2017-02-21 17:22:22 +00:00
Luke Barnard	581c8c138e	Do not push a dummy element with a scroll token for invisible events If an event does not `wantTile`, do not add a dummy element with a scroll token, as this can be unperformant with 1000s of events.	2017-02-21 15:01:18 +00:00
Luke Barnard	995e59b973	Merge pull request #716 from matrix-org/luke/feature-default-hs Allow setting the default HS from the query parameter	2017-02-21 14:43:36 +00:00
Matthew Hodgson	aabf9255d2	anchor the authcache on LoggedInView to prevent it persisting over logouts	2017-02-21 01:03:22 +00:00
Matthew Hodgson	6af0b9618a	first cut of improving UX for deleting devices. This adds a 5 minute auth cache to speed up the process of deleting old devices. It has the following nastinesses (mainly due to being written on a flight whilst juggling kids): * the auth cache is done as context attached to MatrixChat. one could argue that it should be per-client instead, but we don't yet have multiple clients. * the auth cache is only maintained currently in DevicesPanelEntry (i.e. set & invalidated). One could argue that it might be better maintained in InteractiveAuth.js or a dedicated cache object abstraction, but given the only use I can think of is when managing devices, perhaps this is good enough for now.	2017-02-21 00:19:49 +00:00
Luke Barnard	9eef3c53a3	Allow setting the default HS from the query parameter Fixes https://github.com/vector-im/riot-web/issues/3207	2017-02-20 16:53:26 +00:00
Luke Barnard	6fead66f89	MELS: check scroll on load + use mels-1,-2,... key To fix https://github.com/vector-im/riot-web/issues/2916, force the checking of scroll position by calling _onWidgetLoad (might need renaming...) when a MELS is expanded/contracted. Also use an keying scheme for MELS that doesn't depend on the events contained, but rather a simple incrementing index based on the order of the MELS as it appears amongst all MELS.	2017-02-20 10:59:11 +00:00
Matthew Hodgson	8990e770b7	fix colouring in voip dark theme	2017-02-20 01:43:55 +02:00
David Baker	10534e7df4	Merge pull request #709 from matrix-org/dbkr/show_when_banned Show when you've been kicked or banned	2017-02-17 16:48:59 +00:00
Kegsay	5abcb91e0d	Merge pull request #708 from matrix-org/kegan/clear-cache Add a 'Clear Cache' button	2017-02-17 15:51:08 +00:00
David Baker	de4773ba93	Show when you've been kicked or banned Update the room state when you've been kicked or banned, and show a message in the preview bar, including the reason.	2017-02-17 15:50:30 +00:00
Kegan Dougal	8d6c3cd3f4	Review comments	2017-02-17 15:37:49 +00:00
Kegan Dougal	0a31efa0b7	Add a 'Clear Cache' button This deletes the IndexedDB database and reloads the page. This solely exists as a get-out clause for users in case the indexedDB instance gets corrupted. Hopefully we won't ever need to point users to it.	2017-02-17 15:16:28 +00:00
David Baker	a3746ea1b6	Merge remote-tracking branch 'origin/develop' into dbkr/update_on_room_name	2017-02-17 14:41:54 +00:00
David Baker	b2344ceb74	Update the room view on room name change	2017-02-17 11:44:56 +00:00
David Baker	4753552ddc	Merge pull request #706 from matrix-org/luke/fix-team-token-referral-link Make UserSettings use the right teamToken	2017-02-16 18:12:46 +00:00
Luke Barnard	406c34b715	Make UserSettings use the right teamToken This threads the correct teamToken through to UserSettings for generating the referral section.	2017-02-16 18:00:52 +00:00
Luke Barnard	9d2bb70823	If the home page is somehow accessed, goto directory For example, if someone ends up on /home somehow, just redirect to the directory instead of displaying a very awkward "File not found" plain text in the home page iFrame.	2017-02-16 17:03:22 +00:00
Luke Barnard	6945e7c154	Merge pull request #699 from matrix-org/luke/fix-avatar-initials Display avatar initials in typing notifications	2017-02-16 14:06:05 +00:00
Luke Barnard	74487c655d	If a referrer hasn't been specified, use empty string This is interpretted by the RTS as a non-referred team member who still needs the team token to access their welcome page etc.	2017-02-16 09:22:44 +00:00
Luke Barnard	8067bb627f	Display avatar initials in typing notifications It seems they don't overlap hawkwawdly anymore, so this displays them always. Fixes https://github.com/vector-im/riot-web/issues/3084	2017-02-15 16:29:08 +00:00
David Baker	973b92b8f6	Merge pull request #694 from matrix-org/dbkr/confirm_ban Add confirmation dialog to kick/ban buttons	2017-02-14 17:31:51 +00:00
David Baker	6663f5bff0	Remove commented stuff That I've now broken such that it wouldnt work if it were uncommented	2017-02-14 16:12:04 +00:00
Luke Barnard	1b8e93d4f2	Treat the literal team token string "undefined" as undefined Some users appear to have gotten team tokens into their local storage. This fix will treat the literal string "undefined" as undefined.	2017-02-14 12:56:29 +00:00
David Baker	17b08aedfc	Merge pull request #691 from matrix-org/dbkr/interactive_auth_nondialog Split out InterActiveAuthDialog	2017-02-14 10:55:12 +00:00
David Baker	18cba1fe45	Merge pull request #689 from matrix-org/luke/rts-set-team-token-view-home View /home on registered /w team	2017-02-14 10:21:23 +00:00
David Baker	36d126f3a9	PR feedback	2017-02-13 19:09:43 +00:00
David Baker	8fc3104507	Replace submit button with a spinner when busy and update test accordingly	2017-02-13 18:52:33 +00:00
David Baker	79d9deb339	Split out InterActiveAuthDialog Into a component that does Interactive Auth and a dialog that wraps it, so we can do interactive auth not necessarily in a dialog. As a side effect: * Put the buttons for each auth stage in the stage itself. Some stages don't have submit buttons (and it's very possible other stages may have other buttons entirely, like 'resend') so it makes more sense for the buttons to live in the stage components themselves. Plus it saves the slightly evil calling-functions-on-react-children thing we were doing (and indeed extending that to show the submit button at all). * Give all BaseDialogs a cross in the top right to cancel. They were all dismissable by clicking outside or pressing esc, so this adds a more visually obvious way of dismissing them. Plus, it means our InteractiveAuthDialog can have a way of canceling the whole operation separate from buttons for the individual stages.	2017-02-13 16:03:21 +00:00
Luke Barnard	16e3365240	Use a callback prop instead of `window.`	2017-02-13 14:36:35 +00:00
Luke Barnard	a21e71f59d	Merge pull request #688 from matrix-org/luke/rts-use-sid-client-secret Instead of sending userId, userEmail, send sid, client_secret	2017-02-13 13:49:23 +00:00
David Baker	b45da45457	Merge pull request #686 from matrix-org/luke/rts-enable-branded-urls Enable branded URLs again by parsing the path client-side	2017-02-13 13:38:55 +00:00
Luke Barnard	75deb55844	Null check on teamName	2017-02-13 11:48:03 +00:00
Luke Barnard	4ac769168a	View /home on registered /w team	2017-02-10 17:17:58 +00:00
Luke Barnard	29f5e88f6a	Instead of sending userId, userEmail, send sid, client_secret This has the benefit of being possible from the _second_ riot instance, which may not actually have the email of the user registering. With these parameters, the RTS can get the email and user ID itself. (see https://github.com/matrix-org/riot-team-server/pull/15)	2017-02-10 16:50:25 +00:00
David Baker	33fc4f7d8d	Merge pull request #680 from matrix-org/luke/rts-fix-reg-icon Use new method of getting team icon	2017-02-10 16:39:11 +00:00
Luke Barnard	bdd031eac2	Enable branded URLs again by parsing the path client-side Use the first path segment to key off config.teamTokenMap, which contains a mapping to teamTokens. The client then behaves as before, keeping the path in the address bar constant with no redirects required.	2017-02-10 15:09:45 +00:00

... 19 20 21 22 23 ...

3028 commits