1990 commits

Author	SHA1	Message	Date
wmwragg	52f050b5f9	Better scrolling UX, and fixed bug which created a room when no address supplied	2016-09-06 17:20:37 +01:00
wmwragg	c03f145f04	Basic keyboard scrolling of queryList	2016-09-06 17:00:28 +01:00
wmwragg	91b1c1f0fc	Initial highlighting selected address - styling not final	2016-09-06 16:39:50 +01:00
David Baker	8401323156	Hopefully read DM rooms from account data	2016-09-06 16:39:21 +01:00
wmwragg	d1398b137a	Circumventing autofill by using a textarea rather than an input type=text	2016-09-06 16:15:48 +01:00
wmwragg	0f73c4326e	Added scrolling to queryList	2016-09-06 15:46:58 +01:00
wmwragg	391fe0ab77	Basic address list created, and UX tweaks for interaction	2016-09-06 15:24:23 +01:00
wmwragg	ddf1e4841a	Selecting users with arrow keys added	2016-09-06 13:07:06 +01:00
wmwragg	1fe85f37fd	Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching	2016-09-06 11:34:38 +01:00
David Baker	50ef695740	Fix: conference rooms were no longer hidden	2016-09-05 17:42:22 +01:00
wmwragg	5ed680e5ce	Picking the top of the queryList not _userList, as the queryList is the query filtered _userList	2016-09-05 17:34:20 +01:00
wmwragg	3dd84e2b8a	Initial AddressTile added	2016-09-05 17:28:08 +01:00
wmwragg	d9c6448a0f	Adding better deafults and ErrorDialog message	2016-09-05 14:29:21 +01:00
wmwragg	3d66dff0aa	Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any	2016-09-05 14:16: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
Richard van der Hoff	31e09e6137	Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user ... Make MemberInfo to use client.getStoredDevicesForUser	2016-09-05 10:38:24 +01:00
wmwragg	67c623d410	Rename the action to make it clearer what it is doing	2016-09-05 10:29:03 +01:00
Kegsay	6e2fd85760	Merge pull request #437 from matrix-org/kegan/starter-links ... Implement starter link support	2016-09-05 09:10:39 +01:00
Kegan Dougal	56ac0004e5	Use href='#' hack to make link text look like a link	2016-09-05 09:10:15 +01:00
Richard van der Hoff	fc40bdcbfc	Make MemberInfo to use client.getStoredDevicesForUser ... It's more powerful than listDeviceKeys, and isn't deprecated.	2016-09-05 00:08:16 +01:00
Richard van der Hoff	a316c652b7	Convert MemberDeviceInfo to ES6 class	2016-09-04 21:49:06 +01:00
wmwragg	f9ab2fa957	When zoomed in, the sticky headers should correctly position themselves	2016-09-04 08:01:04 +01:00
wmwragg	721baf8d42	Tolltip tweak to not require the passing in of the parent	2016-09-04 07:42:09 +01:00
Richard van der Hoff	bc8e7724e8	Make the 'encrypt this room' knob be megolm	2016-09-03 18:42:54 +01:00
wmwragg	03e74f48f8	Positioned Tooltip better	2016-09-03 13:44:44 +01:00
Matthew Hodgson	fdfd6ecfd9	let users join confs as voice or video	2016-09-03 13:27:46 +01:00
wmwragg	405dcf76eb	Further tweaks to the tooltip to better handle its position, and simplify it's use	2016-09-03 12:44:55 +01:00
wmwragg	bffefd9261	Tweak of the RoomTooltip to use DOM element for the parent rather than a React component	2016-09-02 18:41:44 +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
Kegan Dougal	45ada1887d	Implement starter link support ... This involves modal dialogs because browsers are *terrible*.	2016-09-02 16:36:43 +01:00
Kegan Dougal	6ec7e5df28	Move scalar auth stuff to ScalarAuthClient from RoomSettings	2016-09-02 16:03:24 +01:00
wmwragg	4c05edb71b	Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari	2016-09-02 15:47:40 +01:00
Matthew Hodgson	f9d8829ba2	let you join confs either as voice or video	2016-09-02 15:38:28 +01:00
Richard van der Hoff	584c7ed56d	Merge branch 'rav/show_session_load_errors' into develop	2016-09-02 11:03:39 +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
Matthew Hodgson	031daf7b3c	Merge pull request #434 from matrix-org/matthew/uninterrupted-audio ... use a top-level audio tag for playing all VoIP audio.	2016-09-01 16:12:37 +01:00
Matthew Hodgson	f0d5f42921	whine loudly if remoteAudio element is missing	2016-09-01 13:58:26 +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
Matthew Hodgson	4829ac0c4d	comment	2016-09-01 11:07:46 +01:00
Matthew Hodgson	a23d8e313d	show ongoing audio call in LeftPanel	2016-09-01 00:13:32 +01:00
Matthew Hodgson	6c4ad49b78	use a top-level audio tag for playing all VoIP audio.\n\nfixes https://github.com/vector-im/vector-web/issues/1271 and https://github.com/vector-im/vector-web/issues/621	2016-08-31 21:50:46 +01:00
Matthew Hodgson	5543c126e6	fix tests	2016-08-30 15:22:52 +01:00
wmwragg	c30ff57c62	Better comments	2016-08-30 12:29:25 +01:00
wmwragg	8061a2f279	Fixed historical scetion not scrolling up when clicked if not hidden and stuck	2016-08-30 11:55:51 +01:00
wmwragg	769e7d3b2e	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-30 11:19:54 +01:00
wmwragg	83c4fd4b2f	Code clean up, and better comments	2016-08-30 10:45:17 +01:00
wmwragg	2b1ed707c4	Better comments, and correct bottom header sticky calc to allow clicking	2016-08-28 19:18:41 +01:00
wmwragg	123d9b56c8	calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars	2016-08-28 16:25:20 +01:00
Matthew Hodgson	5e105e1be6	make /user URLs work	2016-08-28 14:04:11 +01:00
wmwragg	8f7d3394e6	Always setup stickies, even if we aren't going to use them so that the following map can fire	2016-08-28 12:02:20 +01:00
wmwragg	7631539584	Fixed incorrect init calculation of originalPosition attribute	2016-08-28 11:39:47 +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
Matthew Hodgson	50d09f73f5	add leave/forget button to RoomSettings	2016-08-28 00:00:22 +01:00
Matthew Hodgson	fb5f8294c8	switch to namespaced CSS	2016-08-28 00:00:10 +01:00
Matthew Hodgson	5df98d70f4	add debugging to MemberAvatar to try to kick jenkins...	2016-08-27 01:18:48 +01:00
wmwragg	73dd05b01d	Corrected incorrect offset from top of window for the scrollArea	2016-08-26 18:31:02 +01:00
wmwragg	8ccb1d482a	Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck	2016-08-26 15:52:57 +01:00
wmwragg	5f9c794f0c	Tweaking autoscroll to only adjust if header stuck at top and not at bottom	2016-08-26 15:36:16 +01:00
wmwragg	b9e95865af	Click on stuck header scrolls to that header, collapses expands for none stuck header	2016-08-26 15:09:13 +01:00
wmwragg	71e829fd32	Getting click to not collapse expand when header is stuck	2016-08-26 14:36:39 +01:00
wmwragg	774e24a3b4	Added some logic to turn off sticky headers when the scroll area isn't large enough to support them	2016-08-26 11:01:04 +01:00
wmwragg	c8c2f733e2	Re-calculate sticky header positions when sublist header is clicked	2016-08-26 09:56:07 +01:00
wmwragg	7fcdd0f77a	Initial pass at sticky headers for the LHS panel section labels	2016-08-25 19:46:01 +01:00
Richard van der Hoff	c8b2d5106f	Merge pull request #430 from matrix-org/rav/fix_search_regression ... Fix NPE when we don't know the sender of an event	2016-08-25 19:31:16 +01:00
Richard van der Hoff	96567dad0d	Fix NPE when we don't know the sender of an event ... Fixes a bug introduced in https://github.com/matrix-org/matrix-react-sdk/pull/426. Particularly when we are showing search results, we may not recognise the sender of an event; attempting to create a MemberAvatar for it will lead to null-reference errors. Also a bit of untangling of the logic of needsSenderProfile. Since https://github.com/matrix-org/matrix-react-sdk/pull/422, EventTileType.needsSenderProfile was only being called on MessageEvents, and therefore only returned true. It's a shame to see all this logic going into EventTile rather than the individual EventTileTypes, but since it's there, let's not leave the unused logic lying around in the EventTileType implementations.	2016-08-25 16:55:09 +01:00
Matthew Hodgson	36d8fa9786	fix avatar clicking in memberinfo	2016-08-25 16:20:38 +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
Matthew Hodgson	2f0599aae1	Merge pull request #419 from aviraldg/feature-autocomplete-improvements ... Update autocomplete design and scroll it correctly	2016-08-24 14:47:22 +01:00
Matthew Hodgson	08c0d7e298	Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation ... Added event/info message avatars back in	2016-08-23 17:14:11 +01:00
wmwragg	ae8234ffe3	Added event/info message avatars back in	2016-08-23 15:58:27 +01:00
Kegsay	c10208a203	Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api ... Add postMessage API required for integration provisioning	2016-08-23 15:00:44 +01:00
wmwragg	6a4d02ffc5	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 12:49:21 +01:00
wmwragg	c362d4ff01	Added updating of count when room tile notification state changed	2016-08-23 12:40:28 +01:00
Kegan Dougal	9162a0ff01	Add postMessage API required for integration provisioning ... Supports querying member state and creating invites only.	2016-08-23 12:00:11 +01:00
wmwragg	6d1f9003e2	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-23 10:52:50 +01:00
Aviral Dasgupta	884abbd7e9	Cleanup autocomplete	2016-08-23 00:36:31 +05:30
wmwragg	edb7301b37	Moving the drirect messages above rooms	2016-08-22 14:10:51 +01:00
wmwragg	48a2567b82	Merge branch 'develop' into wmwragg/chat-message-presentation	2016-08-19 17:19:30 +01:00
wmwragg	993333490d	Removal of the mini avatars for action (info) messages	2016-08-19 16:38:05 +01:00
wmwragg	afd1ab1582	Comment to describe what info messages are	2016-08-18 22:19:23 +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
wmwragg	a55c4a2a52	Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message	2016-08-18 21:53:37 +01:00
Richard van der Hoff	e29be619c9	Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work ... Make the notification slider work	2016-08-18 15:23:45 +01:00
David Baker	fc2c62e896	We can use the new consts here	2016-08-18 15:19:24 +01:00
David Baker	af48b8920e	Various PR feedback	2016-08-18 14:00:14 +01:00
David Baker	9e45279894	Use enumalike thing	2016-08-18 13:44:58 +01:00
David Baker	73e486cc58	Hide red highlight badge in mute mode	2016-08-18 11:58:27 +01:00
David Baker	dd088794c2	Remove the mute toggle from room settings ... As it now incorrectly represents the mute as a binary toggle rather than a quad-state	2016-08-17 18:50:34 +01:00
David Baker	87f94bde62	Fix up notification setting listener in roomtile ... The previous dispatch only did binary muted/non-muted but we now have 4 states. We now just listen for the push rules account data and update on that so it stays in sync if the pishrules are changed elsewhere. Also add util functions used here for getting the notif state and in vector for both getting and setting it.	2016-08-17 18:26:37 +01:00
Richard van der Hoff	69e8cb6f44	Merge branch 'rav/no_deviceload_if_disabled' into develop	2016-08-17 14:41:18 +01:00
Richard van der Hoff	0356f04b9c	MemberInfo: initialise _enableDevices in componentWillMount ... ... to avoid referencing it in render() before it is set	2016-08-17 14:40:10 +01:00
Aviral Dasgupta	e173900808	Update autocomplete design and scroll it correctly	2016-08-17 17:27:19 +05:30
Richard van der Hoff	30168a1b9c	Don't download E2E devices if feature disabled ... If the user hasn't enabled the E2E setting in the labs, there is no point in firing off the device download request when the MemberInfo is opened.	2016-08-17 09:57:06 +01:00
wmwragg	52f5061cc5	Made the menu button a clickable image rather than an input element	2016-08-16 17:34:33 +01:00
wmwragg	58d9789645	Increase main avatar size	2016-08-16 16:03:34 +01:00
wmwragg	c359358101	Initial context menu positioning and style change	2016-08-16 11:59:26 +01:00
wmwragg	6fd61f5816	Initial reposition of the timestamp	2016-08-16 10:26:27 +01:00
Aviral Dasgupta	ff39d52431	add fancy changelog dialog	2016-08-16 03:33:47 +05:30
Matthew Hodgson	2a3b0e85ea	add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/	2016-08-15 21:37:26 +01:00
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
David Baker	cb905dbaef	Merge pull request #409 from matrix-org/rav/device_panel_stuff ... Add device_id to devices display	2016-08-12 10:43:44 +01:00
David Baker	5f61464195	Merge pull request #408 from matrix-org/rav/refactor_matrix_client ... Don't use MatrixClientPeg for temporary clients	2016-08-12 10:42:58 +01:00
David Baker	fc0c5a5c58	Tidy up fix to multi-invite	2016-08-12 10:02:55 +01:00
Richard van der Hoff	df22768f1b	Use server-generated deviceId	2016-08-12 07:31:15 +01:00
Matthew Hodgson	d1eec57118	fix inviting some more	2016-08-11 17:11:51 -05:00
Matthew Hodgson	3bedad69cd	unbreak inviting :(	2016-08-11 17:08:17 -05:00
wmwragg	434115ccda	Bugifx: 'background-color' in react should be 'backgroundColor'	2016-08-11 17:34:05 +01:00
wmwragg	7713f0d587	refactoring out the direct message section	2016-08-11 17:32:39 +01:00
wmwragg	cc1cec8431	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-11 16:48:31 +01:00
wmwragg	a07833e7fc	Merge branch 'develop' into wmwragg/direct-chat-sublist	2016-08-11 16:47:19 +01:00
David Baker	109184aab7	Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style ... Only show Autocomplete if autocomplete is enabled	2016-08-11 16:47:07 +01:00
wmwragg	4aea2caefc	Initial pass at creating a direct message section	2016-08-11 16:45:19 +01:00
David Baker	7cb663d39d	Only show Autocomplete if autocomplete is enabled ... It was just never used, but it has 1px top border which makes the top border on chat look too big	2016-08-11 16:28:32 +01:00
Richard van der Hoff	55a28564b9	Add device_id to devices display ... (it turns out to be quite useful)	2016-08-11 16:24:09 +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
David Baker	4f76398b29	Merge pull request #407 from matrix-org/rav/refactor_guest_registration ... Move guest registration into the login logic	2016-08-11 13:13:51 +01:00
Richard van der Hoff	e06763d421	Move guest registration into the login logic	2016-08-11 13:05:16 +01:00
David Baker	4780f9000d	Merge pull request #403 from matrix-org/dbkr/multi_invite ... Better support for inviting multiple people	2016-08-11 12:34:16 +01:00
David Baker	f42d619e7d	Missing comma	2016-08-11 12:30:37 +01:00
David Baker	5b71b28dcf	Fix member info	2016-08-11 11:34:14 +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
David Baker	806477dcce	s/then/done/	2016-08-11 10:08:14 +01:00
David Baker	a58a6275e5	Just use _canceled ... Instead of both that and _unmounted	2016-08-11 10:06:22 +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
David Baker	cab95f43ff	Show cancel button whilst inviting is in progress ... And make it actually cancel the process.	2016-08-10 18:58:36 +01:00
David Baker	d6f7358f81	Make completionStates an object ... So that we can sensibly track the number completed by taking the length of it.	2016-08-10 18:50:56 +01:00
David Baker	fa498eb8c6	Comment typo	2016-08-10 18:37:21 +01:00
David Baker	6b3b2e30fe	Don't reset completionStates ... We now set them in the constructor	2016-08-10 18:36:33 +01:00
David Baker	b9f0b72ae1	Missing proptypes	2016-08-10 18:35:59 +01:00
David Baker	020e4e14df	Factor out single-invite	2016-08-10 18:32:42 +01:00
David Baker	4a6a9bd95b	Remove redundant setState ... Duplicated in `finally`	2016-08-10 18:28:20 +01:00
David Baker	54b3638a85	Better support for inviting multiple people ... Pasting a list of addresses into the box will now pop up a dialog to confirm and show you the success / failure state of each address. It will also not die if it gets rate limited. Fixes https://github.com/vector-im/vector-web/issues/1713	2016-08-10 17:11:49 +01:00
wmwragg	6d1eebe6f2	Resized the avatar back to 24px, from 25px, as it has to be even so that the Text avatar aligns vertically correctly	2016-08-10 17:01:06 +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
wmwragg	667264420c	hover state elements for the room tag menu, allong with CSS class updates	2016-08-10 14:46:05 +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	b7b0991ae9	Don't show integrations header if setting not on ... If the labs setting for integrations was disableds, we still showed the header for the integrations section but with nothing underneath it.	2016-08-10 11:51:51 +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
wmwragg	75e1277961	Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now	2016-08-08 16:55:27 +01:00
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
wmwragg	5b812fead9	Initial RoomTagContextMenu wired in	2016-08-05 15:48:28 +01:00
David Baker	98e89d4293	Merge pull request #392 from matrix-org/dbkr/scalar ... Dbkr/scalar	2016-08-05 15:43:57 +01:00
wmwragg	80e4a99477	Merge branch 'develop' into wmwragg/room-tag-menu	2016-08-05 15:27:14 +01:00
wmwragg	4a46aba0c2	Added new onClick function for the avatar, but not wired in yet, waitin go pull up from develop once previous commits have been merged	2016-08-05 15:24:53 +01:00
Matthew Hodgson	10aa201d33	Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix ... Wmwragg/mute mention state fix	2016-08-05 14:44:27 +01:00
Richard van der Hoff	ff02c21252	Merge pull request #391 from matrix-org/dbkr/fix_historical_freeze ... Fix long freeze when opening 'historical' section	2016-08-05 12:47:01 +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	9d958ab508	Fix long freeze when opening 'historical' section ... By rate limiting the list update in InviteMemberList as it seems the sync this triggers causes a load of member events. Fixes https://github.com/vector-im/vector-web/issues/1845	2016-08-04 17:54:00 +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
wmwragg	5305cb6785	Copy change to better describe the function	2016-08-04 16:55:52 +01:00
wmwragg	990da61a61	Fixed regression of click propogation	2016-08-04 16:25:09 +01:00
wmwragg	d204b043e5	Changed state from mute to mentions only	2016-08-04 16:17:21 +01:00
Richard van der Hoff	0351ab0a3d	Merge pull request #381 from matrix-org/dbkr/deactivate_account ... Implement account deactivation	2016-08-04 15:38:29 +01:00
Matthew Hodgson	90e5ab2ca3	merge in develop	2016-08-04 13:39:47 +01:00
David Baker	f7fda68e26	Use p tags instead of brs	2016-08-04 10:53:07 +01:00
David Baker	c017e8dcf4	Initialise _passwordField & delete stale comment	2016-08-04 10:51:31 +01:00
David Baker	2d936a2850	Don't leave isRoomPublished as undefined ... As this causes react to consider the component uncontrolled and then warn when we change it to controlled	2016-08-03 18:23:38 +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	1b39f02141	Merge pull request #335 from aviraldg/feature-composer-emoji ... feat: code cleanup & emoji replacement in composer	2016-08-03 16:18:56 +01:00
David Baker	3780d82f6f	Merge pull request #386 from matrix-org/rav/default_to_device_id ... DevicesPanel: use device_id as a placeholder	2016-08-03 16:12:46 +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
Richard van der Hoff	42f6703112	Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys ... MemberDeviceInfo: Use the device name, where available	2016-08-03 15:26:37 +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
wmwragg	c1cfbd6b59	Corrected comment typo	2016-08-03 14:47:53 +01:00
Richard van der Hoff	f4d41b7847	DevicesPanel: use device_id as a placeholder ... A device may have no display_name set, in which case we probably want to use the device_id as a placeholder.	2016-08-03 14:19:54 +01:00
Richard van der Hoff	55f4d23625	MemberDeviceInfo: Use the device name, where available ... we now have device name for e2e devices: use it!	2016-08-03 14:18:09 +01:00
wmwragg	8e19532e5a	Hover state for badges, now only on the badges themselves	2016-08-03 14:09:10 +01:00
David Baker	efdcc6da98	Merge pull request #384 from aviraldg/fix-composer-up-down ... fix: allow up/down normally for no completions	2016-08-03 13:55:13 +01:00
Aviral Dasgupta	a2d64f5119	fix: allow up/down normally for no completions ... Autocomplete current eats up up/down key events by unconditionally returning true for onUpArrow and onDownArrow. Instead, only do that if there are completions actually visible.	2016-08-03 18:04:52 +05:30
Aviral Dasgupta	1f9a396fa5	fix: autocomplete to use tab instead of return	2016-08-03 17:51:40 +05:30
David Baker	ffa97a4095	Log out when account is deactivated	2016-08-03 11:47:29 +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	2f0fd6da05	Actually commit the deactivate account dialog	2016-08-03 11:34:13 +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	a0b973ffad	Syntax fail	2016-08-02 16:07:07 +01:00
David Baker	10f6ecfe5f	Include rooms with 1 person invited ... If we can't find one with both people joined.	2016-08-02 15:59:28 +01:00
David Baker	3000fae5d8	Oops, uncommit 61e0258	2016-08-02 15:58:21 +01:00
David Baker	61e0258b6f	Include rooms with 1 person invited ... If we can't find one with both people joined.	2016-08-02 15:55:18 +01:00
David Baker	05f0d4d166	Fix 'start new direct chat'	2016-08-02 14:55:29 +01:00
wmwragg	2c2f689361	New design for long names	2016-08-02 14:46:47 +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	e63a32dc10	Fix warnings from MessageComposer ... Fix a couple of warnings from React about required properties not being set.	2016-08-02 11:00:00 +01:00
Matthew Hodgson	1b38398156	Merge pull request #371 from matrix-org/wmwragg/button-updates ... New voice and video call buttons	2016-08-01 20:36:56 +01:00
David Baker	89d2a56584	Merge pull request #373 from matrix-org/rav/more_react_warnings ... Silence some more react warnings	2016-08-01 17:23:08 +01:00
Richard van der Hoff	124a816751	Silence some more react warnings ... Remove some spurious props which were causing react warnings	2016-08-01 17:10:46 +01:00
Richard van der Hoff	94a44bfec3	Fix warnings emanating from Velociraptor elements ... We are no longer allowed to stick random properties on child properties, and the Velociraptor animations were causing some React warnings. Move the startStyles and enterTransitionOpts properties up to the Velociraptor node, and avoid setting arbitrary props on the created children. This is less flexible, as it assumes that all children will have the same start style; however, we weren't using the flexibility, and we can always replace the array with a map or a function or something if we need it in the future.	2016-08-01 16:56:25 +01:00
wmwragg	84583b25e6	New voice and video call buttons	2016-08-01 16:45:27 +01:00
Matthew Hodgson	5b100eeff3	Merge pull request #353 from matrix-org/wmwragg/button-updates ... Wmwragg/button updates	2016-08-01 15:42:46 +01:00
Richard van der Hoff	c071bc54f9	Implement device management UI ... View/rename/delete.	2016-08-01 13:42:29 +01:00
Richard van der Hoff	9333793a7c	Fix code style	2016-08-01 10:49:51 +01:00
wmwragg	d16aa276e2	Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states	2016-07-30 12:52:39 +01:00
wmwragg	398e56c9f9	Fixed bug where the long hover tooltip for a room name show an object rather than the name	2016-07-30 12:28:10 +01:00
wmwragg	cf22a5fecc	Merge up from develop	2016-07-30 12:10:43 +01:00
wmwragg	1487c600ee	Revert so that the	2016-07-29 17:53:18 +01:00
wmwragg	229664a624	first pass on css re-write	2016-07-29 17:49:42 +01:00
Richard van der Hoff	3194c5c61d	Factor EditableTextContainer out of ChangeDisplayName ... Take the non-displayname-specific bits out of ChangeDisplayName into a new EditableTextContainer, so that we can reuse the logic elsewhere.	2016-07-29 17:40:13 +01:00
wmwragg	38f504bdcb	Hide tooltip when badge clicked and collapsed	2016-07-29 11:10:16 +01:00
wmwragg	5889beacf3	Mute state now handled correctly	2016-07-28 17:24:58 +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	867b14d2ca	Reposition context menu now that the styling is final	2016-07-27 18:14:46 +01:00
wmwragg	46a643ac38	Now the text spaceing is correct need to align cheveron	2016-07-27 18:10:45 +01:00
wmwragg	8246d9148c	Initial context menu with all it's elements	2016-07-27 17:43:48 +01:00
Richard van der Hoff	88be2827fd	Merge pull request #367 from matrix-org/rav/remove_bad_props ... Stop the Avatar classes setting properties on <span>s	2016-07-27 16:22:31 +01:00
wmwragg	6e7e091117	Refactor so that chevron and menu can be positioned independantly	2016-07-27 16:09:07 +01:00
Richard van der Hoff	39ae8c6e46	formatting ... PR feedback	2016-07-27 15:41:24 +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
wmwragg	6d141d1a7b	Only allow none guests to access the context menu	2016-07-27 11:58:40 +01:00
Richard van der Hoff	1a600b0674	Stop the Avatar classes setting properties on <span>s ... React apparently now checks the properties which are set on DOM elements, and grumbles noisily about unexpected ones. Update BaseAvatar and RoomAvatar so that they don't set unrelated properties on the DOM elements.	2016-07-27 11:38:04 +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
wmwragg	dca4702b7b	Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage	2016-07-27 09:51:50 +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
wmwragg	477a17b49f	Removed debug statement	2016-07-26 10:39:34 +01:00
wmwragg	9c9c5ec458	Menu context dohickey now sticks when menu shown	2016-07-25 17:18:45 +01:00
wmwragg	a218b4e8a3	Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu ... # resolved Conflicts: # src/components/views/rooms/RoomTile.js	2016-07-25 17:04:37 +01:00
wmwragg	8b8486a8d0	Move from +99 to 99+ for more than 99 messages	2016-07-25 14:39:15 +01:00
wmwragg	a69107f4f1	Trying to get the context menu dohicky to stick when menu open	2016-07-25 10:58:43 +01:00
Aviral Dasgupta	b7555f49ea	Merge branch 'develop' into feature-composer-emoji	2016-07-23 19:15:06 +05:30
Matthew Hodgson	ece575bd00	Merge pull request #363 from matrix-org/dbkr/fix_start_chat ... Fix 'start chat' button on MemberInfo	2016-07-22 18:36:32 +01:00
wmwragg	c89904bc25	Initial unstyled mentions state notifier context menu	2016-07-22 17:30:31 +01:00
David Baker	b07e50d418	Fix 'start chat' button on MemberInfo ... this/self fail & related scoping Fixes https://github.com/vector-im/vector-web/issues/1844	2016-07-22 17:30:25 +01:00
wmwragg	9b318e8f61	Getting the corrct height for the placing the context menu	2016-07-22 16:12:20 +01:00
wmwragg	e4dd6c8dbe	Browser tooltip being used instead of the HTML styled one.	2016-07-22 15:15:24 +01:00
wmwragg	6984a55b11	The tooltip now appears even when not collapsed when hover over the avater, to allow the full name to be shown	2016-07-22 14:58:09 +01:00
wmwragg	ca75d93434	Tweaked the offset for the tooltip so that it is next to the element it is tipping	2016-07-22 11:31:26 +01:00
wmwragg	5d4b03c1f4	Put back clicking on the name to acces the room	2016-07-22 11:28:11 +01:00
wmwragg	3dd83922f1	Tooltip positioning tweaked	2016-07-22 11:12:11 +01:00
wmwragg	922bb0f402	+99 badge when notifications are greater the 99	2016-07-21 18:50:07 +01:00
wmwragg	762873350a	Badge dohickey shown on name hover and badge hover	2016-07-21 18:20:12 +01:00
wmwragg	4013ea75d0	Testing out the context menu	2016-07-21 17:44:31 +01:00
wmwragg	775fc97102	Slight refactor to better match current code	2016-07-21 14:33:54 +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
Matthew Hodgson	9babf3f92f	Merge pull request #357 from matrix-org/wmwragg/mention-state-indicator-round-2 ... Wmwragg/mention state indicator round 2	2016-07-20 18:01:59 +01:00
wmwragg	ffa43ebb96	badge content when hovered is now kerned via the CSS	2016-07-20 17:12:41 +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
wmwragg	33edb1dea9	Made the badge always exist, but if no unread mesasges available then has a different class	2016-07-20 12:47:32 +01:00
Matthew Hodgson	1365f18829	many stupid thinkos and bugfixes; make it work	2016-07-20 12:03:13 +01:00
David Baker	d6df3682f2	Fix enourmous video bug	2016-07-20 11:58:49 +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	1ba0ef7369	Merge pull request #350 from matrix-org/wmwragg/spinner-fix ... Wmwragg/spinner fix	2016-07-19 12:10:31 +01:00
Matthew Hodgson	c1fd2f888f	Merge pull request #352 from matrix-org/wmwragg/mention-state-indicator ... Now showing three dots when hovering over the badge	2016-07-19 11:12:42 +01:00
wmwragg	9e4511b8eb	Now showing three dots when hovering over the badge	2016-07-18 16:10:07 +01:00
David Baker	ffaf7f44f3	typos	2016-07-18 15:36:19 +01:00
David Baker	743f79a9a7	Fix unpublishing room in room settings ... Fixes https://github.com/vector-im/vector-web/issues/1743	2016-07-18 15:22:08 +01:00
Matthew Hodgson	6bf5499289	typos	2016-07-18 10:47:03 +01:00
David Baker	2b7ade9ef5	Merge pull request #347 from matrix-org/matthew/fix-race-on-new-room-invitelist ... Fix race when creating rooms where invite list can be blank	2016-07-18 10:37:05 +01:00
David Baker	37402c0071	Merge pull request #348 from matrix-org/matthew/improve-start-chat-wording ... improve wording of MemberInfo's start chat button.	2016-07-18 10:34:37 +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
Matthew Hodgson	8d749be51f	fix potential bug where canonical alias setting is broken (modulo autoheisting)	2016-07-17 20:36:53 +01:00
Matthew Hodgson	554a6ff035	improve wording of MemberInfo's start chat button. Fixes https://github.com/vector-im/vector-web/issues/689 and clarifies https://github.com/matrix-org/matrix-react-sdk/issues/328	2016-07-17 19:41:53 +01:00
Matthew Hodgson	999c52b650	fix comment	2016-07-17 19:00:22 +01:00
Matthew Hodgson	0553d806d7	stop re-invites	2016-07-17 18:40:54 +01:00
Matthew Hodgson	2bc9dd4307	hopefully fix vector-im/vector-web#1813	2016-07-17 18:32:48 +01:00
Matthew Hodgson	bfe50c209c	fix typo in comment	2016-07-16 22:49:42 +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
Matthew Hodgson	a61168d943	Revert "Amends react template and removes opening image in lightbox"	2016-07-15 16:54:56 +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
Matthew Hodgson	ca5987bf6c	Merge pull request #345 from matrix-org/wmwragg/modal-restyle ... Wmwragg/modal restyle	2016-07-15 14:05:22 +01:00
Matthew Hodgson	78b7d04710	Merge pull request #343 from ribot/feature-inline-link-preview ... Amends react template and removes opening image in lightbox	2016-07-15 13:55:07 +01:00
wmwragg	febd2110c5	Updated all dialogs to define their primary button, I've selected the one that had been specified for focus, but the primary button isn't dependent on focus, it's a UX feature	2016-07-15 11:23:58 +01:00
Richard van der Hoff	8144b894f7	Merge pull request #344 from matrix-org/dbkr/remove_initial_memberlist_load_hack ... Remove the member list loading hack	2016-07-14 18:50:52 +01:00
David Baker	3abdb83d16	Remove now-unused limit param to roomMembers()	2016-07-14 18:40:43 +01:00
David Baker	743cb4b777	Remove the member list loading hack ... Now the memberlist os a truncated list it at-best makes no difference and may be marginally slowing us down.	2016-07-14 18:37:57 +01:00
David Baker	9fd0ea1e32	More variable case	2016-07-14 18:18:44 +01:00
David Baker	2fd690ea2b	Oops, removed the pure offline class	2016-07-14 18:13:54 +01:00
David Baker	7c1b4f4fc9	Obey my own code style	2016-07-14 18:13:15 +01:00
David Baker	a49a545161	CSS classes to colour offline users differently ... So we can use the same 66% opacity as idle tiles for offline-with-last-active-time to reduce the visual jarring	2016-07-14 17:41:07 +01:00
Stefan Pearson	cad057ef34	amends react template and removes opening image in lightbox	2016-07-14 17:12:17 +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
wmwragg	fd5d28768a	Simplification of the css	2016-07-14 12:05:00 +01:00
wmwragg	f6302fc990	Updated the search button, and simplified the leave css	2016-07-14 11:43:33 +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	2d6d734571	Listen for the new lastPreseceTs event ... This will catch all presence events as previously we were only listening for the actual presence string changing	2016-07-14 10:05:40 +01:00
wmwragg	7f00053f84	Footer upload icon updated to new vesrion	2016-07-13 17:46:56 +01:00
wmwragg	936a38a9f4	Updated and moved the room header settings icon	2016-07-13 16:02:18 +01:00
David Baker	6b03f72474	Fix filtering user list by ID ... Fixes https://github.com/vector-im/vector-web/issues/1739	2016-07-13 11:56:01 +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
Aviral Dasgupta	b334522168	feat: code cleanup & emoji replacement in composer	2016-07-08 12:54:28 +05:30
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	5c879d786e	Doc the default params / guestUsername props	2016-07-07 11:23:08 +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
David Baker	63ad57a8d4	Merge pull request #332 from aviraldg/feature-emojione ... feat: render unicode emoji as emojione images	2016-07-05 10:18:33 +01:00
Aviral Dasgupta	6a133bc034	feat: and emojify name in MemberInfo	2016-07-05 10:24:18 +05:30
Aviral Dasgupta	020f1f4320	feat: emojify ALL THE THINGS!	2016-07-05 10:16:17 +05:30
Aviral Dasgupta	22a2593bf2	fix: unbreak old MessageComposerInput/TabComplete	2016-07-05 01:32:40 +05:30
Aviral Dasgupta	73b726e5fb	feat: import only flatMap from lodash	2016-07-04 21:56:09 +05:30
Aviral Dasgupta	30b7efd585	fix: code cleanup, fix getCurrentCommand	2016-07-04 21:44:35 +05:30
Aviral Dasgupta	cccc58b47f	feat: implement autocomplete replacement	2016-07-03 22:15:13 +05:30
Aviral Dasgupta	8961c87cf9	feat: Autocomplete selection wraparound	2016-07-03 01:11:34 +05:30
Aviral Dasgupta	cd928fe6f5	Merge remote-tracking branch 'upstream/develop' into feature-autocomplete	2016-07-03 00:00:02 +05:30
Richard van der Hoff	a671e07da7	Merge pull request #326 from matrix-org/dbkr/fix_user_links ... Fix user links	2016-06-30 17:43:08 +01:00
Richard van der Hoff	ce39822957	Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist ... Fix ordering of Memberlist	2016-06-29 10:21:15 +01:00
theworldbright	7609b9eba8	Simplify logic for timestamp ordering of memberlist	2016-06-29 17:45:24 +09:00
theworldbright	b3d871aa6a	Add back comment	2016-06-29 17:33:41 +09:00
theworldbright	69cb0a8f1c	Switch ordering of Idle users	2016-06-29 17:08:17 +09:00
theworldbright	72a1d5a0de	Remove unused comments	2016-06-29 16:58:08 +09:00
theworldbright	174caceabf	Use lastActiveAgo to reorder member list	2016-06-29 16:57:59 +09:00
David Baker	ba47c5a198	Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links	2016-06-28 17:15:17 +01:00
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	c016eb78c8	Fix user links ... 'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.	2016-06-28 14:28:05 +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	a1dd427420	Implement device blocking ... This is the react-sdk part of https://github.com/matrix-org/matrix-js-sdk/pull/146. It adds 'Block'/'Unblock' buttons to the device list, and updates the deviceVerified listeners to listen for deviceVerificationChanged instead. Also adds an extra <div> to the deviceinfo section to help me with the CSS.	2016-06-23 17:30:04 +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
Richard van der Hoff	cdaf317f1d	Merge pull request #321 from matrix-org/rav/encrypt_room_setting ... RoomSettings: add encryption setting	2016-06-23 13:40:30 +01:00
Richard van der Hoff	3a21958faf	RoomSettings: add encryption setting ... Add a knob to RoomSettings which will send the appropriate event to enable encryption in the room.	2016-06-23 12:21:31 +01:00
Richard van der Hoff	7a7d7c0e02	Fix a pair of warnings from RoomSettings ... - initialise the 'publish' checkbox correctly so react doesn't grumble about it turning from uncontrolled into controlled - PowerSelector's 'controlled' property isn't really required, so mark it as such.	2016-06-23 11:15:55 +01:00
Richard van der Hoff	a04f03669c	RoomSettings: refactor permissions calculations ... The logic for calculating who had permission for what was impenetrable (and wrong, in parts), so rewrite it to be a bit clearer.	2016-06-23 10:36:16 +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
Aviral Dasgupta	a74db3a815	Get basic keyboard selection working	2016-06-21 18:33:39 +05:30
Aviral Dasgupta	fb6eec0f7d	Hide/show autocomplete based on selection state	2016-06-21 15:46:20 +05:30
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
Richard van der Hoff	1d42443c0c	Merge pull request #314 from matrix-org/dbkr/show_canonical_alias ... Show canonical alias in URL bar	2016-06-17 17:03:18 +01:00
David Baker	6adce649eb	Use the first alias is there's no canonical alias	2016-06-17 16:56:34 +01:00
Richard van der Hoff	ad00abe9c0	Support for making devices unverified ... Because its useful for testing Requires support from js-sdk, and (ideally) css from vector-web	2016-06-17 16:24:23 +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
Aviral Dasgupta	b9d7743e5a	Emoji provider, DDG working, style improvements	2016-06-17 04:58:09 +05:30
Aviral Dasgupta	769b3f0c2a	Merge branch 'develop' into feature-autocomplete	2016-06-17 00:37:39 +05:30
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
Aviral Dasgupta	8b1332cd29	Use different keys for new MessageComposerInput	2016-06-16 14:46:09 +05:30
Aviral Dasgupta	3f1b57b35b	Fix cursor bug, persist editor mode & rte default	2016-06-15 00:13:34 +05:30
David Baker	5199cd04a2	Merge pull request #292 from aviraldg/feature-rte ... Rich Text Editor	2016-06-14 15:27:39 +01:00
Aviral Dasgupta	ba69e4365d	more RTE fixes	2016-06-14 19:28:51 +05:30
Aviral Dasgupta	8cb086ef31	use constants for keycodes in RTE	2016-06-14 19:14:09 +05:30
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	34be17cc7e	use rte labs setting	2016-06-14 00:10:43 +05:30
Aviral Dasgupta	74527a439c	Merge branch 'develop' into feature-rte	2016-06-13 23:57:10 +05:30
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
Aviral Dasgupta	4bc8ec3e6d	room, user, ddg autocomplete providers (wip)	2016-06-12 17:02:46 +05:30
Aviral Dasgupta	0df201c483	Merge branch 'develop' into feature-autocomplete	2016-06-12 14:10:23 +05:30
Pedro Ferreira	8f45f168d5	Fix highlighting behaviour on switch ... Hopefully made the code a little bit clearer.	2016-06-12 01:08:31 +02:00
Pedro Ferreira	a5a3e4e915	Basic Markdown highlighting	2016-06-12 01:07:16 +02:00
Aviral Dasgupta	c0d7629980	get /commands working again	2016-06-12 00:11:27 +05:30
Aviral Dasgupta	b960d220d2	cleanup, better comments, markdown hotkeys	2016-06-11 22:24:09 +05:30
Aviral Dasgupta	e4217c3fb7	rte improvements, markdown mode	2016-06-11 15:52:08 +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
Aviral Dasgupta	bf8e56e04c	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte	2016-06-10 04:43:44 +05:30
Aviral Dasgupta	4e0720db12	Fix MessageComposerInput.setLastTextEntry	2016-06-10 00:03:40 +05:30
Aviral Dasgupta	29cdd1fc41	user and room decorators, history & typing notifs	2016-06-09 23:53:09 +05:30
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
David Baker	888c0611e8	Merge pull request #302 from matrix-org/rav/guest_device_spinner ... Fix spinner-of-doom in member info for guests	2016-06-09 11:03:40 +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
Richard van der Hoff	2352661513	MemberInfo: remove spinner if device query fails ... If the request to /keys/query fails (for example, because we are a guest), we need to remove the spinner.	2016-06-09 10:57:19 +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
Richard van der Hoff	85770feb31	device verification: use a js-sdk event ... We'll probably want to be able to bubble up device verifications from the js-sdk at some point, so let's use a js-sdk event for this.	2016-06-08 21:25:42 +01:00
David Baker	c123f02842	Make the config optional	2016-06-08 18:45:46 +01:00
Richard van der Hoff	7ce49c752f	Wire up events to update UI on device verification ... Use the dispatcher to update event tiles and memberdeviceinfo when a device is marked as verified.	2016-06-08 18:35:43 +01:00
Richard van der Hoff	1616431d27	EventTile: add classes to indicate verifiedness ... Add a couple of CSS classes to event tiles to reflect whether encrypted events have been verified or not.	2016-06-08 17:02:42 +01:00
Richard van der Hoff	f3e66e6fd2	Add device info to member info ... Requires e81ce23 in matrix-js-sdk	2016-06-08 17:02:42 +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	aca0e060a4	Also change velocity-vector commit & requires ... Because it needs a versiob where the package name is actually updated and the requires need to use the right package name	2016-06-07 20:47:37 +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	15dccd9871	Handle errors with scalar-oauthing ... Handle error getting the scalar token and check for non-success status codes in the response handler (because apparently browser-request doesn't consider that an error).	2016-06-06 17:55:45 +01:00
David Baker	fdcebe1e56	Merge remote-tracking branch 'origin/develop' into dbkr/scalar	2016-06-06 17:19:38 +01:00
Matthew Hodgson	f8b3128645	invite input box wording for amandine	2016-06-02 23:33:55 +01:00
Matthew Hodgson	1b3c8481f6	fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged	2016-06-02 21:07:47 +01:00
Matthew Hodgson	532e93d7cb	fix up trailing whitespace and put the buttons in the right order	2016-06-02 21:07:04 +01:00
Matthew Hodgson	e20a1acb88	label our versions sensibly	2016-06-02 19:22:11 +01:00
Matthew Hodgson	487f3c72dd	fix new 3pid invite UI	2016-06-02 16:59:44 +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
Matthew Hodgson	3b34311e05	implement new UX for 3pid invites	2016-06-01 23:42:34 +01:00
Matthew Hodgson	0747ca3923	ignore @ prefixes when sorting memberlist	2016-06-01 14:00:20 +01:00
Aviral Dasgupta	b979a16199	initial version of autocomplete	2016-06-01 16:54:21 +05:30
Matthew Hodgson	272afe39dc	do not list rooms by default	2016-06-01 02:03:53 +01:00
Matthew Hodgson	c3fc76cdaa	warn guests to register nicely to upload files	2016-05-31 23:59:36 +01:00
Matthew Hodgson	e1ba7df66e	fix the Add button for email addies	2016-05-31 23:50:53 +01:00
Matthew Hodgson	2662ca36f9	fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?!	2016-05-31 23:50:47 +01:00
Matthew Hodgson	b74d690035	Merge pull request #290 from matrix-org/matthew/multipreview ... multiple URL preview support	2016-05-31 19:42:21 +01:00
Matthew Hodgson	b3638f9169	PR review	2016-05-31 19:42:00 +01:00
Aviral Dasgupta	96526c22c5	Merge branch 'develop' into feature-rte	2016-05-29 20:50:33 +05:30
Aviral Dasgupta	fe76eb9f73	minor improvements ... - use <p> for unstyled blocks - fix return key bug - editor placeholder	2016-05-28 12:02:35 +05:30
David Baker	118eec8cc0	Add a fallback home server to log into ... If login fail with a credential error on the default HS, try logging in on the fallback one.	2016-05-27 14:57:43 +01:00
Matthew Hodgson	d5e6e961fd	fix url previews firing incorrectly on Matrix.org	2016-05-27 10:09:17 +01:00
Aviral Dasgupta	001011df27	Initial version of rich text editor	2016-05-27 10:15:55 +05:30
Matthew Hodgson	39a3d6fdd4	multiple URL preview support	2016-05-24 00:54:20 +01:00
Matthew Hodgson	5835948a3d	ignore @ prefixes when sorting memberlist	2016-05-19 23:00:28 +01:00
Matthew Hodgson	c38c57df1e	put integrations manager into a modal	2016-05-19 14:12:08 +01:00
Matthew Hodgson	817a3debec	debug HS & IS	2016-05-18 11:42:51 +01:00
Matthew Hodgson	1459478ee0	use right check for end of timeline ... and avoid bad interactions with forward pagination. thanks @richvdh	2016-05-17 21:32:20 +01:00
Matthew Hodgson	be5f29d03b	Merge branch 'develop' into dbkr/scalar	2016-05-17 20:37:16 +01:00
Matthew Hodgson	24adf2847e	better comment	2016-05-17 20:32:38 +01:00
Matthew Hodgson	7879be1704	implement basic local echo for resetting unread message count when opening a room without a scroll offset. hopefully largely fixes https://github.com/vector-im/vector-web/issues/967	2016-05-17 20:28:11 +01:00
Matthew Hodgson	fd09d5c570	switch badge count to per-conversation, and add per-room badges	2016-05-17 11:14:12 +01:00
David Baker	ffe892b4b1	Merge remote-tracking branch 'origin/develop' into dbkr/scalar	2016-05-17 10:30:32 +01:00
Matthew Hodgson	62a1100fca	Merge pull request #289 from matrix-org/dbkr/email_notifs ... Support for enabling email notifications	2016-05-10 16:39:37 +02:00
David Baker	75979786fc	Call it scalar_token for consistency	2016-05-06 15:06:23 +01:00
David Baker	bb9316edfa	Pass the room id to scalar	2016-05-06 14:42:00 +01:00
David Baker	6da4b9d671	Add suport for showing the scalar UI	2016-05-06 14:19:56 +01:00
Matthew Hodgson	b86af8939a	fix usersettings cancel fail on new accounts	2016-05-05 15:30:56 +01:00
David Baker	fab7111fd7	Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs	2016-04-29 11:09:02 +01:00
Matthew Hodgson	3cf12f8626	fix typo	2016-04-28 15:43:42 +01:00
Richard van der Hoff	ca0c697b6e	Avoid rerendering during Room unmount ... might speed up room changing by a few milliseconds	2016-04-22 17:06:53 +01:00
Richard van der Hoff	0fd0b0c5f3	Whitespace fixes ... Fix some trailing whitespace	2016-04-22 17:05:48 +01:00
David Baker	c3365f993b	Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs	2016-04-22 16:25:09 +01:00
Richard van der Hoff	afb301ffb7	Reduce timeline limit to 250 events ... ... maybe this will help improve responsiveness in firefox.	2016-04-22 11:08:39 +01:00
Matthew Hodgson	d72d9260d4	Merge pull request #284 from matrix-org/matthew/hide_preview_heuristics ... add heuristics to hide URL previews...	2016-04-21 18:54:34 +01:00
Matthew Hodgson	4d399a3640	Refactor out isLinkPreviewable	2016-04-21 18:00:39 +01:00
Matthew Hodgson	ee11838537	fix comment paren	2016-04-21 17:19:24 +01:00
Matthew Hodgson	c5a76dec1c	add heuristics to hide URL previews other than for URLs where the user has explicitly identified the target as a link: i.e. by including a URI scheme prefix, or by including URI path components, or by doing an explicit markdown hyperlink. ignore previews of URLs within pre or code blocks	2016-04-21 17:14:27 +01:00
Richard van der Hoff	30f273c611	Merge pull request #283 from matrix-org/rav/issue_1427 ... Fix bug which stopped us scrolling down after we scrolled up	2016-04-21 14:26:42 +01:00
Richard van der Hoff	2f435f4836	Fix bug which stopped us scrolling down after we scrolled up ... Make sure that, if we scroll up enough to move the timelinewindow away from the end of the timeline, we reset the canForwardPaginate flag.	2016-04-21 14:20:12 +01:00
David Baker	3381e2b057	Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs	2016-04-21 10:12:27 +01:00
Richard van der Hoff	fa34dee091	Rewrite Read-receipt animation ... ... hopefully fixing https://github.com/vector-im/vector-web/issues/1437 in the process. The idea here is that, when we remove a read-receipt from the DOM, we stash its position in a map. Then, when the read-receipt appears again attached to another event, we know where to start the transition.	2016-04-20 23:06:53 +01:00
Richard van der Hoff	d953ac4e6b	Don't relayout scrollpanels every time something changes ... Gemini's habit of reflowing everything everytime anything changes at all makes for an unresponsive app. Turn it off everywhere we use gemini.	2016-04-20 12:25:19 +01:00
Richard van der Hoff	86a5e1f38d	Reduce number of renders on received events ... TimelinePanel rerenders are expensive, so we want to do as few as possible. So, when we get a new timeline event, make sure that we update the RM and add the new event at the same time.	2016-04-19 23:45:51 +01:00
Richard van der Hoff	dcd81da856	Fix test failures introduced by last PR	2016-04-19 21:10:23 +01:00
Richard van der Hoff	568e7aef8b	Avoid rerendering EventTiles when not necessary ... Each individual eventtile isn't particularly expensive, but when you have 500 of them, they start adding up. Shuffle some of the stuff into MessagePanel, so that we can shouldComponentUpdate EventTiles properly.	2016-04-19 19:41:43 +01:00
Richard van der Hoff	a6bcbd4f61	Speed up processing of TimelinePanel updates on new events ... Avoid twiddling state flags, so that we can avoid redundant re-renders.	2016-04-19 18:29:25 +01:00
Richard van der Hoff	683faf571f	Fix syntax error which prevented build ... Remove a spurious } which was introduced in PR #275	2016-04-19 13:32:14 +01:00
Matthew Hodgson	8517b6558b	Merge pull request #275 from matrix-org/matthew/memberlist-sort ... Fix many thinkos in sorting the MemberList	2016-04-18 19:15:20 +01:00
Richard van der Hoff	7b405d0d9c	Don't setState after unmounting a component ... Fix a warning which happens if a LinkPreviewWidget is unmounted before the preview request completes. Also add missing .done to promise chain	2016-04-18 14:52:41 +01:00
Matthew Hodgson	a95c45eb96	final(?) PR fixes	2016-04-18 14:48:55 +01:00
Matthew Hodgson	60f92fd15b	PR feedback	2016-04-18 14:07:20 +01:00
Matthew Hodgson	b2d0950a46	oops, remove debug logging	2016-04-18 01:45:46 +01:00
Matthew Hodgson	b949e78683	Improve ordering of memberlist by absolutizing lastActive correctly ... Change ordering of memberlist to not try to compare lastActive of 'currentlyActive' users, as lastActive may will be a complete lie as it only gets updated when currentlyActive transitions to false (i think?) Remove order by online/idle/offline in favour of "currently active, ordered by power and then alphabetic name, followed by last active, followed by offline" Add commented-out code to track last-spoken-within-a-room ordering. Fix kludges due to SYJS-28 (depends on JS PR landing)	2016-04-18 01:35:40 +01:00
Matthew Hodgson	eeb9abdf81	trailing whitespace	2016-04-18 01:34:45 +01:00
Richard van der Hoff	716eb1eb1b	Drop workaround for object.onLoad ... https://github.com/facebook/react/pull/5781 has been fixed in React 15.0, so drop our workaroud for it.	2016-04-17 21:46:27 +01:00
Richard van der Hoff	336d91dadb	Merge pull request #272 from matrix-org/rav/fix_roomname ... Make sure that we update the room name	2016-04-17 18:12:18 +01:00
Matthew Hodgson	f4573bae49	remove premie optimisation of tintablesvg shouldComponentUpdate	2016-04-17 00:28:20 +01:00
Matthew Hodgson	8db14bde60	switch Tinter from using dispatch to a synchronous update when changing the colourscheme, to avoid CSS getting out of sync with SVG colours	2016-04-16 01:00:10 +01:00
Matthew Hodgson	4fb31662e1	fix tooltip offset	2016-04-15 22:24:12 +01:00
Matthew Hodgson	19770563f4	add cancelButton to simpleHeader	2016-04-15 22:16:19 +01:00
Matthew Hodgson	009781dac7	prep for RightPanel full collapse	2016-04-15 18:45:40 +01:00
Matthew Hodgson	f625e2d693	fix up UserSettings a bit and add fading	2016-04-15 18:30:13 +01:00
Matthew Hodgson	a06b420942	wire up searchbox filtering	2016-04-15 17:55:00 +01:00
Matthew Hodgson	7c8d7e5361	move memberlist bottom into rightpanel	2016-04-15 15:53:14 +01:00
Richard van der Hoff	8680afe46f	Make sure that we update the room name ... It turns out that RoomState.events is fired before Room.name is updated; make sure that we pick up the latter and do the update.	2016-04-15 10:01:39 +01:00
Matthew Hodgson	26f135c7b0	fix 'undefined' class bug on TintableSvg	2016-04-14 21:44:05 +01:00
Matthew Hodgson	2d71d4422e	make selected room more skinnable	2016-04-14 21:11:10 +01:00
Matthew Hodgson	0741e8a5c1	fix testing UI hack	2016-04-14 19:11:20 +01:00
Matthew Hodgson	81d5e16225	fix @aviraldg thinko on needing a key on arrays :)	2016-04-14 19:11:09 +01:00
Matthew Hodgson	21fd5078f9	fix NPE on getEventTileOps	2016-04-14 17:39:45 +01:00
Richard van der Hoff	3fd9b29422	Merge pull request #271 from matrix-org/rav/avoid_codepoint_at ... Hack around absence of String.codePointAt on PhantomJS	2016-04-13 16:37:00 +01:00
Richard van der Hoff	85277a237a	Merge pull request #270 from matrix-org/rav/issue_1314_federated_rooms ... RoomView: Handle joining federated rooms	2016-04-13 16:36:46 +01:00
Matthew Hodgson	1e294cb10c	fix 'mark all read'	2016-04-13 12:46:36 +01:00
Richard van der Hoff	ec5ca1ca28	s/roomAlias/roomAddress/ to reduce confusion	2016-04-13 12:26:40 +01:00
Matthew Hodgson	6509bc0589	oops, missed another fade	2016-04-13 11:17:09 +01:00
Matthew Hodgson	ead5418214	oops, missed a fade	2016-04-13 11:17:09 +01:00
Richard van der Hoff	047524d093	Merge pull request #269 from matrix-org/rav/stop_client_on_unmount ... Stop the MatrixClient when the MatrixChat is unmounted	2016-04-13 11:05:02 +01:00
Richard van der Hoff	5706a879d0	Hack around absence of String.codePointAt on PhantomJS ... I've been trying to get some tests working under PhantomJS, which appears not to support String.codePointAt (which is, to be fair, an ES6 addition). For our limited usecase, it's easier to implement the functionality from first principles than to try to polyfill support.	2016-04-13 10:35:07 +01:00
Richard van der Hoff	93a142480c	RoomView: Handle joining federated rooms ... This hopefully fixes an issue where joining a federated room via the directory would get stuck at a spinner of doom, due to us not recognising the room in question when it came down the /sync. We now catch the room id in the response from the /join, and use it to match up the room in onRoom. props.roomAlias, props.roomId, and state.room.roomId were somewhat confusing, so I've tried to rationalise them: * props.roomAlias (named thus to stop you assuming it's a room id) is the thing that the parent component uses to identify the room of interest, and can be either an ID or an alias (ie, it replaces props.roomId and props.roomAlias) * Everything that needs a room ID now has to get it from state.room.roomId.	2016-04-13 08:59:28 +01:00
Matthew Hodgson	f3793b556e	fix super-annoying key warning from react	2016-04-13 02:02:55 +01:00
Matthew Hodgson	92f58b6927	don't try to do preview URLs of matrix IDs (yet :D)	2016-04-13 01:54:06 +01:00
Matthew Hodgson	4b1ff51a42	show a spinner on MemberInfo when updating a member. and label 'disinvite' correctly	2016-04-13 01:46:10 +01:00
Matthew Hodgson	bfec6d4ed9	merge aviral's audio player	2016-04-13 00:00:24 +01:00
Richard van der Hoff	1361333fdc	Stop the MatrixClient when the MatrixChat is unmounted ... The MatrixClient never gets unmounted in the real app, but I've been working on some tests which would rather like to be able to create and destroy MatrixChats and not have the clients hang around forever.	2016-04-12 18:38:10 +01:00
Matthew Hodgson	6a6739e0f3	fix context menu on tiles without widgets	2016-04-12 18:32:55 +01:00
Matthew Hodgson	a01e6d46b9	Merge pull request #268 from matrix-org/matthew/fadable ... make the UI fadable to help with decluttering	2016-04-12 18:05:10 +01:00
Matthew Hodgson	3a2d5c4ba5	spinner on saving room settings	2016-04-12 18:01:49 +01:00
Matthew Hodgson	11f3d5f993	make the UI fadable to help with decluttering	2016-04-12 17:18:32 +01:00
David Baker	fcab259511	Support for email notifs ... Add utility funcs in UserSettingsStore and pass threepids to Notifications so it can do email notif stuff	2016-04-12 16:17:04 +01:00
Matthew Hodgson	1d5f234f2c	add 'mark all read' button	2016-04-12 14:29:36 +01:00
Matthew Hodgson	089963b4c7	timestamps are permalinks	2016-04-12 13:33:59 +01:00
Matthew Hodgson	38d27cdbb0	improve 'no known servers' error	2016-04-12 13:00:52 +01:00
Matthew Hodgson	f9785f68af	filter out conference bots from membership list	2016-04-12 01:54:51 +01:00
Matthew Hodgson	bf1e0da598	fix ability to save room settings if you don't have ops	2016-04-12 01:27:12 +01:00
Matthew Hodgson	f9c7ae1ab9	Merge pull request #260 from matrix-org/matthew/preview_urls ... URL previewing support	2016-04-11 23:55:15 +01:00
Matthew Hodgson	9845e5ef0e	move all the localstorage crap to TextualBody	2016-04-11 23:53:36 +01:00
Matthew Hodgson	8e48bed346	apparently we don't need this. i'm lost now	2016-04-11 17:32:10 +01:00
Richard van der Hoff	e051d1528c	Remember to load new timeline events ... Fixes a bug where we wouldn't load new timeline events if they arrived when we were scrolled up (https://github.com/vector-im/vector-web/issues/1367)	2016-04-11 14:05:04 +01:00
Matthew Hodgson	2e772e2f19	fix whitespace on multiupload prompt	2016-04-10 14:02:22 +01:00
Matthew Hodgson	6c372d37f7	add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback	2016-04-08 21:42:29 +01:00
Matthew Hodgson	23d6edbf63	forceupdate the whole scrollPanel rather than the geminiPanel at vdh's PR review request	2016-04-08 20:21:27 +01:00
Matthew Hodgson	4abc5d0d36	add comment	2016-04-08 20:21:12 +01:00
Richard van der Hoff	967528608f	Merge pull request #265 from matrix-org/rav/limit_pagination ... Stop trying to paginate after we get a failure	2016-04-08 16:00:51 +01:00
Richard van der Hoff	15d0df5d3b	Stop trying to paginate after we get a failure ... Once TimelineWindow.paginate fails to return any results, set can*Paginate=false, and use it as a flag to stop us trying to paginate any further.	2016-04-08 15:05:15 +01:00
Matthew Hodgson	1d8b08040e	incorporate PR feedback	2016-04-07 18:58:50 +01:00
Matthew Hodgson	7884c13d0d	Merge branch 'develop' into matthew/preview_urls	2016-04-07 17:25:48 +01:00
David Baker	a0c41e2d57	Fix password resetting ... Fixes https://github.com/vector-im/vector-web/issues/1349	2016-04-07 12:59:30 +01:00
Richard van der Hoff	b64604964d	Fix exception in key handling ... Fix a typo introduced in PR #262 which caused scroll keys to throw console errors.	2016-04-07 12:05:07 +01:00
Richard van der Hoff	8b8ee21765	Catch pageup/down and ctrl-home/end at the top level ... Make the scroll keys work when the focus is outside the message panel.	2016-04-05 13:40:36 +01:00
Richard van der Hoff	c5c9cad0cb	Merge pull request #261 from matrix-org/rav/issue_1151 ... Fix an issue where the scroll stopped working.	2016-04-05 12:55:59 +01:00
Richard van der Hoff	6a82d1a94c	Merge pull request #254 from matrix-org/rav/fix_rm_animation ... Fix a bug where we tried to show two ghost read markers at once.	2016-04-05 12:55:38 +01:00
Richard van der Hoff	0d7adae100	Back out animation timing changes for now ... ... since they seem to be a bit contentious	2016-04-05 10:46:08 +01:00
Richard van der Hoff	51fe77122b	Fix an issue where the scroll stopped working. ... Under certain conditions, it was possible to get stuck in a state where any user-initiated scroll would be met with "Working around vector-im/vector-web#528" and overridden. Fix this by removing the duplication between _lastSetScroll and recentEventScroll, and using _lastSetScroll which is more reliable.	2016-04-05 10:41:32 +01:00
Matthew Hodgson	1de4e0d2dd	label previews with the target URL if all else fails	2016-04-04 01:06:54 +01:00
Matthew Hodgson	96b0f42db2	support lightboxes for image previews	2016-04-04 00:18:18 +01:00
Matthew Hodgson	0eb7b627fc	ugly impl to track whether to hide the widget or not	2016-04-03 23:30:48 +01:00
Matthew Hodgson	e61c99f7f3	support cancelling previews	2016-04-03 02:50:36 +01:00
Matthew Hodgson	f9c914c40e	specify timestamps for historical previews	2016-04-03 01:21:56 +01:00
Matthew Hodgson	f195d2eb24	Merge branch 'develop' into matthew/preview_urls	2016-04-03 01:10:33 +01:00
Matthew Hodgson	2d289b321d	Merge branch 'develop' into matthew/preview_urls	2016-04-03 01:09:50 +01:00
Matthew Hodgson	2d3a237101	Merge pull request #258 from aviraldg/fix-219 ... File upload improvements	2016-04-02 23:07:50 +01:00
Aviral Dasgupta	0574a28e36	Add confirmation dialog for file upload ... fixes vector-im/vector-web#92	2016-04-03 02:22:05 +05:30
Aviral Dasgupta	0eeaac88b4	Allow multiple files to be uploaded at once ... fixes vector-im/vector-web#219	2016-04-03 01:26:50 +05:30
Aviral Dasgupta	31e09ebe63	Show full-size avatar on MemberInfo avatar click ... fixes vector-im/vector-web#65	2016-04-03 00:54:23 +05:30
Matthew Hodgson	bffb482133	add FIXME	2016-04-02 02:46:19 +01:00
Matthew Hodgson	4388334e30	fix up scroll behaviour when loading widgets	2016-04-02 00:36:19 +01:00
Matthew Hodgson	62d04c38ef	fix typo and add linkify descriptions	2016-04-01 02:23:29 +01:00
Matthew Hodgson	4d959fc33b	improve layout and make thumbnails work	2016-04-01 02:16:11 +01:00
Matthew Hodgson	e6842eab94	WIP url previewing	2016-03-31 18:38:01 +01:00
Richard van der Hoff	b6e4e9caf3	Fix a bug where we tried to show two ghost read markers at once. ... I think this was responsible for the readmarker just disappearing rather than animating. While we're here, decrease the delay on the animation, and instead make it take slightly longer to disappear.	2016-03-31 18:27:46 +01:00
Matthew Hodgson	f6f86958f5	tweak room settings wording	2016-03-31 14:20:50 +01:00
Richard van der Hoff	631183da29	Don't reload the DOM if we can jump straight to the RM ... Adds a missing 'return' statement which meant that, even if we already had the relevant event loaded into the DOM, we would rebuild it when the user clicked on the "(^) Unread messages" bar.	2016-03-31 00:51:23 +01:00
Matthew Hodgson	4380308393	my node choked on this trailing ,	2016-03-30 01:31:29 +01:00
Matthew Hodgson	182fa22eac	Merge pull request #251 from aviraldg/feature-pretty-placeholder ... Prettier, animated placeholder :D	2016-03-30 01:27:36 +01:00
Richard van der Hoff	49e75b7430	Merge pull request #252 from matrix-org/rav/RoomHeader ... Refactor RoomHeader, and fix topic updates	2016-03-29 23:25:54 +01:00
Richard van der Hoff	1f2ba87ff5	Pass SimpleRoomHeader title in as a named property ... ... rather than a child	2016-03-29 23:21:17 +01:00
Richard van der Hoff	0d261c37c2	Update room header when room state changes ... Force an update so that we see the latest state. Fixes https://github.com/vector-im/vector-web/issues/1299	2016-03-29 16:31:13 +01:00
Richard van der Hoff	6422f7ecc8	Factor out separate RoomNameEditor and RoomTopicEditor components	2016-03-29 15:21:16 +01:00
Richard van der Hoff	abedb05268	Merge pull request #250 from matrix-org/rav/disable_composer_if_no_permission ... Disable the message composer if we don't have permission to post	2016-03-29 15:15:58 +01:00
Richard van der Hoff	70133ae661	Factor out SimpleRoomHeader ... Start cleaning up RoomHeader by factoring out a separate SimpleRoomHeader.	2016-03-29 12:51:46 +01:00
Matthew Hodgson	e068a92cde	Merge pull request #248 from matrix-org/matthew/fix-image-load-popping ... Fix scroll offset popping around during image load by putting explicit height back on images	2016-03-29 00:48:31 +01:00
Matthew Hodgson	0a2678b917	Add warning if fixupHeight fails, and remove overzealous logging	2016-03-29 00:46:51 +01:00
Aviral Dasgupta	6b10d5f696	Prettier, animated placeholder :D	2016-03-28 19:39:36 +05:30
Matthew Hodgson	a3dcd24e4a	fix event-recycling bug and mend history viz changes	2016-03-25 01:12:16 +00:00
Richard van der Hoff	c227b2279b	Minor fixes to image sizing ... * use string refs instead of callback funcs * Add a null-guard in case we don't have an image	2016-03-24 16:58:27 +00:00
David Baker	c3dd9a4b17	Unset email pending state on error or we never remove the spinner	2016-03-24 15:03:44 +00:00
Richard van der Hoff	cbf5b0eca3	Disable the message composer if we don't have permission to post ... Rehashes dave's earlier PR which did the same thing	2016-03-24 13:57:21 +00:00
Richard van der Hoff	6ff41c40b6	Split a textinput component out of MessageComposer ... Split the text entry section out of MessageComposer: it has a lot of stuff which won't be needed if we disable input	2016-03-24 11:25:41 +00:00
Matthew Hodgson	8b67a1059d	oops, forgot a sync dispatch on onSearchResultsResize	2016-03-24 02:14:16 +00:00
Matthew Hodgson	5bd0303dda	make it work, seemingly	2016-03-24 01:12:51 +00:00
Matthew Hodgson	151a9994ba	WIP fix for image load popping	2016-03-24 00:13:32 +00:00