element-web

mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 14:51:33 +03:00

Author	SHA1	Message	Date
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
Luke Barnard	ec730056d8	Alter comment	2017-02-10 11:39:22 +00:00
Luke Barnard	bab6a0b84a	Persist query parameter team token across refreshes	2017-02-10 11:31:04 +00:00
Luke Barnard	45f5b8b3a9	Thread teamToken through to LeftPanel for "Home" button This means the riot-web will use the same teamToken used by sdk components. This includes cases where only the fragment query parameter has been provided. Fixes matrix-org/riot-web#3185	2017-02-10 09:57:28 +00:00
Luke Barnard	69add8fd64	Actually use the RTS URL	2017-02-09 13:16:46 +00:00
Luke Barnard	103710728f	Do not show "+1 other" Instead show a user name or avatar.	2017-02-09 10:30:06 +00:00
Luke Barnard	553054409f	Use (props,state) ordering of arguments There was a bug here that meant that sometimes arguments were given in the wrong order; presumably leading to the status bar not appearing for calls etc.	2017-02-09 10:01:59 +00:00
Luke Barnard	cc69e982a7	Use single state to set both avatars and typing notif	2017-02-09 10:01:51 +00:00
Luke Barnard	747c0c44a6	Use new method of getting team icon This was necessary because the team token may not be known when registering, but domain is. Storing the icon under the "common" directory is the chosen solution to this.	2017-02-09 09:24:46 +00:00
Matthew Hodgson	ad2710ec5d	fix CSS for import/export buttons	2017-02-09 02:00:58 +00:00
Matthew Hodgson	ea50acfc87	fix dark theme for uploadbar	2017-02-09 01:26:53 +00:00
Luke Barnard	c2d5b72d68	Set referrer qp in nextLink This is so that when the verification link is clicked from an email, the referrer is set on the new instance of riot when /rts/register is hit	2017-02-08 17:58:40 +00:00
David Baker	fe17e2452b	Merge pull request #676 from matrix-org/luke/rts-team-token-login Get team_token from the RTS on login	2017-02-08 10:54:24 +00:00
Luke Barnard	3d30db81e0	Only init RTS if configured correctly	2017-02-07 15:24:57 +00:00
David Baker	96539a4054	Merge pull request #666 from matrix-org/luke/rts-welcome-pages RTS Welcome Pages	2017-02-07 13:42:47 +00:00
Luke Barnard	d5f6ecdc49	Use teamToken, not config when doing screen fallback	2017-02-07 13:23:58 +00:00
Luke Barnard	c93b6c3c34	Style, fixes	2017-02-07 13:15:40 +00:00
Richard van der Hoff	77f76db68b	UserSettings: s/vector-web/riot-web/ vector is dead, long live riot	2017-02-06 09:50:14 +00:00
Luke Barnard	173e80a5de	Get team_token from the RTS on login Use the /login endpoint of the RTS to get the team token when the user has successfully logged in.	2017-02-03 14:34:24 +00:00
Luke Barnard	efae5f6bf1	Use localStorage team token with fall-back on query parameter	2017-02-03 11:48:24 +00:00
Richard van der Hoff	5df5fed6f5	Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty Fix timeline & notifs panel spuriously being empty	2017-02-03 11:35:28 +00:00
Richard van der Hoff	2b67c1245f	Merge pull request #636 from matrix-org/matthew/blacklist-unverified UI for blacklisting unverified devices per-room & globally	2017-02-03 11:32:24 +00:00
David Baker	470e760e42	Fix timeline & notifs panel spuriously being empty Only claim there's nothing to display once we've failed to back paginate, otherwise we'll show the empty message instead of the MessagePanel and therefore never try to back-paginate.	2017-02-03 11:11:37 +00:00
Matthew Hodgson	e825a4af3c	show better error msg after UnkDevDialog should fix https://github.com/vector-im/riot-web/issues/3122	2017-02-03 00:45:33 +00:00
Matthew Hodgson	be41462f3a	merge	2017-02-02 22:05:44 +00:00
Matthew Hodgson	8799891e0e	hopefully fix key array warning	2017-02-02 18:47:15 +00:00
Matthew Hodgson	2cf24c17e2	double scrollback window on roomview	2017-02-02 18:27:21 +00:00
Matthew Hodgson	4ab479594b	temporarily stop hiding the statusbar as per https://github.com/vector-im/riot-web/issues/1991#issuecomment-276953915	2017-02-02 17:48:54 +00:00
Matthew Hodgson	08ad69847c	show placeholder of timeline empty	2017-02-02 16:32:10 +00:00
Luke Barnard	b9bc8eefd0	Typo	2017-02-02 13:56:54 +00:00
Luke Barnard	2aaf77974d	Pass RTS URL through	2017-02-02 11:57:56 +00:00
Luke Barnard	8c941b11cd	Use `mx_team_token` instead of config	2017-02-02 11:22:40 +00:00
Luke Barnard	acde1f3db7	Merge branch 'develop' into luke/rts-welcome-pages Conflicts: src/components/views/avatars/BaseAvatar.js	2017-02-01 17:22:45 +00:00
Luke Barnard	f8d7902d2e	Merge pull request #662 from matrix-org/luke/rts-handle-errors Throw errors on not 'ok' status codes from RTS, swap to `whatwg-fetch` for sending requests to RTS.	2017-02-01 11:44:04 +00:00
Luke Barnard	fa1981ce09	Use whatwg-fetch instead of browser-request	2017-02-01 10:39:52 +00:00
David Baker	6f53b2de2c	Merge pull request #663 from matrix-org/rav/fix_tests Make tests pass on Chrome again	2017-02-01 10:20:30 +00:00
Richard van der Hoff	cd1cf09dc9	Make tests pass on Chrome again It seems that a number of the tests had started failing when run in Chrome. They were fine under PhantomJS, but the MegolmExport tests only work under Chrome, and I need them to work... Mostly the problems were timing-related, where assumptions made about how quickly the `then` handler on a promise would be called were no longer valid. Possibly Chrome 55 has made some changes to the relative priorities of setTimeout and sendMessage calls. One of the TimelinePanel tests was failing because it was expecting the contents of a div to take up more room than they actually were. It's possible this is something very environment-specific; hopefully the new value will work on a wider range of machines. Also some logging tweaks.	2017-01-31 22:40:53 +00:00
Luke Barnard	c261ca1f5e	Allow base referral URL to be configurable	2017-01-31 15:17:43 +00:00
Luke Barnard	c2b0c603c0	Add referral section to user settings This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition.	2017-01-31 13:17:01 +00:00
Luke Barnard	878e5593ba	Implement tracking of referrals (#659 ) * Implement tracking of referrals This also modifies (or fixes) auto-joining.	2017-01-31 11:13:05 +00:00
Luke Barnard	4e9229e936	Get rid of dupl. declaration	2017-01-30 16:37:16 +00:00
Luke Barnard	1e279d2335	Finish with .done()	2017-01-30 16:35:34 +00:00
Luke Barnard	f5efc8e765	Use const, not var	2017-01-30 16:33:16 +00:00
Luke Barnard	eb4d7f04e7	Use busy spinner when requesting teams	2017-01-30 16:23:52 +00:00
Luke Barnard	318d871097	Formatting	2017-01-30 16:13:57 +00:00
Luke Barnard	4e0889454a	GET /teams from RTS instead of config.json Now that the RTS contains config for teams, use GET /teams to get that information so that users will see be able to register as a team (but not yet auto-join rooms, be sent to welcome page or be tracked as a referral).	2017-01-30 15:50:31 +00:00
Luke Barnard	d9a8acd431	Redo team-based registration (#657 ) For compatibility with referral campaign flows, re-implement team registration such that the team is selected through providing an email with a known team domain. The support email is now only shown when an email that _looks_ like a UK/US university email address, but is not known.	2017-01-27 16:31:36 +00:00
Luke Barnard	f462bd8f99	Expand status area unless status bar not visible (#655 )	2017-01-26 18:07:42 +00:00
Luke Barnard	9c99dafba5	Guard onStatusBarVisible/Hidden with this.unmounted	2017-01-26 17:03:01 +00:00
Richard van der Hoff	67bd2cf9dd	Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified	2017-01-26 14:09:25 +00:00
Kegan Dougal	bea6df88e0	Move BugReportDialog to riot-web	2017-01-25 16:33:00 +00:00
Kegan Dougal	602ce37ba7	Merge branch 'develop' into kegan/rageshake-ui	2017-01-25 15:52:00 +00:00
Richard van der Hoff	dc7a169779	Merge pull request #647 from matrix-org/rav/megolm_backup_ui Import and export for Megolm session data	2017-01-25 15:43:15 +00:00
Richard van der Hoff	9cadc2f55f	Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality Overhaul MELS to deal with causality, kicks, etc.	2017-01-25 15:20:30 +00:00
Richard van der Hoff	ebe6cddd21	Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui	2017-01-25 15:13:14 +00:00
Richard van der Hoff	69b55fd9d1	Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down Re-add dispatcher as alt-up/down uses it	2017-01-25 15:10:56 +00:00
David Baker	b34f63d3e7	Re-add dispatcher as alt-up/down uses it Alt-up/down still doesn't go through rooms in the right order, but it should probably not error.	2017-01-25 14:59:18 +00:00
Kegan Dougal	b00e090600	Do not show the bug report section if there is no bug_report_endpoint_url	2017-01-25 14:43:47 +00:00
David Baker	e567162d28	Merge pull request #648 from matrix-org/rav/fix_set_displayname Fix SetDisplayNameDialog	2017-01-25 14:32:52 +00:00
David Baker	f66e412d3a	Merge pull request #643 from matrix-org/luke/fix-typing-indication Sync typing indication with avatar typing indication	2017-01-25 11:13:55 +00:00
David Baker	fc9987a827	Merge pull request #646 from matrix-org/matthew/password-reset-warning Warn users of E2E key loss when changing/resetting passwords or logging out	2017-01-25 11:04:35 +00:00
Richard van der Hoff	29b4dde878	Fix SetDisplayNameDialog SetDisplayNameDialog got broken by the changes to support asynchronous loading of dialogs. Rather than poking into its internals via a ref, make it return its result via onFinished. Fixes https://github.com/vector-im/riot-web/issues/3047	2017-01-25 08:01:45 +00:00
Richard van der Hoff	770820e6fa	Fix a bunch of lint complaints	2017-01-24 22:41:52 +00:00
Matthew Hodgson	6a40abbbf0	actually, move signout warning to UserSettings.js also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog. This in turn fixes https://github.com/vector-im/riot-web/issues/2152	2017-01-24 23:18:25 +01:00
Richard van der Hoff	b85f53cadd	Implement Megolm key importing	2017-01-24 21:50:24 +00:00
Richard van der Hoff	e23deac1bb	Implement e2e export	2017-01-24 21:50:24 +00:00
Matthew Hodgson	5b61d00533	warn users that changing/resetting password will nuke E2E keys	2017-01-24 22:36:55 +01:00
Richard van der Hoff	6dd46d532a	Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux	2017-01-24 20:47:24 +00:00
Luke Barnard	a92fff9da7	Fix linting warnings	2017-01-24 17:18:56 +00:00
Luke Barnard	4186a769ca	Default prop for whoIsTypingLimit	2017-01-24 17:16:26 +00:00
Kegan Dougal	97387db014	Reduce log spam: Revert `a16aeeef2a` As per #riot-dev, this is no longer required.	2017-01-24 16:40:26 +00:00
Luke Barnard	9a360a48d2	Use the same property to limit avatars	2017-01-24 16:04:37 +00:00
Luke Barnard	7c66d1c867	Sync typing indication with avatar typing indication Follow the same rules for displaying "is typing" as with the typing avatars.	2017-01-24 16:01:39 +00:00
Kegan Dougal	3b9a112136	Add bug report UI	2017-01-24 14:47:11 +00:00
Luke Barnard	ce7434984b	Expand timeline in situations when _getIndicator not null The status bar will now be expanded when: - props.numUnreadMessages - !props.atEndOfLiveTimeline - props.hasActiveCall	2017-01-24 14:32:52 +00:00
Luke Barnard	bd106968ce	Merge branch 'develop' into luke/fix-join-part-collapsing-causality Conflicts: src/components/structures/MessagePanel.js	2017-01-24 14:22:18 +00:00
Luke Barnard	a06ecb87bc	Hide RoomStatusBar when it displays nothing (#615 ) Use CSS class `mx_RoomView_statusArea_expanded` to indicate an expanded status bar. Without this, the status bar may be hidden from view. A 10s debounce will prevent it from bouncing frequently.	2017-01-23 16:01:39 +01:00
Luke Barnard	d97fc0a99a	Fix typing avatars displaying "me"	2017-01-23 10:25:33 +00:00
Matthew Hodgson	7bc3fc8696	make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020	2017-01-22 01:28:43 +01:00
Matthew Hodgson	39c122fe4f	fix local storage idiocy	2017-01-21 22:27:55 +01:00
Matthew Hodgson	3071fc0ddc	UI for blacklisting unverified devices per-room & globally (written blind; untested as yet)	2017-01-21 17:39:39 +00:00
Matthew Hodgson	937f13d578	fix a bunch of dark-theme buttons	2017-01-20 21:00:22 +00:00
Luke Barnard	0c5762b91d	Implement "someone is typing" avatars (#631 ) When users are typing, their avatars can be seen instead of "..." in the RoomView StatusBar	2017-01-20 17:51:35 +01:00
David Baker	18d4d3392a	Fix a bunch of linting errors eslint --fix and a few manual ones	2017-01-20 14:22:27 +00:00
Richard van der Hoff	a16aeeef2a	Temporarily add more logging, to try to catch failures on travis	2017-01-20 13:06:06 +00:00
Matthew Hodgson	b76b0f755d	fix context menu bg	2017-01-20 02:47:47 +00:00
Richard van der Hoff	2637ae3af3	Merge pull request #630 from matrix-org/rav/fix_themes (hopefully) fix theming on Chrome	2017-01-19 17:34:36 +00:00
Richard van der Hoff	a88f9fdd73	(hopefully) fix theming on Chrome Jump through some hoops to make Chrome behave sensibly on non-default themes.	2017-01-19 15:36:57 +00:00
David Baker	9e0c7a11d0	Merge pull request #628 from matrix-org/luke/feature-team-reg-auto-join-rooms Implement auto-join rooms on registration	2017-01-19 11:44:37 +00:00
lukebarnard	e9eb38fd74	Update propTypes and do null checks	2017-01-19 11:05:08 +01:00
lukebarnard	e06dd6e34a	Implement auto-join rooms on registration Also: This fixes registration with a team: only the email localpart was being used to register. When a registration is successful, the user will be joined to rooms specified in the config.json teamsConfig: "teamsConfig" : { "supportEmail": "support@riot.im", "teams": [ { "name" : "matrix", "emailSuffix" : "matrix.org", "rooms" : [ { "id" : "#irc_matrix:matrix.org", "autoJoin" : true } ] } ] } autoJoin can of course be set to false if the room should only be displayed on the (forthcoming) welcome page for each team, and not auto-joined.	2017-01-19 10:56:04 +01:00
Matthew Hodgson	4e5689082d	correctly load synced themes without NPE	2017-01-18 20:06:54 +00:00
Matthew Hodgson	4df968ecdf	fix css snafu	2017-01-18 20:06:44 +00:00
Matthew Hodgson	fc63067237	improve commentary	2017-01-18 16:36:27 +00:00
Matthew Hodgson	3d30553b7f	review fixes, plus unbreak to work with new webpack layout	2017-01-18 14:06:47 +00:00
Matthew Hodgson	a0bbe3a306	Merge branch 'develop' into matthew/postcss	2017-01-18 12:52:59 +00:00
Luke Barnard	5ef5204c8c	Implement simple team-based registration (#620 ) * Implement simple team-based registration Config required goes in the `teams` top-level property in config.json. This consists of an array of team objects: ```json { "name": "University of Bath", "emailSuffix": "bath.ac.uk" } ``` These can be selected on registration and require a user to have a certain email address in order to register as part of a team. This is for vector-im/riot-web#2940. The next step would be sending users with emails matching the emailSuffix of a team to the correct welcome page as in vector-im/riot-web#2430.	2017-01-18 12:48:28 +01:00
Matthew Hodgson	8288eb730c	a rather hacky implementation of theme switching	2017-01-17 19:13:23 +00:00
Matthew Hodgson	203172c886	typos	2017-01-17 14:11:01 +00:00
Jani Mustonen	959163f2ef	Proper accessible buttons	2017-01-13 19:36:41 +02:00
Jani Mustonen	8d79716421	Turned the links to buttons to comply with MDN's recommendations	2017-01-13 19:36:40 +02:00
Jani Mustonen	ad072cc179	Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons.	2017-01-13 19:36:40 +02:00
Luke Barnard	d2d78919ce	Overhaul MELS to deal with causality, kicks, etc. The MELS can now deal with arbitrary sequences of transitions per user, where a transition is a change in membership. A transition can be joined, left, invite_reject, invite_withdrawal, invited, banned, unbanned or kicked. Repeated segments (modulo 1 and 2), such as joined,left,joined,left,joined will be handled and will be rendered as " ... and 10 others joined and left 2 times and then joined". The repeated segments are assumed to be at the beginning of the sequence. This could be improved to handle arbitrary repeated sequences.	2017-01-12 18:55:53 +00:00
Luke Barnard	6e2a75bbee	Fix redacted member events being visible This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765.	2017-01-11 11:27:07 +00:00
David Baker	13a5337e0f	Fix 'create account' link in 'forgot password' Fixes https://github.com/vector-im/riot-web/issues/2853	2017-01-10 15:16:39 +00:00
Richard van der Hoff	42de77e588	Remove "Cannot re-join empty room" error This is a lying error message. burn it with fire	2016-12-27 19:17:48 +00:00
Matthew Hodgson	69b277b282	ask electron users to do captchas in a web browser. This will happen anyway when they follow email verification links. make captchas poll for success so if they are completed elsewhere, electron moves on	2016-12-24 03:15:30 +00:00
Luke Barnard	2a63017372	Account for timezone in date separator calculation (#595 ) * Account for timezone in date separator calculation Decide on date separators using MatrixEvent.getDate(). This requires matrix-org/matrix-js-sdk#311	2016-12-22 17:54:30 +00:00
David Baker	fd44d9f4d6	Merge pull request #597 from matrix-org/dbkr/delete_threepid Add support for deleting threepids	2016-12-22 15:31:34 +00:00
David Baker	8a3f2d9e91	Merge pull request #598 from matrix-org/dbkr/display_msisdn_threepid Display msisdn threepids as 'Phone'	2016-12-22 15:28:09 +00:00
David Baker	a6fdbda011	Get variable name right	2016-12-22 15:26:08 +00:00
David Baker	98b22460ec	They're not all emails anymore	2016-12-22 15:03:24 +00:00
Daniel Dent	7c841a86ef	Unbranded error messages	2016-12-21 14:28:01 -08:00
David Baker	3dfffa385e	Display msisdn threepids as 'Phone' rather than pretending only email exists	2016-12-21 18:56:50 +00:00
David Baker	5e10ec4ece	Add support for deleting threepids	2016-12-21 18:49:38 +00:00
Richard van der Hoff	4804fb3a1c	Revert "Fix performance issues with wantsDateSeperator" This change broke timezone handling, so that date-separators are shown at the wrong time of day. This reverts commit `b908e7ef29`.	2016-12-21 09:48:41 +00:00
Richard van der Hoff	b8c0fa507e	Merge pull request #590 from matrix-org/luke/fix-membereventlistsummary-performance Improve the performance of MemberEventListSummary	2016-12-16 10:53:51 +00:00
Luke Barnard	6b52b247e7	Update comment on MELS key	2016-12-15 18:26:41 +00:00
Luke Barnard	88aeb6417e	Use the first member event ID or "initial" in the MELS key	2016-12-15 18:23:54 +00:00
Kegsay	71132c4610	Merge pull request #592 from matrix-org/kegan/bulk-reject-invites Implement bulk invite rejections	2016-12-15 16:16:55 +00:00
Kegan Dougal	ec41fc284a	Null guard on componentWillUnmount	2016-12-15 16:13:09 +00:00
Kegan Dougal	8a511ed54b	Add .done() to catch exceptions which may be thrown in setState	2016-12-15 14:17:29 +00:00
Luke Barnard	e7564f4dc5	Spelling	2016-12-15 13:16:36 +00:00
Kegan Dougal	8f42134d9f	Explain why binding	2016-12-14 16:04:20 +00:00
Luke Barnard	b908e7ef29	Fix performance issues with wantsDateSeperator This was causing rendering of MemberEventListSummary to be quite slow. Instead of creating two date objects, just check to see if they represent timestamps that happened on different days.	2016-12-14 16:01:32 +00:00
Kegan Dougal	13dfe9ef0f	Implement bulk invite rejects	2016-12-14 16:00:50 +00:00
Luke Barnard	c07e5d4992	Improve the performance of MemberEventListSummary - The MessagePanel now uses the same key for the MELS instances rendered so that entirely new instances are not created, they are simply passed new props (namely when new events arrive). - MELS itself now uses `shouldComponentUpdate` so that it only updates if it is given a different number of events to previous or if it is toggled to expand.	2016-12-14 15:31:35 +00:00
Kegan Dougal	1d4591ce68	Add UI in UserSettings for bulk rejecting invites	2016-12-14 15:01:50 +00:00
Kegan Dougal	49010c3e93	Refactor how 'readReceipts' are passed into EventTiles Instead of passing a list of RoomMembers, pass a list of records with a `roomMember` prop and a `ts` prop so we can display the timestamp on hover.	2016-12-09 11:24:10 +00:00
David Baker	9e3c94edf4	Fix exception when clearing room dir search Needed more isMounted checks after promises return.	2016-12-06 14:59:10 +00:00
David Baker	6777e07a41	Remove device name from crypto section As it was getting it by assuming our device was the first one, which is just not a valid assumption.	2016-12-05 20:03:43 +00:00
David Baker	8ffe14881e	Don't throw an exception entering settings page if end to end encryption is disabled (eg. if you're a guest and the server is too old to support e2e for guests).	2016-12-05 18:33:38 +00:00
Mark Haines	81e429eb14	Fix e2e attachment download by using iframes. (#562 ) * Render attachments inside iframes. * Fix up the image and video views * Fix m.audio * Comments, and only use the cross domain renderer if the attachment is encrypted * Fix whitespace * Don't decrypt file attachments immediately * Use https://usercontent.riot.im/v1.html by default * typos * Put the config in the React context. Use it in MFileBody to configure the cross origin renderer URL. * Call it appConfig in the context * Return the promises so they don't get dropped	2016-12-02 14:21:07 +00:00
David Baker	8547d00f32	Don't default the page_type to room directory As it breaks the behaviour of redirecting to /#/directory	2016-11-24 16:39:48 +00:00
David Baker	2aba646acd	Clear room alias etc. on logout	2016-11-24 14:58:37 +00:00
David Baker	0069393650	Go back to same room after logging in	2016-11-24 13:28:51 +00:00
David Baker	0bc4659fe0	Fix crash on logging in If you arrived at the page via a link to a room. Fixes https://github.com/vector-im/vector-web/issues/2634	2016-11-24 12:33:31 +00:00
Richard van der Hoff	6e6bcf8b78	Reinstate missing sections from the UserSettings The 'devices' and 'cryptography' sections got removed from UserSettings by #566.	2016-11-23 11:08:21 +00:00
Luke Barnard	42fc7b1b66	Use UNFILL_REQUEST_DEBOUNCE_MS constant, reset unfillDebouncer timeout reference.	2016-11-22 17:23:06 +00:00
Luke Barnard	d1a5d94916	Make the unpagination process less aggressive This increases `UNPAGINATION_PADDING` (see the ASCII on ScrollPanel.js, `_getExcessHeight`), and also debounces unfilling requests made for 200ms. This forces unfilling requests not to be sent unless the next 200ms has no scrolling, effectively.	2016-11-22 16:47:56 +00:00
Luke Barnard	341175ea58	Fix pagination issue where recent events are lost (#563 ) Fix pagination issue where recent events are lost Scrolling up a few pages followed by scrolling down to the most recent events previously caused some events to go missing. A test has been modified in conjunction with this fix to make sure that this failure mode is tested for in future. This commit should fix the issue, and the most recent events should be paginated back in.	2016-11-18 11:15:14 +00:00
Luke Barnard	3618b49982	Use new js-sdk public unpaginate	2016-11-16 16:10:23 +00:00
Luke Barnard	beecbc7cd7	Fix join/part collapsing regressions (#553 ) * Fix join/part collapsing regressions * Simplify loop * Explain e,e * Explain return null in _renderSummary * Kill it properly * Move . to _renderSummary * Only use the first and last events to decide whether a net change has occured * Do not sort events by TS before summarising * fix loop and comment * remove data-number-events * Better explanation comment in _renderSummary * Less tortuous comment	2016-11-16 14:42:30 +00:00
Luke Barnard	b718f1542c	Fix infinite loop when there are a lot of invisible events (#554 ) Instead of using a window of a fixed number of events, unpaginate based on the distance of the viewport from the end of the scroll range. The ScrollPanel uses the scrollTokens to convey to its parent (the TimelinePanel, in this case) the point to unpaginate up to. The TimelinePanel then takes a chunk of events off the front or back of `this.state.events` using `timelineWindow.unpaginate`. Fixes https://github.com/vector-im/vector-web/issues/2020	2016-11-16 14:25:52 +00:00
Matthew Hodgson	a967ddd1cb	quick and dirty support for custom welcome pages, with an example for geektime techfest	2016-11-13 14:10:46 +00:00
Luke Barnard	2a1d32f4d5	Add key prop to memberlist summary	2016-11-11 13:49:25 +00:00
Richard van der Hoff	998690431f	Merge pull request #542 from matrix-org/dbkr/get_app_version Fix the vector web version in UserSettings	2016-11-11 11:11:36 +00:00
Richard van der Hoff	00ecff7497	Merge pull request #544 from matrix-org/luke/feature-truncate-m-room-member-events Truncate consecutive member events	2016-11-11 11:01:47 +00:00
David Baker	857c0d1747	Wrap getAppVersion() in promise in case it throws	2016-11-11 10:05:53 +00:00
Luke Barnard	3ec7940d12	Inline renderEvents	2016-11-10 17:26:36 +00:00
Luke Barnard	d2d7ebc979	correct comment	2016-11-10 17:22:16 +00:00
Luke Barnard	dcbb31279f	Prefer import React, set prevEvent to last MemberhsipChange	2016-11-10 14:08:11 +00:00
Luke Barnard	566034cf2b	Render children EventTiles before passing to summary element	2016-11-10 13:25:48 +00:00
Luke Barnard	764959ec1c	Comment on i after membershipchanges	2016-11-10 13:14:04 +00:00
Luke Barnard	0ec5eebfc9	Hoist isMembershipChange out of for loop	2016-11-10 13:03:17 +00:00
Luke Barnard	d01bb0b78f	Use sdk.getComponent	2016-11-10 13:01:48 +00:00
Luke Barnard	5f0b891d47	Add date seperator to the expanded events netsplits across midnight is not handled, and @richvdh suggested splitting the list in two	2016-11-09 17:44:43 +00:00
Luke Barnard	04a934f738	Trying to get rid of the date separator problem	2016-11-09 16:24:56 +00:00
Luke Barnard	2f02c4b84e	WIP nicer join/part folding	2016-11-09 16:03:35 +00:00
David Baker	a008f5010a	Fix the ctrl+e mute camera shortcut * Fixes the altgr+e shortcut on Windows (Fixes https://github.com/vector-im/vector-web/issues/2561) * Fixes the shortcuts to be cmd+e on mac rather than ctrl+e which is more normal and doesn't clobber ctrl+e which old school unix types use for go-to-end-of-line.	2016-11-08 18:04:22 +00:00
Luke Barnard	cd241a4a17	Truncate consecutive member events This is needed for the IRC bridge to be able to do full membership list syncing without cluttering the message panel.	2016-11-08 16:34:02 +00:00
David Baker	d871ca2b24	PR feedback	2016-11-08 11:43:24 +00:00
David Baker	d44adcb7a9	Fix the vector web version in UserSettings Add a getAppVersion() function to the platform rather than relying on the updater code firing an event before we know what the app version is.	2016-11-08 10:45:19 +00:00
Richard van der Hoff	2ee98e9fdc	Fix NPE in LoggedInView Fixes a NPE displaying the new version bar (also fix displayname for WithMatrixClient)	2016-11-07 09:28:10 +00:00
David Baker	da10660c86	Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context	2016-11-04 10:35:41 +00:00
Richard van der Hoff	cb5b311e44	Move saveScrollState into RoomView It fits much more naturally here than in LoggedInView.	2016-11-04 09:28:35 +00:00
Richard van der Hoff	d3f20e1d9d	Add the MatrixClient to the react context Because that's the reacty way	2016-11-03 19:02:27 +00:00
Richard van der Hoff	f85a37c667	Factor out LoggedInView from MatrixChat The idea here is to make a layer which sits around for as long as we have a valid MatrixClient. Also it makes a plausible split for the render of MatrixChat, even if they are much too tightly bound for now.	2016-11-03 18:59:32 +00:00
David Baker	3c4370c180	Move 'new version' support into Platform Also adds support for the platform providing a changelog	2016-11-02 15:58:17 +00:00
David Baker	f433f9ca32	Move platform-specific functionality into Platform Platform classes are provided by the application via PlatformPeg.set().	2016-11-02 15:10:21 +00:00
David Baker	8395717f9b	Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join Fix CPU spin on joining rooms	2016-10-26 15:46:42 +01:00
David Baker	32ebd8083b	Stray comma	2016-10-26 15:32:09 +01:00
David Baker	e5a770a373	Don't send read receipt if user has logged out	2016-10-26 13:19:36 +01:00
David Baker	a2eb0a9cf0	Fix CPU spin on joining rooms Ratelimit roomheader's updates and move some other things into rate limited functions.	2016-10-26 13:09:53 +01:00
Richard van der Hoff	4f901f1894	Keyboard shortcuts to mute microphone/camera Same as hangouts: ctrl-d for mute microphone; ctrl-e to mute camera.	2016-10-17 14:13:56 +01:00
David Baker	3f067cbdf6	Give our input fields names Otherwise browsers' 'Remember Password' feature has to guess badly and ends up putting the login username / password in the first two password reset fields which is a bit odd.	2016-10-14 15:34:44 +01:00
David Baker	ef22ba1f39	Merge pull request #516 from matrix-org/rav/interactive_auth_dialog InteractiveAuthDialog	2016-10-12 18:27:23 +01:00
Richard van der Hoff	1e683427da	TODO comments on the registration flow Add some notes to Signup and the Registration component that it would be nice to factor out some common code someday.	2016-10-12 14:27:21 +01:00
Richard van der Hoff	eb36509620	Refactor CaptchaForm to put less logic in signupstages A bunch of work being done in the Recaptcha signupstage makes more sense in the CaptchaForm; let's move it.	2016-10-11 18:57:51 +01:00
Matthew Hodgson	9d303712f2	more s/Vector/Riot/	2016-10-03 10:18:43 +01:00
David Baker	91771ec17d	Ce n'est pas Python	2016-10-01 10:34:21 +01:00
David Baker	6abf6c9ec0	Merge pull request #505 from matrix-org/dbkr/dont_replacestate Fix version going blank after logging in	2016-09-30 14:32:01 +01:00
David Baker	be99f17ee0	Oops, right variable	2016-09-30 14:05:01 +01:00
David Baker	8aeb0cfb68	Dedicated function for resetting screen state	2016-09-30 11:56:32 +01:00
David Baker	c41a8da4be	Argh, there's more	2016-09-30 11:40:27 +01:00
David Baker	2f7366cb8a	Comment state fields	2016-09-30 11:37:50 +01:00
David Baker	d5af2d2c52	Use 'Sign In' / 'Sign Out' universally Rather than a mix of 'sign in/out' and 'log in/out'	2016-09-29 17:38:52 +01:00
David Baker	8cbddfcf28	Fix version going blank after logging in Don't use replaceState in MatrixClient: there's lots of stuff in MatrixClient's state now (including the app version) so replacing the entire state doesn't really make sense (and also blows away all of the nice defaults we set in getInitialState). Instead, setState of the things we actually care about wherever we used replaceState. Also add a couple of state variables to getInitialState that were missing. Fixes https://github.com/vector-im/vector-web/issues/2322	2016-09-29 17:23:07 +01:00
David Baker	d1a5e54a69	Check if a room looks like a DM rooms on joining and mark it as one if so. Also change the heuristic to only count rooms with 2 total members rather than 2 joined members, otherwise this is going to mark any room as a DM if someone creates a room, invites a bunch of people and you happen to be first to join.	2016-09-20 17:59:46 +01:00
David Baker	b66c449bd7	Comment typo and out comment in more sensible place	2016-09-20 16:08:11 +01:00
David Baker	746aad9a18	Oops, missed one	2016-09-19 14:47:08 +01:00
David Baker	31753fc3f3	Rebrand	2016-09-19 13:26:59 +01:00
Matthew Hodgson	cf1b1442eb	no labs for guests	2016-09-17 14:29:40 +01:00
Matthew Hodgson	736b6dac7a	default labs correctly :/	2016-09-17 00:54:56 +01:00
Matthew Hodgson	00d2fd471d	Merge pull request #483 from matrix-org/dbkr/scrollpanel_start_at_bottom Add 'startAtBottom' flag	2016-09-16 22:38:21 +01:00
Matthew Hodgson	c322a191af	turn on E2E and Scalar by default	2016-09-16 18:36:03 +01:00
David Baker	d0fd6e985f	Document paranoia on the startAtBottom param	2016-09-16 17:48:08 +01:00
Matthew Hodgson	67565f88fa	Merge pull request #474 from matrix-org/markjh/olm_version Add the olm version to the settings page.	2016-09-16 17:30:35 +01:00
David Baker	806ef11fde	Add 'startAtBottom' flag Controls whether a scrollPanel starts off at the bottom. This may not be necessary and could either be derived from stickyBottom, but this means I can be sure that the behaviour of ScrollPanel is completely unchanged for all other uses to avoid breaking any other uses of ScrollPanel.	2016-09-16 17:18:58 +01:00
David Baker	1341ffca59	Merge pull request #479 from matrix-org/dbkr/directory_network_selector Pass through config for Room Directory	2016-09-16 17:08:44 +01:00
Matthew Hodgson	a28aab42c4	fix NPE in guest access	2016-09-16 16:45:43 +01:00
Matthew Hodgson	ff00474aa5	show RightPanel when people click on users	2016-09-16 02:37:06 +01:00
Matthew Hodgson	c21309fdf6	remove stale state	2016-09-15 22:56:12 +01:00
David Baker	44fa851275	Pass through config for Room Directory	2016-09-15 17:18:53 +01:00
Mark Haines	c54b9c911f	Add the olm version to the settings page.	2016-09-15 11:31:54 +01:00
Matthew Hodgson	8bda0bb095	basic verification UI	2016-09-15 01:55:51 +01:00
Matthew Hodgson	8508e006f0	Merge pull request #469 from matrix-org/wmwragg/chat-multi-invite Wmwragg/chat multi invite	2016-09-13 19:30:02 +01:00
Matthew Hodgson	17cf2fc745	Merge pull request #470 from matrix-org/matthew/right-panel-collapse Matthew/right panel collapse	2016-09-13 19:09:18 +01:00
Matthew Hodgson	eb6a4f97ba	make it work	2016-09-13 19:00:35 +01:00
David Baker	283e1ccf4c	Merge pull request #468 from matrix-org/dbkr/create_room_modal Add modal dialog on new room button	2016-09-13 17:05:24 +01:00
David Baker	5450e93df1	Verbiage	2016-09-13 16:56:53 +01:00
David Baker	3741768a3a	Add modal dialog on new room button https://github.com/vector-im/vector-web/issues/2178	2016-09-13 16:40:15 +01:00
wmwragg	2db8f4ae67	Added pass through of roomId	2016-09-13 14:30:37 +01:00
wmwragg	ca1bb0f700	Added new Invite button in the RHS footer which calls the new 'view_invite' action	2016-09-13 14:28:03 +01:00
wmwragg	524eeaa315	Merge up from develop	2016-09-13 12:37:52 +01:00
Matthew Hodgson	3b52081092	wip for collapsable RHS	2016-09-13 12:18:22 +01:00
wmwragg	99dfcb4ed2	It's no longer a onde to one chat dialog, as you can invite multiple people	2016-09-13 10:33:15 +01:00
David Baker	2943db1072	Flag incoming DMs as such * Add the 'is_direct' flag to rooms created for DMs * For invites, look for the DM flag when getting the DM user ID for a room * When accepting an invite, look for the flag and mark the room as a DM room if appropriate.	2016-09-12 18:32:44 +01:00
Matthew Hodgson	46205ad83c	back out small avatars for emotes for now as they conflict with the E2E artwork. they will be reintroduced once we have lozenges	2016-09-11 22:49:05 +01:00
Matthew Hodgson	83209197f4	Merge branch 'develop' into matthew/notif-panel	2016-09-11 02:38:16 +01:00
Matthew Hodgson	34bb37aaba	layout for file & notif panel	2016-09-11 02:14:27 +01:00
Matthew Hodgson	be33c35876	use new onRoomTimelineReset API to let notif timeline reset itself	2016-09-10 10:46:30 +01:00
Matthew Hodgson	6f270fd621	remove debug	2016-09-10 01:39:19 +01:00
Matthew Hodgson	86da0e0d63	Merge pull request #459 from VShell/fix-cas Fix CAS support by using a temporary Matrix client	2016-09-09 21:19:19 +01:00
Shell Turner	1380bf705a	Fix CAS support by using a temporary Matrix client Signed-off-by: Shell Turner <cam.turn@gmail.com>	2016-09-09 21:01:10 +01:00
Matthew Hodgson	904348e62a	Merge branch 'develop' into matthew/notif-panel	2016-09-09 11:12:52 +01:00
Matthew Hodgson	f4d939da81	null checks on room in onRoomTimeline	2016-09-09 02:09:12 +01:00
Matthew Hodgson	4aef352a5c	update to use new API based on js-sdk PR input	2016-09-08 22:48:44 +01:00
Matthew Hodgson	3c7864a7ad	remove unused _gatherTimelinePanelRef	2016-09-08 14:52:08 +01:00
Matthew Hodgson	f88ba9df11	fix comment & use room.getUnfilteredTimelineSet()	2016-09-08 14:38:34 +01:00
Matthew Hodgson	c882d66b0d	make NotificationPanel work	2016-09-08 03:02:31 +01:00
Matthew Hodgson	7174648f94	don't show RRs if manageRRs is false	2016-09-08 03:01:38 +01:00
Matthew Hodgson	334564c814	unbreak tests	2016-09-07 22:54:38 +01:00
Matthew Hodgson	8f75bce29e	add fixmes	2016-09-07 22:54:37 +01:00
Matthew Hodgson	990d84df77	make FilePanel refresh when we switch rooms	2016-09-07 22:54:37 +01:00
Matthew Hodgson	e7074ef9af	apply FilePanel css and fix filtering	2016-09-07 22:54:37 +01:00
Matthew Hodgson	e5dd2e0b46	make FilePanel work, superficially at least	2016-09-07 22:54:37 +01:00
Matthew Hodgson	e22d0a53b6	WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets	2016-09-07 22:54:37 +01:00
Matthew Hodgson	c3de035964	filepanel	2016-09-07 22:54:37 +01:00
Matthew Hodgson	ae34f2ed5c	placeholder NotificationPanel	2016-09-07 22:53:15 +01:00
Matthew Hodgson	d9ffe30a0d	WIP notif panel	2016-09-07 22:53:15 +01:00
wmwragg	7dfb8857d8	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-07 17:22:10 +01:00
David Baker	df1cc8748f	Change references to MatrixTools to Rooms or remove where they were unused	2016-09-07 11:33:58 +01:00
wmwragg	d9c6448a0f	Adding better deafults and ErrorDialog message	2016-09-05 14:29:21 +01:00
wmwragg	9c0f51fb82	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-05 12:06:31 +01:00
wmwragg	ca443e01d8	Initial commit of the new ChatInviteDialog	2016-09-05 12:03:16 +01:00
wmwragg	67c623d410	Rename the action to make it clearer what it is doing	2016-09-05 10:29:03 +01:00
Matthew Hodgson	b5f9c2a5ac	Merge branch 'master' into develop	2016-09-02 17:17:24 +01:00
Matthew Hodgson	d5062f1ff7	gah, revert debug	2016-09-02 17:15:21 +01:00
Matthew Hodgson	fd664e893f	Merge branch 'master' into develop	2016-09-02 17:14:24 +01:00
Matthew Hodgson	6de2e8bda5	update changelog	2016-09-02 17:13:52 +01:00
Richard van der Hoff	b4521bc44c	review feedback	2016-09-01 22:45:09 +01:00
wmwragg	e7d4ef74d0	Placeholder for one to one chat dialog and functionality	2016-09-01 16:45:24 +01:00
Richard van der Hoff	ba341c11fb	Show session restore errors on the login screen If we are unable to load the matrix session on startup, don't just get stuck at a spinner; instead, show the error on the login screen.	2016-09-01 11:08:40 +01:00
wmwragg	769e7d3b2e	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-30 11:19:54 +01:00
Matthew Hodgson	5e105e1be6	make /user URLs work	2016-08-28 14:04:11 +01:00
Matthew Hodgson	de82ac3bc0	don't change URL bar when clicking on linkified rooms or users. be aware of /user paths.	2016-08-28 02:05:31 +01:00
Matthew Hodgson	ad873c2b60	handle matrix.to links correctly. add partial support for #/user URLs	2016-08-28 01:55:42 +01:00
Richard van der Hoff	c1db6fb42d	Merge pull request #429 from matrix-org/rav/timelinepanel_test Update annoying TimelinePanel test	2016-08-25 15:40:03 +01:00
Matthew Hodgson	ae910d82a8	Merge pull request #416 from aviraldg/feature-changelog add fancy changelog dialog	2016-08-24 18:01:39 +01:00
Richard van der Hoff	cdd2902b01	Update annoying TimelinePanel test * Actually test what we were supposed to be testing (viz, that we can paginate back down after we hit the top of the room) * Make the cap on the number of events we show in the timeline a configurable property, so that we can set it in the test * Use a smaller cap in the test, so that we have to do less paginating to hit the cap, to make the test run quicker. * add some more logging so that we can see how far it's got if it gets stuck.	2016-08-24 16:28:00 +01:00
wmwragg	6a4d02ffc5	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 12:49:21 +01:00
wmwragg	6d1f9003e2	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 10:52:50 +01:00
wmwragg	ddda435e9e	Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not	2016-08-18 22:15:53 +01:00
Aviral Dasgupta	ff39d52431	add fancy changelog dialog	2016-08-16 03:33:47 +05:30
David Baker	5a83adc2b6	Merge pull request #414 from matrix-org/rav/fix_device_display_name defaultDeviceDisplayName should be a prop	2016-08-12 11:44:57 +01:00
Richard van der Hoff	b9870f2c23	defaultDeviceDisplayName should be a prop ... not a bit of config.	2016-08-12 11:41:45 +01:00
David Baker	33e9abe421	Merge pull request #410 from matrix-org/rav/use_server_device_id Use server-generated deviceId	2016-08-12 11:40:55 +01:00
Richard van der Hoff	a29325cc46	Set initial_device_display_name on login and register Let Vector pass in a default device name, and thread it through everywhere to set it on login and register calls	2016-08-12 10:55:02 +01:00
Richard van der Hoff	df22768f1b	Use server-generated deviceId	2016-08-12 07:31:15 +01:00
wmwragg	434115ccda	Bugifx: 'background-color' in react should be 'backgroundColor'	2016-08-11 17:34:05 +01:00
Richard van der Hoff	e32c325863	Don't use MatrixClientPeg for temporary clients Get rid of MatrixClientPeg.replaceUsingUrls, and instead create local, temporary MatrixClients for the unauthed steps; we therefore only use MatrixClientPeg for logged-in clients.	2016-08-11 16:23:03 +01:00
Matthew Hodgson	3704e2c648	Merge pull request #402 from matrix-org/wmwragg/room-tag-menu Wmwragg/room tag menu	2016-08-11 08:59:32 -05:00
Richard van der Hoff	e06763d421	Move guest registration into the login logic	2016-08-11 13:05:16 +01:00
Richard van der Hoff	bbfb9291f8	Refactor login token move the logic for handling login tokens into Lifecycle.loadSession This means it needs access to the (real) query parmeters, so it depends on corresponding changes in vector-web.	2016-08-11 11:02:52 +01:00
David Baker	6802db05bd	Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login Use the current HS for guest login	2016-08-11 10:32:37 +01:00
David Baker	46899a0086	Merge pull request #395 from aviraldg/fix-emoji Various fixes and improvements to emojification.	2016-08-11 10:23:00 +01:00
Aviral Dasgupta	4c1dcb924b	reskindex and use sdk.getComponent for EmojiText	2016-08-11 07:55:12 +05:30
Richard van der Hoff	1fbddcf6af	Use the current HS for guest login Make sure that we use the homeserver from localstorage for guest regsistration, in preference to the default. Also rename the parameters for loadSession	2016-08-11 01:39:33 +01:00
wmwragg	e2d3631e7c	Menu colour now changeable, and leave room item hooked up	2016-08-10 16:34:49 +01:00
David Baker	f08519a496	Merge pull request #401 from matrix-org/rav/avoid_login_for_guest Avoid flashing up login screen during guest registration	2016-08-10 15:38:34 +01:00
Richard van der Hoff	68f8db3834	Avoid flashing up login screen during guest registration Fix a bug where we would flash up the login screen during guest registration if you followed a room link.	2016-08-10 14:34:44 +01:00
Richard van der Hoff	8fe470bce1	Cancel calls to rate-limited funcs on unmount The tests were throwing up warnings about state being accessed, and null MatrixClients being called, after component unmount.	2016-08-10 13:39:47 +01:00
David Baker	e0f71977b4	Merge pull request #397 from matrix-org/rav/factor_out_sessionloader Start to factor out session-loading magic	2016-08-10 11:40:58 +01:00
Richard van der Hoff	26c7c9e994	Make SessionLoader a function There's no point in it being a React component.	2016-08-10 11:36:26 +01:00
David Baker	13a4bfa8fe	Merge pull request #396 from matrix-org/rav/fix_react_warning Hack around a react warning	2016-08-10 10:09:18 +01:00
Richard van der Hoff	24841cc5c4	Start to factor out session-loading magic Take some of the magic out of MatrixChat.componentDidMount() into a new component. Also delete the MatrixChat test. It wasn't really doing much, is broken by the change, and I am replacing it with (better) app-level tests in the vector project.	2016-08-10 00:05:44 +01:00
Richard van der Hoff	a1d3db76e5	Hack around a react warning when login completes, we replace the whole state, which means we unset collapse_lhs, which then leads to complaints from the RoomList. I think the 'default view' for MatrixChat ought to be factored out to another component, which could manage collapse_lhs properly; but for now, hack around it.	2016-08-09 23:57:36 +01:00
Aviral Dasgupta	09e8a45cde	Add EmojiText component for emoji replacement.	2016-08-10 00:31:51 +05:30
Aviral Dasgupta	dbbea63227	Various fixes and improvements to emojification. - Use locally hosted emoji - Emojify SenderProfile and m.emote - Add emoji shortcodes as titles	2016-08-09 22:09:28 +05:30
David Baker	4b8ad3c102	Merge pull request #393 from matrix-org/dbkr/enable_labs Add config to hide the labs section	2016-08-05 17:25:25 +01:00
David Baker	5e358b8cf6	Add comment	2016-08-05 17:18:45 +01:00
David Baker	f8d02c1551	pr feedback	2016-08-05 16:36:35 +01:00
David Baker	e8ee5c2f96	Add config to hide the labs section	2016-08-05 16:13:06 +01:00
David Baker	98e89d4293	Merge pull request #392 from matrix-org/dbkr/scalar Dbkr/scalar	2016-08-05 15:43:57 +01:00
Richard van der Hoff	e8dbf978c3	Merge pull request #388 from matrix-org/dbkr/refactor_field_errors Refactor UI error effects	2016-08-05 12:34:56 +01:00
Matthew Hodgson	d0158f5812	fix merge conflict	2016-08-04 23:45:28 +01:00
Matthew Hodgson	cf70f1731e	hide integration management behind labs checkbox	2016-08-04 23:26:27 +01:00
David Baker	1f2b023885	Make sure error message never lies Make sure we don't say 'login incorrect' unless the user is actually trying to log in	2016-08-04 17:37:07 +01:00
Matthew Hodgson	90e5ab2ca3	merge in develop	2016-08-04 13:39:47 +01:00
David Baker	498ad7fa4c	Merge branch 'develop' into dbkr/deactivate_account	2016-08-03 17:52:18 +01:00
David Baker	cbfb0ad998	Merge pull request #377 from matrix-org/dbkr/use_logout_api Call the logout API when we log out	2016-08-03 17:51:42 +01:00
David Baker	bb3a7725db	Shift loginIncorrect into state and consequently make setErrorTextFromError into setStateFromError	2016-08-03 17:49:29 +01:00
David Baker	476f69cbec	Unused ref	2016-08-03 17:38:13 +01:00
David Baker	f469bbbb64	Refactor UI error effects And add error effects to the login page to be consistent with the registration page	2016-08-03 15:59:17 +01:00
Matthew Hodgson	f95a11a9bf	Merge pull request #369 from matrix-org/wmwragg/mention-state-menu Wmwragg/mention state menu	2016-08-03 15:22:39 +01:00
David Baker	f8201ac2ea	Merge branch 'dbkr/use_logout_api' into dbkr/deactivate_account	2016-08-03 11:39:22 +01:00
David Baker	f47ac87775	Don't show deactivate button for guests	2016-08-03 11:34:31 +01:00
David Baker	d9a7d50a03	Add an interface for MatrixClientCreds and make MatrixClientPeg functions use it consistently	2016-08-03 10:46:42 +01:00
David Baker	cf7e7d65c8	Don't start the client twice if we have a guest_access_token	2016-08-03 10:15:50 +01:00
David Baker	e3a5776eae	We should clear /login off the URL after login	2016-08-03 09:57:12 +01:00
David Baker	4825ab8fe7	No need to set options in WillStartClient We can set them any time up to that point	2016-08-03 09:53:02 +01:00
David Baker	0c2bd10594	Comment functions	2016-08-02 19:05:05 +01:00
David Baker	0c61c52480	Just use Lifecycle.setLoggedIn	2016-08-02 19:02:07 +01:00
David Baker	d74a8e405d	Remove unused function	2016-08-02 19:00:01 +01:00
David Baker	65865f879f	We already know we're a guest here	2016-08-02 18:59:09 +01:00
David Baker	58bbb35096	s/login/setLoggedIn/	2016-08-02 18:48:27 +01:00
David Baker	3818a89ca3	Comment guestCreds	2016-08-02 18:46:43 +01:00
David Baker	54c10a5d89	Get name of section right	2016-08-02 18:42:02 +01:00
David Baker	aafec49abf	WIP for deactivaing account UI https://github.com/vector-im/vector-web/issues/1775	2016-08-02 18:40:12 +01:00
David Baker	db9750a7e3	Call the logout API when we log out Also try to refactor some of the login/logout code out of MatrixChat and into a separate Lifecycle.js. This still isn't great, but it at least gets some code out of MatrixClient.	2016-08-02 14:04:20 +01:00
Richard van der Hoff	c071bc54f9	Implement device management UI View/rename/delete.	2016-08-01 13:42:29 +01:00
wmwragg	cf22a5fecc	Merge up from develop	2016-07-30 12:10:43 +01:00
wmwragg	94350bc780	Fixed spelling mistake	2016-07-28 15:51:46 +01:00
wmwragg	bc902a9741	Tidy up of the contextual menu refactor	2016-07-28 14:32:59 +01:00
wmwragg	8246d9148c	Initial context menu with all it's elements	2016-07-27 17:43:48 +01:00
wmwragg	6e7e091117	Refactor so that chevron and menu can be positioned independantly	2016-07-27 16:09:07 +01:00
David Baker	cf3cd69f37	Merge pull request #366 from matrix-org/rav/remove_relayoutonupdate Remove relayoutOnUpdate prop on gemini-scrollbar	2016-07-27 15:21:46 +01:00
wmwragg	0660b9feff	Fixes to properly point to the moved components	2016-07-27 14:49:10 +01:00
wmwragg	3df746ef14	Revert merge up from develop	2016-07-27 14:16:17 +01:00
Richard van der Hoff	c8df9148b3	Remove relayoutOnUpdate prop on gemini-scrollbar The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it and remove the properties.	2016-07-27 11:35:48 +01:00
wmwragg	4b26ac58af	Re-modularised the context menus	2016-07-27 10:41:24 +01:00
David Baker	09993cd3bc	Add comment back	2016-07-26 18:19:25 +01:00
David Baker	31399254b6	Fix onRoomStateMember debouncing Don't have debounced functions take arsg, because they won't be the same for each invocation.	2016-07-26 18:15:26 +01:00
David Baker	4ecf5f6372	Fix bug where vector freezes on power level event Make rate_limited_function accept functions with args so we can just ratelimit the event handler & be done with it. Fixes https://github.com/vector-im/vector-web/issues/1877	2016-07-26 17:58:19 +01:00
David Baker	030652f289	Add removeLisatener for account data listener	2016-07-21 13:49:31 +01:00
Matthew Hodgson	165b0810cc	remove debug	2016-07-20 18:17:09 +01:00
Matthew Hodgson	bc87fc575b	remove debug	2016-07-20 18:16:54 +01:00
Matthew Hodgson	d6415aceca	handle accountData changes, and errors on toggling URL previews	2016-07-20 18:14:16 +01:00
David Baker	fb964be072	Merge pull request #356 from matrix-org/matthew/disable-url-previews Support for disabling/enabling URL previews per-user, per-room and per-user-per-room	2016-07-20 16:43:08 +01:00
David Baker	02e2ade7d9	Merge pull request #336 from matrix-org/dbkr/add_email_fail_if_in_use Use HS proxy API for requestToken on adding email	2016-07-20 14:05:58 +01:00
Matthew Hodgson	1365f18829	many stupid thinkos and bugfixes; make it work	2016-07-20 12:03:13 +01:00
David Baker	514bc2cd51	Merge pull request #341 from matrix-org/dbkr/tab_complete_most_recently_spoke Order tab complete by most recently spoke	2016-07-19 18:02:09 +01:00
Matthew Hodgson	6bf5499289	typos	2016-07-18 10:47:03 +01:00
Matthew Hodgson	f13bb5f656	typos	2016-07-18 01:39:24 +01:00
Matthew Hodgson	ebdac4ee50	first cut (untested)	2016-07-18 01:35:42 +01:00
wmwragg	a385955c6b	Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it.	2016-07-17 21:23:52 +01:00
David Baker	5c566cae5c	typo	2016-07-15 18:10:56 +01:00
David Baker	ccf8e269cd	Comments & required props	2016-07-15 17:15:51 +01:00
David Baker	327015ba0f	Tidy up autocomplete updating ..into a function	2016-07-15 17:03:53 +01:00
David Baker	7d712d06a1	Move code to make diff less confusing	2016-07-15 16:14:05 +01:00
David Baker	d5bed78a54	Rejig tab complete to make it faster Now do a lot less when people speak. Also move more of the tab completion logic into TabComplete.js and out of RoomView.	2016-07-15 16:10:27 +01:00
David Baker	f1d72296b7	Fix last-spoke order Turns out this timeline is the other way around, so loop through the other way	2016-07-14 14:06:31 +01:00
David Baker	0dde891d4c	Order tab complete by most recently spoke Fixes https://github.com/vector-im/vector-web/issues/1741	2016-07-14 11:25:45 +01:00
David Baker	ac58520b3b	Update tab completion list when we have a room Fixes https://github.com/vector-im/vector-web/issues/1737	2016-07-12 18:30:37 +01:00
David Baker	b78340ff51	Use HS proxy API for requestToken on adding email So we report an error if the email is already taken. Also fix a bug where the spinner wouldn't disappear if adding an email failed (and don't include the raw errcode in the user-facing dialog)	2016-07-08 17:28:04 +01:00
David Baker	345ed04ba9	Less enetering	2016-07-07 13:03:27 +01:00
David Baker	a6b04c462e	Comment how we're remembering form vals	2016-07-07 11:26:35 +01:00
David Baker	e2c473b366	Error on registration if email taken Use the new register-specific request token endpoint (https://github.com/matrix-org/matrix-js-sdk/pull/147) and catch the error that it gives if the email is already in use. Also add initial values to the registration form so we can reload it after the error without all the values disappearing, and split out the guest username parameter which was previously called defaultUsername.	2016-07-06 15:22:06 +01:00
Aviral Dasgupta	30b7efd585	fix: code cleanup, fix getCurrentCommand	2016-07-04 21:44:35 +05:30
Aviral Dasgupta	cd928fe6f5	Merge remote-tracking branch 'upstream/develop' into feature-autocomplete	2016-07-03 00:00:02 +05:30
David Baker	e8337b2119	More PR feedback	2016-06-28 17:11:47 +01:00
David Baker	548c392236	PR feedback	2016-06-28 14:59:45 +01:00
David Baker	98c03869a7	Display an error message if room not found Fixes https://github.com/vector-im/vector-web/issues/1012	2016-06-24 15:34:07 +01:00
Richard van der Hoff	e046f5359f	CreateRoom: remove reference to encryption module The CreateRoom structure isn't currently used, but contained a reference to the (now defunct) encryption module; remove the reference for now.	2016-06-23 14:08:45 +01:00
Matthew Hodgson	5195140ff8	reposition Login spinner	2016-06-21 19:50:03 +01:00
Richard van der Hoff	2ddfccdab3	Merge pull request #318 from matrix-org/dbkr/fix_default_hs Fix https://github.com/vector-im/vector-web/issues/1679	2016-06-21 17:55:27 +01:00
David Baker	d3265ab970	Redundant getDeafultHs() This now can never be falsey so no point checking it	2016-06-21 17:46:55 +01:00
David Baker	213e284edf	Fix https://github.com/vector-im/vector-web/issues/1679	2016-06-21 11:05:37 +01:00
Aviral Dasgupta	442291c0a4	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete	2016-06-21 04:09:22 +05:30
David Baker	fc06ebcc63	Fix view_next_room	2016-06-20 18:43:56 +01:00
David Baker	4c214119b2	Fix PR feedback	2016-06-20 18:05:58 +01:00
David Baker	d8dedae084	Fix /join to be consistent with the other code Plus a number of other tidyups: * Fix /join to dispatch a view_room for the room alias with the additional auto_join parameter * Make RoomView automatically join the room if the auto_join parameter is true and the user isn't already in it * Tidy up RoomView's peeking code, also fixing https://github.com/vector-im/vector-web/issues/1220 in react-sdk (although it still requires a synapse change to actually fix, but react-sdk does 'the right thing'). * Remove duplication of usage text from /join command * Amalgamate MatrixChat::_viewRoom's many, many parameters into an object and sort out case consistency a little.	2016-06-20 16:30:51 +01:00
Aviral Dasgupta	4af983ed90	Style changes and improvements in autocomplete	2016-06-20 13:52:55 +05:30
Matthew Hodgson	94aec10512	Merge branch 'develop' into dbkr/scalar	2016-06-19 22:40:48 +01:00
David Baker	8103a795ec	Merge pull request #316 from matrix-org/rav/fix_react_version_number UserSettings: fix the displayed version of the react-sdk	2016-06-17 17:13:35 +01:00
Richard van der Hoff	f6835baa9c	UserSettings: fix the displayed version of the react-sdk	2016-06-17 17:09:52 +01:00
David Baker	6adce649eb	Use the first alias is there's no canonical alias	2016-06-17 16:56:34 +01:00
David Baker	3b5378fa53	Show canonical alias in URL bar Use https://github.com/matrix-org/matrix-js-sdk/pull/140 to get the canonical alias, because that's a thing now.	2016-06-17 15:17:45 +01:00
Richard van der Hoff	0cc4497ef0	Merge pull request #307 from matrix-org/dbkr/fix_peeking Fix peeking and member list vanishing	2016-06-16 11:13:20 +01:00
David Baker	40b1b99c38	underscore prefix internal method	2016-06-14 14:40:03 +01:00
David Baker	a95d8b5ed6	Move init logic into componentWillMount to simplify getInitialState	2016-06-14 14:38:45 +01:00
David Baker	0ef5cc891e	Add currentRoomId / Alias to getInitialState with docs	2016-06-14 14:10:49 +01:00
David Baker	b8eee08d69	Fix member list vanishing Add a callback to RoomView that it can give the room ID to once it's resolved it, since this lookup is now the responsibility of the roomview and only the roomview. The view_room action now has either an alias or an ID, not both. Also fix RoomView to load the room properly and not try to peek when it shouldn't.	2016-06-14 12:56:37 +01:00
Richard van der Hoff	e973d18085	Hide e2e features if not enabled Don't show the device info in the MemberInfo and UserSettings unless the user has ticked the 'labs' box.	2016-06-14 11:57:08 +01:00
David Baker	aaefdf19c5	Fix MatrixChat syntax fail	2016-06-14 11:57:07 +01:00
David Baker	11a38fce48	Fix peeking Sorts out more of the room joining mess. currentRoom which held the room ID is now more appropriately called currentRoomId. RoomView will now take a roomID or alias as before but will now look up the room ID as required if given the alias. Also, now look up the alias every time you click on it so it's never stale, rather than looking in your current rooms for a room that thinks it has that ID.	2016-06-14 11:37:04 +01:00
Aviral Dasgupta	5831a68e11	Labs improvements	2016-06-13 23:25:31 +05:30
Aviral Dasgupta	727e6daaae	Fix key attr placement in UserSettings	2016-06-13 22:11:21 +05:30
Aviral Dasgupta	c3a9658392	Add experimental "Labs" section to settings	2016-06-13 22:04:12 +05:30
David Baker	719928f389	Remove view_room_alias As it was basically the same as view_room. Use view_room instead which will handle whether we pass an ID or an alias into RoomView	2016-06-10 15:12:42 +01:00
David Baker	b60ab9d695	Remove XXX now it's fixed (yay!)	2016-06-09 18:50:18 +01:00
David Baker	72b3ce200d	Make the room directory join rooms by alias Also makes some improvement on the multiple code path mess for joining rooms	2016-06-09 18:49:06 +01:00
David Baker	049e3a968b	Merge pull request #303 from matrix-org/rav/factor_out_createroom Factor out common parts of room creation	2016-06-09 11:05:22 +01:00
Richard van der Hoff	de36aa63fb	Factor out common parts of room creation Take the duplicated code out of MatrixChat and MemberInfo, and put it in a separate 'createRoom' module	2016-06-09 10:58:25 +01:00
David Baker	98ef793809	Default IS should be vector.im now	2016-06-09 10:56:14 +01:00
David Baker	bb405563c8	Fix default servers	2016-06-09 10:54:56 +01:00
Richard van der Hoff	ef764c112e	Merge pull request #300 from matrix-org/rav/device_verification Support for marking devices as verified	2016-06-09 10:44:42 +01:00
David Baker	05404efa34	Remove if (this.props.config) Since it now defaults to the empty dictionary (and if you pass null in, you deserve everything you get).	2016-06-09 09:53:37 +01:00
Richard van der Hoff	1dfb3f71ae	Merge branch 'develop' into rav/device_verification	2016-06-08 21:34:47 +01:00
David Baker	c123f02842	Make the config optional	2016-06-08 18:45:46 +01:00
Richard van der Hoff	086698cd11	Add device info to user settings Requires e81ce23 from matrix-js-sdk	2016-06-08 17:02:42 +01:00
David Baker	7e8c8dd336	Remove SdkConfig just take a config in MatrixChat, pass the individual things down through the chain. This may become unwieldy: let's see how it goes.	2016-06-08 14:54:34 +01:00
David Baker	b54376aa2a	Add singleton object to hold SDK configuration	2016-06-07 21:49:06 +01:00
David Baker	943d7e18e1	Add _ to internal member	2016-06-07 19:55:24 +01:00
David Baker	d5a522fdfe	Second attempt at fixing the Velocity memory leak 1) Correct fix for Velociraptor (we need to find the DOM node and pass that in) 2) Do the same leak fix for the read marker 3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work. 4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package	2016-06-07 18:22:01 +01:00
David Baker	fdcebe1e56	Merge remote-tracking branch 'origin/develop' into dbkr/scalar	2016-06-06 17:19:38 +01:00
Matthew Hodgson	e20a1acb88	label our versions sensibly	2016-06-02 19:22:11 +01:00
Matthew Hodgson	1d31463140	set email branding after registration	2016-06-02 13:14:52 +01:00
Matthew Hodgson	83fd02bdfa	specify a brand when registering accounts	2016-06-02 11:51:26 +01:00

... 9 10 11 12 13 ...

1619 commits