2099 commits

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