2517 commits

Author	SHA1	Message	Date
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	b4c1eca1c5	fix key warning	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	820cd579d8	fix stupid double-spacing issue	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
Aviral Dasgupta	c11232742b	Fix focus and toggling issues in formatting bar	2016-09-08 02:46:56 +05:30
Aviral Dasgupta	8974442084	Hide empty autocomplete and remove word counter	2016-09-08 00:43:10 +05:30
Aviral Dasgupta	802ec1169f	Fix Markdown conversion to not add extra \n ... Fixes vector-im/vector-web#2094	2016-09-08 00:03:55 +05:30
Aviral Dasgupta	f0f20beae0	RTE format bar enhancements	2016-09-08 00:03:54 +05:30
Aviral Dasgupta	0c0c44b050	Formatting toggle, markdown indicator, quoting ... Fixes vector-im/vector-web#1825	2016-09-08 00:02:55 +05:30
Aviral Dasgupta	71251293e4	RTE formatbar (wip) ... Fixes vector-im/vector-web#2024	2016-09-08 00:02:16 +05:30
David Baker	ec4086c5fc	API for (un)marking rooms as DM rooms	2016-09-07 17:46:45 +01:00
wmwragg	7dfb8857d8	Merge branch 'develop' into wmwragg/one-to-one-chat	2016-09-07 17:22:10 +01:00
wmwragg	ca3910f5a8	Mouse actions on the queryList added, as well as better queryListElement styling	2016-09-07 16:18:50 +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	dd186dd612	Fixed wrong type to justified prop	2016-09-07 10:59:06 +01:00
wmwragg	7e60012bd4	Added justification for the AddressTile, when requested	2016-09-07 10:55:44 +01:00
David Baker	094080629d	Actually commit changed path	2016-09-07 10:19:39 +01:00
wmwragg	45256f5d58	Validation checks added	2016-09-06 17:46:00 +01:00
David Baker	d5b23e9e0e	Save guessed DM rooms to account data ... Also bugfix	2016-09-06 17:43:39 +01:00
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
Matthew Hodgson	b81d901919	fix spinner when cancelling start chat from memberinfo	2016-03-23 18:17:49 +00:00
Matthew Hodgson	1a62369a01	prioritise new version bar	2016-03-23 18:05:47 +00:00
Richard van der Hoff	9f05249d9c	Disable scrollpanel debug ... ... so that I can (re-)release	2016-03-23 14:53:38 +00:00
David Baker	d6218ca153	Actually calling functions often helps.	2016-03-23 12:02:26 +00:00
David Baker	e20c599273	Swap register & cancel buttons for matthew	2016-03-23 11:48:47 +00:00
Matthew Hodgson	c4eabe2eb4	hopefully fix https://github.com/vector-im/vector-web/issues/1242	2016-03-23 11:41:10 +00:00
Richard van der Hoff	422a1f01a4	Limit check on scrollNode.scrollTop to keep firefox happy ... Turns out that Firefox ignores attempts to set scrollTop to Number.MAX_VALUE. Clip it to scrollHeight.	2016-03-23 10:51:07 +00:00
Richard van der Hoff	cf17258a6c	Merge pull request #246 from matrix-org/rav/read_marker_off_by_one ... Fix off-by-one error in read-marker advancing	2016-03-23 10:23:19 +00:00
Richard van der Hoff	04c9924ad6	Fix off-by-one error in read-marker advancing ... The fix to https://github.com/vector-im/vector-web/issues/1241 introduced an off-by-one error which meant we would show the RM before the last event in a room. We were actually winding the RM back one if the last message wasn't sent by us.	2016-03-23 09:49:31 +00:00
Richard van der Hoff	4fd49976ae	Another go at fixing the jumpy scroll ... The most recent problem was that we were setting _lastSetScroll whenever we wrote to scrollTop (and ignoring the next scroll event which matched that offset), but if there was no change to scrollTop, we wouldn't actually get a scroll event, so would ignore some future scroll event instead. Make sure that we only set _lastSetScroll if there's a change to scrollTop. (Fixes https://github.com/vector-im/vector-web/issues/1162, more)	2016-03-22 19:33:02 +00:00
Matthew Hodgson	2403eca6af	profoundly evil ugly hack to workaround amandine's invite focus issues on her note-to-self rooms	2016-03-22 17:47:52 +00:00
Richard van der Hoff	7fb5736e52	Merge pull request #244 from matrix-org/rav/no_rm_on_my_events ... Move read-marker past our own events when we switch to a room	2016-03-22 17:44:02 +00:00
David Baker	abe4df5f1c	Merge pull request #243 from matrix-org/dbkr/error_messages ... Add better user-facing error messages	2016-03-22 17:41:00 +00:00
Richard van der Hoff	0737d89d57	Merge pull request #242 from matrix-org/rav/read_marker ... Make the read-marker less annoying	2016-03-22 17:37:14 +00:00
David Baker	87d853d56b	If we don't get a specific event because of permissions, say so	2016-03-22 17:33:46 +00:00
David Baker	4e9c37c069	Remove unused prop	2016-03-22 17:23:46 +00:00
Richard van der Hoff	3736fcf80e	Move read-marker past our own events when we switch to a room ... This fixes an issue where the RM appeared before any events which were pending when you switched away from that room (https://github.com/vector-im/vector-web/issues/1241). Also, fix a buglet in the MessagePanel which meant we didn't animate the disappearance of a RM when it stayed at the same event but became invisible. This didn't really cause any user-visible problems (because typically we advance the RM at the same time as it became invisible), but confused me a bit while I was trying to debug this.	2016-03-22 17:23:23 +00:00
David Baker	7f6eabe657	Fix doc for NeedToRegisterDialog and the place I copied it from	2016-03-22 17:20:22 +00:00
Matthew Hodgson	e23f496dfe	fix PowerSelector to support both controlled & uncontrolled variants	2016-03-22 17:17:46 +00:00
David Baker	88aa975271	Sensible error message if we can't invite because we're not allowed	2016-03-22 16:33:39 +00:00
Richard van der Hoff	c1101d978e	Turn on scroll debug again	2016-03-22 15:37:08 +00:00
David Baker	7caad2a434	More user-facing error message for event-not-found	2016-03-22 14:22:16 +00:00
David Baker	098f3e6561	Merge remote-tracking branch 'origin/develop' into dbkr/error_messages	2016-03-22 13:54:31 +00:00
David Baker	f1219a6b8d	Register prompt for trying to set an avatar	2016-03-22 13:50:27 +00:00
Matthew Hodgson	c60a305284	oops, unbreak tags in roomsettings	2016-03-22 13:47:38 +00:00
David Baker	13f31b2a5d	Add error message for failing to join a room as a guest (which may or may not be because we're a guest: we can't tell)	2016-03-22 13:47:29 +00:00
David Baker	463212fb2a	Update error message	2016-03-22 13:19:29 +00:00
David Baker	6dce555865	Sensible error for setting room colours if you're a guest	2016-03-22 13:09:19 +00:00
David Baker	e311a963c1	Merge remote-tracking branch 'origin/develop' into dbkr/error_messages	2016-03-22 12:59:14 +00:00
David Baker	30b76d372c	Error messages for guests creating rooms	2016-03-22 12:58:12 +00:00
Matthew Hodgson	385e1ca1fb	only let people add aliases if they canSeetAliases	2016-03-22 12:54:08 +00:00
Matthew Hodgson	80416fe583	prettify tag ui	2016-03-22 12:51:11 +00:00
David Baker	45dd192309	Merge remote-tracking branch 'origin/develop' into dbkr/error_messages	2016-03-22 12:48:13 +00:00
Matthew Hodgson	e141a44103	Merge pull request #241 from matrix-org/matthew/room-visibility ... rework roomsettings for new visibility UI	2016-03-22 12:30:21 +00:00
Matthew Hodgson	5a2a2c5bdc	fix up and factor out mayChangeRoomAccess and fix review feedback	2016-03-22 12:26:38 +00:00
Richard van der Hoff	2ac88a3d89	Make the read-marker less annoying ... We considered the user active if there had been a user_activity event within the last 500ms, but those events were only raised every 500ms, so it was possible that we would be considered inactive immediately. Use UserActivity.userCurrentlyActive() instead, which fixes this. Also increase CURRENTLY_ACTIVE_THRESHOLD_MS to 2 seconds.	2016-03-22 12:15:17 +00:00
Matthew Hodgson	df905cfcb7	incorporate PR review, and explicitly spell out if the room has ended up with guest_access=forbidden but join_rules=invite	2016-03-22 12:10:58 +00:00
Richard van der Hoff	b9d3047a93	Disable scrollpanel debug ... ... now that https://github.com/vector-im/vector-web/issues/1162 is hopefully fixed	2016-03-22 11:58:17 +00:00
David Baker	5f1fabd982	Error message #1: guests can't invite people. Also add a dialog box for telling people they need to register.	2016-03-22 10:57:05 +00:00
Richard van der Hoff	c31fbf1214	Merge pull request #236 from matrix-org/rav/search_pagination_spinner ... Show a spinner when we back-paginate search results	2016-03-22 10:12:51 +00:00
Richard van der Hoff	d000870668	Merge pull request #237 from matrix-org/rav/scroll_jump ... Only ignore scroll echoes once	2016-03-22 10:12:23 +00:00
Richard van der Hoff	74b45475be	Merge pull request #238 from matrix-org/rav/cancel_sending ... Add 'cancel all' option to 'unsent messages' bar	2016-03-22 10:12:11 +00:00
Richard van der Hoff	f6862f03ad	Merge pull request #239 from matrix-org/rav/context_errors ... Show an error when a direct-to-event link fails	2016-03-22 10:11:29 +00:00
Matthew Hodgson	8cfb0e9ef4	rework roomsettings for new visibility UI	2016-03-22 00:57:40 +00:00
Matthew Hodgson	4e97fe982d	improve previewbar look & feel	2016-03-21 22:05:59 +00:00
David Baker	3bd93c90b1	Splitting this over two lines confuses the word spacing	2016-03-21 18:15:01 +00:00
Richard van der Hoff	d67c64c7a6	Show an error when a direct-to-event link fails ... If the /context request fails, pop up a modal dialog to tell the user about it.	2016-03-21 17:29:33 +00:00
Richard van der Hoff	75f8765f88	Add 'cancel all' option to 'unsent messages' bar ... Also, make sure we hide said bar when unsent messages are cancelled.	2016-03-21 16:49:07 +00:00
Matthew Hodgson	11be2e1cad	Merge pull request #234 from matrix-org/matthew/stop-peeking ... if we're not peeking in a room, stop any ongoing peeking	2016-03-21 16:17:00 +00:00
Richard van der Hoff	c89906e571	Only ignore scroll echoes once ... When the user scrolls up, and scrolls back to where they were, we want to save the final scroll state. We were ignoring it because it looked the same as the last autoscroll. Fixes https://github.com/vector-im/vector-web/issues/1162	2016-03-21 14:48:17 +00:00
Matthew Hodgson	0a346350e8	warn if you don't specify an email	2016-03-21 01:15:11 +00:00
Matthew Hodgson	5bdcb64464	fix NPE	2016-03-21 00:51:45 +00:00
Matthew Hodgson	59f599af5c	prompt before giving equal ops	2016-03-21 00:49:18 +00:00
Matthew Hodgson	31ed7b9dd7	fix state caching bugs in RoomHeader	2016-03-21 00:39:33 +00:00
Richard van der Hoff	c1fa89972a	Show a spinner when we back-paginate search results ... Hook into the existing searchInProgress state to show a spinner when we back-paginate search.	2016-03-20 23:51:43 +00:00
Matthew Hodgson	eadd2a522f	fix room reuse semantics when starting chats	2016-03-20 13:04:03 +00:00
Matthew Hodgson	18fc8fc6c4	s/m.room.join_rule/m.room.join_rules/	2016-03-20 12:47:38 +00:00
Matthew Hodgson	bbd57f2bdf	when starting chat from memberinfo, allow guest access. in future synapse should make guest_access a default for the private_chat preset.	2016-03-20 12:39:49 +00:00
Matthew Hodgson	68a391e24b	implement history visibilty warnings	2016-03-19 22:33:06 +00:00
Richard van der Hoff	7712582c29	Renable debug in ScrollPanel ... ... after matthew disabled it by accident	2016-03-19 20:42:30 +00:00
Matthew Hodgson	a44ebddae0	show default displayname in ChangeDisplayName prompt	2016-03-19 02:45:06 +00:00
Matthew Hodgson	383779f718	oops, actually fix https://github.com/vector-im/vector-web/issues/308 properly...	2016-03-18 20:08:47 +00:00
Matthew Hodgson	cb9da69382	doh	2016-03-18 20:01:19 +00:00
Matthew Hodgson	0250192477	handle tagging for kicked rooms correctly	2016-03-18 19:59:58 +00:00
Matthew Hodgson	bfbb7a661e	special case to include kicked rooms as per https://github.com/vector-im/vector-web/issues/308	2016-03-18 19:45:04 +00:00
Matthew Hodgson	24972a8267	if we're not peeking in a room, stop any ongoing peeking	2016-03-18 19:23:30 +00:00
Matthew Hodgson	86807b631d	don't reset RoomHeader every time the props change due to RoomView re-rendering during edits	2016-03-18 19:16:55 +00:00
Matthew Hodgson	12db0d9130	fix NPE on events with no sender object	2016-03-18 16:33:22 +00:00
Matthew Hodgson	d0ecd38927	top-align search results	2016-03-18 16:25:11 +00:00
Richard van der Hoff	15c9ad87a1	Merge pull request #231 from matrix-org/rav/pending_event_list ... Use new pendingEventList functionality from matrix-js-sdk	2016-03-18 16:17:56 +00:00
David Baker	076bd720a3	Spell address correctly	2016-03-18 16:07:32 +00:00
David Baker	eb5aa7ed7d	Move comment	2016-03-18 16:06:36 +00:00
David Baker	b4dd7ba509	I mean string, object	2016-03-18 16:04:58 +00:00
David Baker	3e915cf0e2	Merge remote-tracking branch 'origin/develop' into dbkr/show_invited_email	2016-03-18 15:34:15 +00:00
David Baker	97c765f457	Look up bound mxid for the invited email address on the ID server and warn if it doesn't match our account.	2016-03-18 15:30:27 +00:00
Matthew Hodgson	03bdcf265a	fix proptypes on dialogs	2016-03-18 11:20:00 +00:00
Matthew Hodgson	deaa5c350a	Remove unnecessary Modal.createDialogWithElement, complete with its broken onFinished() support. Switch SetDisplayNameDialog to use Modal.createDialog(). Explicitly pass false to closeDialog if the user tries to cancel dialogs by clicking on the background, rather than passing in an event object which evaluates to true.	2016-03-18 11:15:06 +00:00
Matthew Hodgson	e63990a66e	ensure we call onFinished successfully if the user actually hits submit	2016-03-18 11:12:37 +00:00
Matthew Hodgson	d0d22136f5	remove totally dead wood from stale Modal API	2016-03-18 11:12:06 +00:00
Richard van der Hoff	b93af2d536	Use new pendingEventList functionality from matrix-js-sdk ... Update react-sdk to use `pendingEventOrdering`==`detached` instead of `end`. Look for pending events in the pendingEvent list, and use MatrixClient.cancelPendingEvent to, uh, cancel pending events.	2016-03-17 22:26:06 +00:00
Matthew Hodgson	e55a375d6f	improve RoomPreviewBar as per https://github.com/vector-im/vector-web/issues/761	2016-03-17 19:19:05 +00:00
Matthew Hodgson	be5173a8db	fix https://github.com/vector-im/vector-web/issues/871	2016-03-17 18:49:40 +00:00
Matthew Hodgson	396d23b267	kill annoying warning	2016-03-17 18:49:40 +00:00
David Baker	f1844a99e7	WIP on fixing https://github.com/vector-im/vector-web/issues/924 ... Pass the invited email through to RoomPreviewBar, display it in a temporary way currently. Remove a condition from RoomView render that appears to be functionally identical to the previous.	2016-03-17 18:38:25 +00:00
Richard van der Hoff	d1dbce8adf	Enable debug in ScrollPanel for now ... ... in an attempt to debug some of the recent scroll problems	2016-03-17 17:48:19 +00:00
Matthew Hodgson	57ffc2d2e2	add autoFocus to MessageComposer's textarea, which generally makes the world a better place. We could probably kill all the focus_composer dispatches too, but haven't got time to check that right now	2016-03-17 17:29:48 +00:00
Matthew Hodgson	fd4e709705	don't need null guard	2016-03-17 16:56:16 +00:00
Matthew Hodgson	76d4e8a788	check length of textarea, not its trueiness	2016-03-17 16:54:54 +00:00
Matthew Hodgson	1b4c5224fd	missed some s/this.refs.//	2016-03-17 16:52:12 +00:00
Matthew Hodgson	a64ad04a0e	handle focus nicely when inserting displaynames and let them be inserted in the middle of in-progress messages	2016-03-17 16:29:37 +00:00
Matthew Hodgson	c7ffb59374	click on nicks to insert them into the MessageComposer	2016-03-17 15:35:23 +00:00
Matthew Hodgson	a13513935b	only show '...' when people are typing	2016-03-17 15:02:07 +00:00
Matthew Hodgson	9dcdf0ae51	Merge pull request #227 from matrix-org/matthew/fix-notif-spam ... Correctly fix notif spam after logout/login	2016-03-17 14:37:01 +00:00
Matthew Hodgson	c51dac2f29	Merge pull request #226 from matrix-org/matthew/fix-last-active ... fix last_active_ago timestamps, tab completion ordering, and implement currently_active semantics	2016-03-17 14:36:52 +00:00
Matthew Hodgson	a68e4ed1a7	Merge pull request #222 from matrix-org/matthew/fix-memberlist-refresh ... make MemberTiles actually update in realtime	2016-03-17 11:59:24 +00:00
Matthew Hodgson	b617571481	tidy up https://github.com/matrix-org/matrix-react-sdk/pull/225	2016-03-17 11:56:46 +00:00
Matthew Hodgson	e03d8626be	Merge pull request #225 from aviraldg/fix-1174 ... Bring up MemberInfo on avatar click in EventTile	2016-03-17 11:48:32 +00:00
Matthew Hodgson	84278a4ed4	fix copy-paste bug caught by PR review	2016-03-17 11:37:26 +00:00
David Baker	b960d1d462	Make getCurrent[H|I]SUrl honour the state setting that comes from the url bar. ... Fixes @ara4n's later bug in https://github.com/vector-im/vector-web/issues/1027	2016-03-17 11:33:25 +00:00
Matthew Hodgson	3326a50c4b	hopefully stop weird flickering bugs when pressing delete or zero-height textareas...	2016-03-17 02:17:17 +00:00
Matthew Hodgson	e9b0539b58	hopefully stop weird flickering bugs when pressing delete or zero-height textareas...	2016-03-17 02:16:39 +00:00
Matthew Hodgson	08618f6ad5	remove start_login_from_guest and instead make logout able to preserve guestCreds	2016-03-17 02:09:49 +00:00
Matthew Hodgson	11a146ed42	oops	2016-03-17 00:07:30 +00:00
Matthew Hodgson	6acfc8f508	comment currentlyActive	2016-03-17 00:06:53 +00:00
Matthew Hodgson	50e33d30b6	never try to tab-complete yourself, doofus	2016-03-16 23:35:01 +00:00
Matthew Hodgson	500b88dc36	implement currently_active	2016-03-16 22:44:54 +00:00
Matthew Hodgson	ce833c9bba	deobfuscate last_active_ago ordering	2016-03-16 22:26:20 +00:00
Matthew Hodgson	2265d1a82a	fix display of null last_active_ago timestamps	2016-03-16 22:25:57 +00:00
Aviral Dasgupta	bd7f56007a	Bring up MemberInfo on avatar click in EventTile ... Fixes vector-im/vector-web#1174	2016-03-17 02:45:38 +05:30
Matthew Hodgson	87e1bc2f07	fix zero-length /me	2016-03-16 19:52:43 +00:00
Matthew Hodgson	4571c64413	fix zero-length /me	2016-03-16 19:52:24 +00:00
Matthew Hodgson	8f967d6e23	make MemberTiles actually update in realtime\n\nFixes https://github.com/vector-im/vector-web/issues/730 and all its dups	2016-03-16 19:32:48 +00:00
Matthew Hodgson	bb918f198b	don't let uses change HS/IS URL in the middle of registration - fixes https://github.com/vector-im/vector-web/issues/1176	2016-03-16 19:14:28 +00:00
Matthew Hodgson	74acc0b564	keep the existing colour scheme	2016-03-16 18:58:04 +00:00
Matthew Hodgson	6016ba70d9	Merge pull request #221 from aviraldg/feature-sync-status ... Display sync status in favicon and title.	2016-03-16 18:56:57 +00:00
Matthew Hodgson	81674684bb	Merge pull request #217 from matrix-org/matthew/disable-room-settings ... grey out roomsettings that you can't edit	2016-03-16 14:42:13 +00:00
Matthew Hodgson	74aad34dfb	Merge pull request #220 from matrix-org/matthew/cancellable-upgrade ... allow registration and login from guest to be cancellable	2016-03-16 14:38:00 +00:00
Matthew Hodgson	90aa4223f2	merge develop	2016-03-16 14:37:12 +00:00
Matthew Hodgson	1aa84f2d15	switch to roomState.mayClientSendStateEvent	2016-03-16 13:10:45 +00:00
Matthew Hodgson	4db79edb73	oops, use right signature for roomState.maySendStateEvent	2016-03-16 12:17:07 +00:00
Matthew Hodgson	014ea9a328	switch to using MatrixClientPeg.get().maySendStateEvent() everywhere	2016-03-16 12:09:26 +00:00
Matthew Hodgson	b58a1707cb	Merge pull request #219 from matrix-org/matthew/fix-guest-upgrade ... let registering guests either upgrade or create a new account by spec…	2016-03-16 11:58:44 +00:00
Matthew Hodgson	b457a4e4a2	improve semantics for when the 'return to app' prompt is shown	2016-03-16 11:48:32 +00:00
David Baker	43fd13b9d7	Merge pull request #187 from matrix-org/dbkr/may_send_state_event ... Remove (broken, as it turns out) permission logic from react sdk	2016-03-16 10:40:07 +00:00
Matthew Hodgson	795435b1ce	DOH	2016-03-16 10:33:20 +00:00
Aviral Dasgupta	b47ea1ca4b	Color for sync status, less scary message	2016-03-16 06:32:49 +05:30
Aviral Dasgupta	47c3419c0e	Display sync status in favicon and title ... Signed-off-by: Aviral Dasgupta <me@aviraldg.com>	2016-03-16 05:31:50 +05:30
Matthew Hodgson	d8af6ec240	hide 3PID settings from guests	2016-03-15 23:57:42 +00:00
Matthew Hodgson	25bf4030de	stop guests from setting avatars	2016-03-15 23:55:59 +00:00
Matthew Hodgson	0e1186c4f9	display m.room.history_visibility updates in the timeline	2016-03-15 23:47:40 +00:00
Matthew Hodgson	5f68f1313b	show warning if guest login disabled	2016-03-15 23:01:59 +00:00
Matthew Hodgson	bae23c78de	fix https://github.com/vector-im/vector-web/issues/1040 and https://github.com/vector-im/vector-web/issues/833	2016-03-15 22:42:22 +00:00
Matthew Hodgson	2bedece9a1	argh, remove debugging	2016-03-15 22:15:04 +00:00
Matthew Hodgson	b7726d34d5	allow registration and login from guest to be cancellable	2016-03-15 21:04:11 +00:00
Matthew Hodgson	f66dd69710	oops, revert - do this on the right branch...	2016-03-15 18:40:03 +00:00
Matthew Hodgson	b23cad5613	let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161	2016-03-15 18:36:13 +00:00
Matthew Hodgson	f70eec62d1	let registering guests either upgrade or create a new account by specifying a new username. fixes https://github.com/vector-im/vector-web/issues/1161	2016-03-15 18:35:09 +00:00
Matthew Hodgson	672a5cb89c	Merge pull request #200 from matrix-org/matthew/loginfixes ... Bring back lost functionality on login/register/password-reset screens	2016-03-15 15:21:32 +00:00
Matthew Hodgson	59866a2006	final PR feedback	2016-03-15 15:20:51 +00:00
David Baker	836f7ca80d	Merge pull request #218 from matrix-org/session_logged_out ... Handle the new Session.logged_out event.	2016-03-15 14:51:50 +00:00
Matthew Hodgson	438558da55	PR feedback	2016-03-15 13:48:46 +00:00
Matthew Hodgson	1a74b0c487	Merge pull request #216 from matrix-org/matthew/fix-join-by-room-alias ... hopefully fix https://github.com/vector-im/vector-web/issues/819	2016-03-15 13:16:51 +00:00
David Baker	a1b875bb25	Handle the new Session.logged_out event. Log the user out and display a message telling them they've been logged out. ... Requires https://github.com/matrix-org/matrix-js-sdk/pull/100 (but safe without) Fixes https://github.com/vector-im/vector-web/issues/414	2016-03-15 10:48:16 +00:00
Richard van der Hoff	8ea75277e1	Merge pull request #215 from matrix-org/rav/fix_scroll_on_resize ... Adjust the scroll position when the gemini panel is resized	2016-03-15 09:59:44 +00:00
Matthew Hodgson	8a905dec58	grey out roomsettings that you can't edit	2016-03-15 02:46:17 +00:00
Matthew Hodgson	7c598d90b1	give proper error message on failing to start chat	2016-03-15 02:19:27 +00:00
Matthew Hodgson	1abd7f45ce	fix setting custom power levels	2016-03-15 01:34:49 +00:00
Matthew Hodgson	5e050c6276	hopefully fix https://github.com/vector-im/vector-web/issues/819	2016-03-15 00:49:44 +00:00
Matthew Hodgson	79eb54058f	oops, backout WIP	2016-03-15 00:48:19 +00:00
Matthew Hodgson	005ebbd037	stop avatar mxids being copy-pastable (unless they contain an initial). should significantly improve https://github.com/vector-im/vector-web/issues/893	2016-03-15 00:21:05 +00:00
Richard van der Hoff	ce150646e6	Merge branch 'develop' into rav/fix_scroll_on_resize	2016-03-14 22:32:54 +00:00
Richard van der Hoff	3173898bc1	Bump the timeline limit to 500 ... ... so that matthew can ctrl-f	2016-03-14 15:47:09 +00:00
Richard van der Hoff	61cd66304e	Adjust the scroll position when the gemini panel is resized ... Make sure we restore the scroll state of the message panel when it is resized	2016-03-14 15:29:29 +00:00
Richard van der Hoff	8a4a810d1f	Merge pull request #214 from matrix-org/rav/gemini-resize ... Use our fork of react-gemini-scrollbar to fix resize issues	2016-03-14 13:59:11 +00:00
Richard van der Hoff	74bbb81532	Merge pull request #212 from matrix-org/rav/fix_search_position ... Put direct-linked events and search clickthroughs in the middle	2016-03-14 12:49:21 +00:00
Richard van der Hoff	88b3f2ed8c	Use our fork of react-gemini-scrollbar to fix resize issues ... Rather than telling react-gemini-scrollbar to update every time something that changes its size happens, try out our fork of it which uses some hackery to listen for resizes.	2016-03-14 12:46:13 +00:00
Matthew Hodgson	893e338917	incorporate keganfeedback	2016-03-12 19:49:54 +00:00
David Baker	e0c416ee01	Merge pull request #213 from matrix-org/dbkr/redacted_3pid_invite_crash ... Don't crash on redacted (or otherwise invalid) 3pid invites	2016-03-11 14:39:43 +00:00
David Baker	1131b82414	Don't crash on redacted (or otherwise invalid) 3pid invites	2016-03-11 14:18:30 +00:00
David Baker	1516f17af4	Merge pull request #210 from matrix-org/dbkr/invite_display_when_peekable ... Show the invite preview bar when we have a 3pid invite	2016-03-11 10:21:04 +00:00
David Baker	15170f8718	Comment how we're not rejecting 3pid invites	2016-03-11 10:20:52 +00:00
David Baker	73781f5619	doc inviterName	2016-03-10 17:43:20 +00:00
Richard van der Hoff	5e7eb3ee92	Stop video tags autoplaying. ... Properly, this time Fixes https://github.com/vector-im/vector-web/issues/995	2016-03-10 17:38:52 +00:00
Richard van der Hoff	3fd066c2d4	Put direct-linked events and search clickthroughs in the middle ... We need two modes of operation for ScrollPanel.scrollToToken: For jump-to-read-marker, we want it 1/3 of the way down the screen. For search clickthrough, and hyperlinked events, we want put the event in the *middle* of the screen. Fixes https://github.com/vector-im/vector-web/issues/1032	2016-03-10 17:27:46 +00:00
David Baker	2875fa3eb1	Show the invite preview bar when we have a 3pid invite, and make the reject button work.	2016-03-10 15:56:58 +00:00
Richard van der Hoff	f9e753f57a	Update the gemini panel when we show/hide the TopUnreadMessagesBar ... Showing/hiding the TopUnreadMessagesBar resizes the scrollpanel. Make sure that we update the gemini panel when this happens. (Fixes an intermittent bug wherein we could get stuck with a 'scroll to bottom' indicator after jumping to the bottom, with unread messages in the view)	2016-03-10 15:55:03 +00:00
Richard van der Hoff	7660276b54	Merge pull request #209 from matrix-org/rav/local_echoes_are_today ... Use 'today' for the date separator for unsent messages	2016-03-10 14:34:18 +00:00
Richard van der Hoff	a841991952	Merge pull request #208 from matrix-org/rav/missing_date_separator ... Fix the missing date separator at the start of rooms	2016-03-10 14:19:52 +00:00
Richard van der Hoff	928b2bb9a7	Use 'today' for the date separator for unsent messages ... Fixes https://github.com/vector-im/vector-web/issues/1087, though we'll still have problems if the unsent messages get out of order.	2016-03-10 14:16:31 +00:00
Richard van der Hoff	3bd33d0985	Fix the missing date separator at the start of rooms ... When we first hit the start of the room, we still have a pagination token, so we hide the date separator. When we try to backpaginate again, we get an empty result, and the pagination token is cleared. Make sure that we update state. canBackPaginate even when there are no new results, to handle this case. Fixes https://github.com/vector-im/vector-web/issues/1014	2016-03-10 13:42:46 +00:00
David Baker	f997a6fff2	Merge pull request #206 from matrix-org/dbkr/invites_silently_fail ... Make 3pid invite failures show errors	2016-03-10 10:07:47 +00:00
David Baker	a74e7b45d0	Return the promise so the failure actually propagates through the promise chain. Makes the invite error handling code work. ... Fixes https://github.com/vector-im/vector-web/issues/691	2016-03-09 18:48:38 +00:00
Richard van der Hoff	ec2e27a754	Merge pull request #205 from matrix-org/rav/shouldComponentUpdates_2 ... Re-introduce shouldComponentUpdate methods in RoomView and TimelinePanel	2016-03-09 17:25:11 +00:00
Richard van der Hoff	aabdaa737e	Merge pull request #204 from matrix-org/rav/jump_to_read_marker_fix ... Make jump-to-read-marker work when the RM event isn't loaded.	2016-03-09 16:12:16 +00:00
Richard van der Hoff	4b333d2363	Update the timeline when a local echo arrives	2016-03-09 15:56:54 +00:00
Richard van der Hoff	6c928f12b2	ForceUpdate the scrollpanel when the aux panel changes size ... Catch some more cases when we ought to be updating the gemini scroll stuff.	2016-03-09 15:56:54 +00:00
Richard van der Hoff	393e8ff612	Revert "Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates"" ... Put the shouldComponentUpdate methods back in, now that Matthew has stopped demoing. This reverts commit 606fdcb8df.	2016-03-09 15:56:53 +00:00
Richard van der Hoff	a9da0a014e	Merge pull request #203 from matrix-org/rav/optimize_resize ... Don't forceUpdate the message panel on resize	2016-03-09 15:55:33 +00:00
Richard van der Hoff	1a371b346e	remove spurious debug	2016-03-09 15:51:17 +00:00
David Baker	d54ee4f247	Merge pull request #201 from matrix-org/dbkr/reuse_guest_account ... Use the guest access tokens sent in 3pid invite emails.	2016-03-09 15:49:30 +00:00
Richard van der Hoff	b45c256427	Don't forceUpdate the message panel on resize ... We don't really need to forceUpdate() the entire timeline panel every time something might resize it. It is sufficient to forceUpdate the ScrollPanel.	2016-03-09 15:40:19 +00:00
Richard van der Hoff	f60ac2aa5f	Make jump-to-read-marker work when the RM event isn't loaded. ... If the event corresponding to the read-up-to mark hasn't been loaded into the timeline window, we can't simply scroll to it. Instead, reload the timeline, centered on the RM event. Fixes https://github.com/vector-im/vector-web/issues/1055	2016-03-09 07:54:49 +00:00
Richard van der Hoff	6e23623c28	Fix checkScroll after image load ... Make the onImageLoad handler call checkScroll on the right thing. This was originally done in commit 99d2392, but got broken in the Great RoomView Refactor of February 2016.	2016-03-07 22:23:14 +00:00
Richard van der Hoff	606fdcb8df	Revert "Merge pull request #193 from matrix-org/rav/shouldComponentUpdates" ... This reverts commit a7c75b1315, reversing changes made to b66ca74ede. This is causing breakage in the messagepanel screen resize after video call and room settings	2016-03-07 17:28:50 +00:00
David Baker	42a90f49c2	Use the guest access tokens sent in 3pid invite emails.	2016-03-07 17:11:01 +00:00
David Baker	a2c6bd0e6c	Merge pull request #199 from mebjas/develop ... fixed issue vector-im/vector-web 1079	2016-03-07 16:15:45 +00:00
Minhaz A V	7e7493b336	removed typeof and todo ... Signed-off-by: Minhaz A V <minhazav@gmail.com>	2016-03-07 21:16:35 +05:30
Richard van der Hoff	a7c75b1315	Merge pull request #193 from matrix-org/rav/shouldComponentUpdates ... Add shouldComponentUpdate() methods to RoomView and TimelinePanel	2016-03-07 11:50:38 +00:00
Matthew Hodgson	a82d3710d1	provide sensibile defaults for PasswordLogin	2016-03-06 18:42:09 -05:00
Matthew Hodgson	0bb58dd60c	brings back the functionality in login/register/screens that got lost in @kegsay's refactor. specifically: ... 1) custom HS/IS urls are now persisted in HTML5 local storage. As a result, all the login components now distinguish between default HS/IS URLs and custom specified ones again. ( 2) custom HS/IS urls are synchronised between the instances of ServerConfig found in the Login, Registration and Forgot Password screens. 3) username are persisted over changing homeserver (but not password, to stop accidentally leaking passwords to the wrong server) 4) correctly interpret a blank URL field as meaning the placeholder text 5) when toggling custom URLs on and off, remember what the custom values were, and use the default URLs if custom mode is not engaged also, guest access now upholds custom HS/IS URLs found in local storage rather than being limited to the server config () also adds assorted comments and improved console debug and a few minor cosmetic changes to the login components. this commit sponsored by VS27...	2016-03-06 14:33:36 -05:00
Minhaz A V	3c1312a9e6	fixed issue vector-im/vector-web 1079	2016-03-05 23:36:24 +05:30
Matthew Hodgson	b66ca74ede	fix comments	2016-03-05 02:35:17 +00:00
Richard van der Hoff	7820a5d900	Merge pull request #189 from matrix-org/rav/fix_timeline_react_keys ... Flatten arrays of components before adding to messagepanel li	2016-03-04 17:56:18 +00:00
Richard van der Hoff	318bcb1284	Merge pull request #192 from matrix-org/rav/fix_read_receipts ... Make sure we update the timelinepanel when a read-receipt arrives	2016-03-04 17:55:29 +00:00
Richard van der Hoff	1738fab2ee	Merge pull request #190 from matrix-org/rav/reduce_timeline_limit ... Reduce the number of messages we show in the DOM to 250	2016-03-04 17:54:59 +00:00
David Baker	66bed45e67	Merge pull request #195 from matrix-org/dbkr/reenable_upgrade_registration ... Re-enable upgrade registration.	2016-03-04 17:54:50 +00:00
David Baker	b9f508a61e	Merge pull request #197 from matrix-org/dbkr/starting_room_alias_tidy ... Tidy up starting from a room alias when not logged in.	2016-03-04 17:54:37 +00:00
David Baker	068429f3e3	Tidy up starting from a room alias when not logged in.	2016-03-04 17:37:06 +00:00
Matthew Hodgson	fcf17adf14	hopefully fix bug186 by ensuring room members never have null users	2016-03-04 16:57:20 +00:00
David Baker	4da0e2fd95	Re-enable upgrade registration. ... Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.	2016-03-04 15:41:32 +00:00
Richard van der Hoff	bc5ae6a6ad	Add shouldComponentUpdate() methods to RoomView and TimelinePanel ... This will avoid re-rendering the whole RoomView every time we get a scroll event, and might even help with https://github.com/vector-im/vector-web/issues/1056.	2016-03-04 14:51:55 +00:00
Richard van der Hoff	31df97e486	Make sure we update the timelinepanel when a read-receipt arrives ... Fixes https://github.com/vector-im/vector-web/issues/1094	2016-03-04 14:47:11 +00:00
Richard van der Hoff	c14b62ee64	Reduce the number of messages we show in the DOM to 250 ... ... as per https://github.com/vector-im/vector-web/issues/1077	2016-03-04 14:07:18 +00:00
Richard van der Hoff	6e86d7553f	Flatten arrays of components before adding to messagepanel li ... Avoid updating the whole DOM when we paginating by making sure the keys are right	2016-03-04 13:49:15 +00:00
David Baker	5b505cd32d	Remove (broken, as it turns out) permission logic from react sdk and use https://github.com/matrix-org/matrix-js-sdk/pull/94 instead.	2016-03-03 17:58:41 +00:00
Matthew Hodgson	05a3dab528	fix roomavatars on FF	2016-03-03 16:16:40 +00:00
Matthew Hodgson	27fea6bc95	make the newly invited warning prettier	2016-03-03 15:02:11 +00:00
Matthew Hodgson	cfd6546fe9	default missing state_default to 50, as per https://github.com/matrix-org/matrix-doc/pull/286/files	2016-03-03 12:11:22 +00:00
David Baker	45857fa12c	Remove unused voice & video on-clicks from RoomHeader.	2016-03-02 14:54:38 +00:00
David Baker	0051c91126	Merge pull request #183 from matrix-org/dbkr/3pid_invite_metadata ... Pass room metadata from 3pid invite emails all the way through to the…	2016-03-02 14:31:58 +00:00
David Baker	c585b3edee	anothert stray room_	2016-03-02 14:31:01 +00:00
David Baker	de2eaa3078	Document inviterName	2016-03-02 14:04:51 +00:00
David Baker	5827a883bf	This should be just oob_data too	2016-03-02 14:02:36 +00:00
David Baker	4184158a9a	Make comment match reality, attempt 2.	2016-03-02 14:01:21 +00:00
David Baker	6319c85272	Make comment match reality	2016-03-02 13:59:55 +00:00
David Baker	5bd2316e7f	Oops, it's just oob_data here	2016-03-02 13:58:52 +00:00
David Baker	2dbed2aa02	Clarify when room / oobData can/can't be set	2016-03-02 11:59:17 +00:00
David Baker	d61f383748	Oops, actually assign variable	2016-03-02 11:57:05 +00:00
David Baker	acb5f5d69b	This should be props, not state	2016-03-02 11:56:18 +00:00
David Baker	7ae2c5b11b	Document fields of oob_data	2016-03-02 11:51:47 +00:00
David Baker	10b1b6443d	Fix rooms we don't have any info about	2016-03-02 10:59:54 +00:00
David Baker	9085a2a866	Pass room metadata from 3pid invite emails all the way through to the relevant components so we can display it.	2016-03-01 18:23:57 +00:00
Richard van der Hoff	1e3040d19a	Fix a race condition handling gappy syncs ... We had a problem handling gappy syncs: resetting the timeline would trigger a pagination request (which would return no results, because there are no events at this point); this would make the pagination requests which are spawned when we process the events in the sync get ignored - with the result that we get a blank window. The fix is to avoid the ScrollPanel when we are processing new live events and tell the TimelineWindow to paginate itself directly.	2016-03-01 10:52:56 +00:00
Richard van der Hoff	dc9a7e5e28	Merge pull request #181 from matrix-org/rav/issue_1049 ... Fix CallView in left panel	2016-02-29 17:51:39 +00:00
Richard van der Hoff	559f60d43e	unmounted check in TimelinePanel	2016-02-29 17:06:38 +00:00
Richard van der Hoff	30abf81ed4	Fix CallView in left panel ... Make CallView cope with not being passed a room. Fixes https://github.com/vector-im/vector-web/issues/1049, introduced in 7a20fda7, which made vector crash when you switched to another room with an active call.	2016-02-29 13:43:22 +00:00
Richard van der Hoff	db1e1c7df0	Fix NPE when re-joining a room ... Fix the length check on state.events	2016-02-26 23:05:41 +00:00
Richard van der Hoff	acfc7b3719	Don't throw exceptions when room changes in a timelinepanel ... This does happen - fortunately only in circumstances where it's not a problem. Downgrade the exception to a warning. Fixes https://github.com/vector-im/vector-web/issues/1036	2016-02-26 22:39:25 +00:00
Richard van der Hoff	543f444174	Merge commit 'd9e58d9' into develop ... Undo an over-zealous force-push :(	2016-02-26 16:31:02 +00:00
Richard van der Hoff	d5c83347a6	Merge pull request #173 from matrix-org/rav/configurable_sync_limit ... Make the initialSyncLimit configurable	2016-02-26 13:57:30 +00:00
Richard van der Hoff	a9d363c668	Merge pull request #180 from matrix-org/rav/optimise_timeline_load ... Make room-switching quicker	2016-02-26 13:29:35 +00:00
Richard van der Hoff	65ecbf93fe	Merge pull request #178 from matrix-org/rav/reset_timeline ... Reload the timeline when we get a gappy sync	2016-02-26 13:28:20 +00:00
Richard van der Hoff	0d1c85eb7c	Make room-switching quicker ... Avoid delaying a reactor tick when switching rooms, to make room-switching (feel) a bit snappier.	2016-02-26 12:25:46 +00:00
Richard van der Hoff	e634f98a13	Show spinners when forward/back paginating.	2016-02-25 18:44:07 +00:00
Richard van der Hoff	4be29401ce	Reload the timeline when we get a gappy sync ... After a resume from sleep, we don't want to start paginating through the whole timeline. If we were in 'stuckAtBottom' mode before, treat a gappy sync similarly to how we handle the 'scroll to bottom' knob, which is to reload the timelinewindow starting from scratch. Fixes https://github.com/vector-im/vector-web/issues/932, and will probably also fix https://github.com/vector-im/vector-web/issues/943, though I haven't tested it yet.	2016-02-25 18:42:59 +00:00
Richard van der Hoff	2bd6529ca0	Merge remote-tracking branch 'origin/develop' into develop	2016-02-25 18:38:14 +00:00
Will Hunt	081a975d2a	Added ES6 function 'fromCodePoint' to retrive first initial for default avatars that begin with a large unicode character.	2016-02-25 16:23:38 +00:00
Richard van der Hoff	2e5df1a96f	Merge pull request #173 from matrix-org/rav/configurable_sync_limit ... Make the initialSyncLimit configurable	2016-02-25 14:19:31 +00:00
David Baker	e915d7e215	Change some refreshRoomList() calls to dalyed ones to avoid hammering on catchup. ... Fixes https://github.com/vector-im/vector-web/issues/544	2016-02-25 11:06:47 +00:00
Richard van der Hoff	10b55036f9	Merge branch 'rav/roomview_works' into develop ... Implementation of new read-marker semantics (PR #160).	2016-02-24 17:26:46 +00:00
Richard van der Hoff	1959b03104	Land refactored roomview branch 'rav/roomview_works'. ... This branch has been sitting around a while; it includes a substantial refactor of RoomView (into separate MessagePanel and TimelinePanel), as well as a number of fixes.	2016-02-24 16:52:12 +00:00
Richard van der Hoff	1009faf9dc	Merge pull request #171 from matrix-org/rav/typing_notifs_cleanups ... Don't forceUpdate the whole roomview on typing notifs	2016-02-24 16:45:45 +00:00
Richard van der Hoff	7a19bad388	Merge pull request #170 from matrix-org/rav/video_resize ... Factor out a separate auxpanel, and cleanup the maxHeight management	2016-02-24 16:45:25 +00:00
Richard van der Hoff	4ce3598274	Make the initialSyncLimit configurable ... I keep wanting to change this to test things, and can never find the right place to change it. Make it configurable.	2016-02-24 16:42:23 +00:00
Richard van der Hoff	68e0192acc	reinstate event-continuation logic ... Forgot to set prevEvent in the merge from develop, so we were never applying the correct continuation logic.	2016-02-23 18:43:51 +00:00
David Baker	3f51cda846	Register a s a guest even if email invite: this is ok now.	2016-02-23 18:30:35 +00:00
David Baker	e2bafcbf02	Don't redirect to registration on 3pid invite: it's ok to be a guest now.	2016-02-23 18:26:15 +00:00
David Baker	b2b7354018	Comment guest access initial state	2016-02-23 18:10:48 +00:00
David Baker	418bf8e39c	Allow guest access by default (by specifying initial state) as rooms are private by default so they'd have to be invited to join. People can't get a 3pid invite & join as guest without this.	2016-02-23 17:55:45 +00:00
David Baker	b384d8c91a	Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites ... Wire up support for keypair 3pid invites.	2016-02-23 16:37:55 +00:00
Richard van der Hoff	07822e20cb	Don't forceUpdate the whole roomview on typing notifs ... updating the roomview is expensive, so we shouldn't do it every time we get a typing notification (which may or may not correspond to a user in this room). Push it down to RoomStatusBar, and use a state var to keep track of it.	2016-02-23 16:17:50 +00:00
Richard van der Hoff	7a20fda7e7	Factor out a separate auxpanel, and cleanup the maxHeight management ... Basically two changes here: 1. Factor out auxpanel from RoomView 2. Rather than setting maxHeight attributes by poking directly into the DOM, pass them down as properties.	2016-02-23 15:54:15 +00:00
Richard van der Hoff	d599c8fbd2	Merge remote-tracking branch 'origin/develop' into rav/roomview_works	2016-02-23 13:37:21 +00:00
Richard van der Hoff	ac4b36c0dd	Merge commit '99d2392' into rav/roomview_works ... Conflicts: src/components/structures/RoomView.js	2016-02-23 13:32:23 +00:00
Richard van der Hoff	4a22fb9763	Merge commit '26e6632' into rav/roomview_works	2016-02-23 13:25:09 +00:00
Richard van der Hoff	21850d7e2f	Merge commit 'd7b3a24' into rav/roomview_works	2016-02-23 13:24:58 +00:00
Richard van der Hoff	9eff426819	Merge commit '71e2495' into rav/roomview_works ... Conflicts: src/components/structures/RoomView.js	2016-02-23 13:24:38 +00:00
Richard van der Hoff	6aaced04fa	Merge commit 'd2a731e' into rav/roomview_works	2016-02-23 13:02:26 +00:00
Richard van der Hoff	776b6a26c3	Merge commit '9a0ea56' into rav/roomview_works ... Conflicts: src/components/structures/RoomView.js	2016-02-23 13:02:02 +00:00
Richard van der Hoff	b1093f3f4b	Merge commit 'e972686' into rav/roomview_works	2016-02-23 12:57:53 +00:00
Richard van der Hoff	4c571cf1bf	Merge commit 'eb91faf' into rav/roomview_works ... Conflicts: src/components/structures/RoomView.js	2016-02-23 12:56:54 +00:00
Richard van der Hoff	7f4f30d7d5	Merge commit 'e3feae3' into rav/roomview_works	2016-02-23 12:01:53 +00:00
Richard van der Hoff	3acfab48fc	Merge commit '014acba' into rav/roomview_works ... Conflicts: src/components/structures/RoomView.js	2016-02-23 12:00:54 +00:00
Richard van der Hoff	8161a18efd	Merge commit 'b1a6575' into rav/roomview_works	2016-02-23 11:56:51 +00:00
Richard van der Hoff	d673249681	Wire up StatusBar size changes to a geminipanel update ... When the statusbar changes size, we need to tell the gemini panel to update. This is slightly tortuous as figuring out the size of the statusbar isn't completely trivial. Fixes https://github.com/vector-im/vector-web/issues/945 and https://github.com/vector-im/vector-web/issues/986	2016-02-23 11:06:16 +00:00
David Baker	ac9f0f204d	Wire up support for keypair 3pid invites.	2016-02-23 10:15:07 +00:00
Richard van der Hoff	99d2392b6f	Update the scroll offset when images load ... In order to deal with image-loading reshaping the DOM, wire up ScrollPanel.checkScroll to the image load events. Fixes https://github.com/vector-im/vector-web/issues/984	2016-02-22 17:43:33 +00:00
Richard van der Hoff	26e66326a2	Link search results to the right room ... Fixes https://github.com/vector-im/vector-web/issues/980	2016-02-22 12:54:22 +00:00
David Baker	d7b3a24c18	Merge pull request #165 from matrix-org/dbkr/read_receipt_send_ignore_implicit ... Fix stuck notification bug	2016-02-19 16:20:12 +00:00
David Baker	71e2495e81	Use new flag in js-sdk to look at the last read receipt the server actually has and ignore implicit ones, otherwise we can end up not sending an RR because we think there's already a more recent one, even though that one is implicit.	2016-02-19 14:45:02 +00:00
Matthew Hodgson	b4fe9473d5	improve error messages when failing to talk to a HS	2016-02-19 14:17:41 +00:00
Matthew Hodgson	a44ef5bd48	fix incomingCallBox vertical offset if MatrixToolbar is present	2016-02-19 02:21:17 +00:00
Matthew Hodgson	957ef9cdc8	fix self-highlight	2016-02-19 01:56:03 +00:00
Matthew Hodgson	d2a731e255	only resize the video element if not fullscreen	2016-02-19 01:18:53 +00:00
Matthew Hodgson	7f310ce307	fix nasty overscroll bug on video element caused by inline v. block	2016-02-19 01:18:37 +00:00
Matthew Hodgson	dc94df4b06	accomodate 800px wide thumbs and support horizontal scaling	2016-02-18 19:09:58 +00:00
Matthew Hodgson	12f5407392	remove ... in error view	2016-02-18 18:16:48 +00:00
Matthew Hodgson	9a0ea56bba	don't suppress conf join/parts	2016-02-18 00:07:35 +00:00
Richard van der Hoff	e9726865fc	Merge pull request #162 from matrix-org/rav/keep_redactions ... Handle redacted events	2016-02-17 21:42:39 +00:00
Richard van der Hoff	c4176ab706	Merge pull request #163 from matrix-org/rav/fix_search_clickthrough ... Fix search clickthrough for HTML events	2016-02-17 21:35:39 +00:00
Richard van der Hoff	e3feae32e1	Fix search clickthrough for HTML events ... Switch to using a normal <a href="..."> link for search result clickthrough. Apart from generally giving a better experience, this means that it also works on html messages. The problem there was that we were attaching onClick handlers to <span>s which we were then flattening into HTML with ReactDOMServer (which meant the onClick handlers were never attached to React's list of listeners). To make this work without jumping through React hoops, the highlighter now returns either a list of strings or a list of nodes, depending on whether we are dealing with an HTML event or a text one. We therefore have a separate HtmlHighlighter and TextHighlighter.	2016-02-17 21:06:27 +00:00
Matthew Hodgson	b087157855	Merge branch 'develop' into rav/update_status_bar	2016-02-17 18:38:47 +00:00
Matthew Hodgson	38a2a61b38	back out hacky previous commit as #946 only happens when gemini is disabled	2016-02-16 19:39:22 +00:00
Matthew Hodgson	34d0fc890a	disable scroll-to-token entirely temporarily - https://github.com/vector-im/vector-web/issues/946	2016-02-16 17:39:32 +00:00
Richard van der Hoff	eb91faf554	Handle redacted events ... matrix-js-sdk now retains redacted events. Filter them out of the timeline. Also put empty placeholders in the dom so that if we try to scroll to a redacted event, we don't end up blowing up.	2016-02-16 16:08:52 +00:00
Richard van der Hoff	db09d3d9e4	Move ghost-read-marker logic to MessagePanel	2016-02-15 23:05:58 +00:00
Richard van der Hoff	63511d4e71	Refactor the EventTile loop ... ... so that it's a bit more tractable.	2016-02-15 23:05:42 +00:00
Richard van der Hoff	06133b0467	Add a null guard for matrix client TimelinePanel.componentWillUnmount ... client can be null when unmounting	2016-02-15 23:04:21 +00:00
Matthew Hodgson	4b8b2ade8b	fix login-on-guest-bar-NPE crash https://github.com/vector-im/vector-web/issues/930	2016-02-15 21:50:39 +00:00
Matthew Hodgson	ca56b7ec2d	match partial names in memberlist	2016-02-15 20:43:43 +00:00
Matthew Hodgson	61018f4f38	whitespace	2016-02-15 20:42:44 +00:00
Richard van der Hoff	ab9690d3b0	Don't re-tint on unmount ... Need to remember the 'ref' function is called on unmount too - we shouldn't retint back to the room colours at this point.	2016-02-15 20:40:34 +00:00
Matthew Hodgson	6b48b626e6	fix spinner of doom	2016-02-15 20:39:02 +00:00
Matthew Hodgson	576de32ce4	show vaguely accurate default avatar	2016-02-15 22:01:22 +02:00
Matthew Hodgson	dfbc88d421	fix keyboard shortcuts on logout prompt	2016-02-15 22:01:05 +02:00
Matthew Hodgson	0d153df417	improve registration fail error msg slightly	2016-02-15 21:58:37 +02:00
Matthew Hodgson	014acbab1f	restore drag & drop file upload, broken by @richvdh's new timeline stuff	2016-02-15 21:16:04 +02:00
Matthew Hodgson	b1a6575b1d	remove ugly join & reject error msgs in favour of modal dialogs	2016-02-15 20:59:44 +02:00
Matthew Hodgson	30e9c76089	login as guest button on the login page	2016-02-15 20:44:13 +02:00
Matthew Hodgson	e17d77778f	sanitize setting displayname prompt	2016-02-15 19:37:03 +02:00
Richard van der Hoff	b766055f2f	Merge branch 'develop' into rav/roomview_works	2016-02-15 17:24:15 +00:00
Matthew Hodgson	0c7573629a	spell out that you can invite email addresses	2016-02-15 11:13:37 +02:00
Matthew Hodgson	0a37f1c478	improve the fix for https://github.com/vector-im/vector-web/issues/917	2016-02-15 09:52:57 +02:00
Matthew Hodgson	9d3b0f6075	fix https://github.com/vector-im/vector-web/issues/913	2016-02-15 00:37:59 +02:00
Matthew Hodgson	5e5fdb9b96	fix vector-im/vector-web#921	2016-02-14 13:38:12 +02:00
Richard van der Hoff	0e0d0cf4f5	post-review tweaks	2016-02-11 15:38:13 +00:00
Richard van der Hoff	f2377fa9fe	Factor out a TimelinePanel from RoomView	2016-02-10 18:41:48 +00:00
Richard van der Hoff	c3692378fa	Factor a stateless messagepanel out from RoomView	2016-02-10 18:41:47 +00:00
David Baker	f016a327b1	Merge pull request #152 from matrix-org/dbkr/fix_room_settings_guest_exception ... Don't try to fetch push rules if we're a guest: it throws.	2016-02-10 12:34:08 +00:00
David Baker	1e945cd13b	Don't show the Notifications widget for guests since they can't use them (and it throws an error if you try to mount it).	2016-02-10 11:48:35 +00:00
David Baker	038f613079	Don;t try to fetch push rules if we're a guest: it throws.	2016-02-10 11:16:36 +00:00
Richard van der Hoff	0d2b042c0f	Merge pull request #148 from matrix-org/rav/keep_scrolling ... Don't stop scrolling at the read-up-to mark.	2016-02-10 10:20:03 +00:00
David Baker	bd73c4e0cc	Merge pull request #151 from matrix-org/dbkr/spinner_while_joining ... Joining a room can take a while. Show a spinner…	2016-02-09 17:45:09 +00:00
David Baker	af0597e0c8	Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city.	2016-02-09 16:55:03 +00:00
David Baker	b4a7124686	Add a null check here since room can be null and this was throwing	2016-02-09 16:48:12 +00:00
Richard van der Hoff	f48f28eefe	Kill another scrollToToken ... Missed a place where we were scrolling the messagepanel manually	2016-02-09 15:50:09 +00:00
Richard van der Hoff	576b59be66	Kill off the remains of auto_peek ... Remove some dead code.	2016-02-09 15:45:41 +00:00
Richard van der Hoff	178e99385a	Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling	2016-02-09 14:52:38 +00:00
Richard van der Hoff	30b4b91cf3	Show jump-to-bottom icon even when there is other stuff in the status bar ... Also includes a general simplification of the classes being used in the status bar. This should fix vector-im/vector-web#879. Obviously it needs corresponding changes in the CSS in vector-web.	2016-02-09 14:45:30 +00:00
Richard van der Hoff	7fd56351a9	Fix 'unread messages' in status ... This got broken in the previous commit	2016-02-09 12:40:11 +00:00
Richard van der Hoff	194110dd71	Merge pull request #147 from matrix-org/rav/factor_out_statusbar ... Factor the statusbar implementation out of RoomView.	2016-02-09 11:38:40 +00:00
Richard van der Hoff	81e95ca8c1	Wire up jump-to-bottom knob ... ... which I embarassingly forgot	2016-02-09 11:36:57 +00:00
Richard van der Hoff	8641dab756	Don't stop scrolling at the read-up-to mark. ... We want to keep things scrolling up after the read-up-to mark hits the middle of the screen. Do this by giving the ScrollPanel a stickyBottom (provided we're not in old history) instead of updating the scroll position when RRs arrive. Also, when we switch back to a room, if there was no special scroll state, jump to the end of the timeline instead of the RR mark.	2016-02-09 11:08:26 +00:00
Kegsay	da81d240e2	Merge pull request #146 from matrix-org/kegan/warning-bars-dom ... Use constant div nesting when warning bars appear	2016-02-09 11:03:31 +00:00
Richard van der Hoff	1d9c88698f	Factor the statusbar implementation out of RoomView ... ... because RoomView must die	2016-02-08 18:08:19 +00:00
Kegan Dougal	ecaa2c1e11	Fix the mess of warning bars so it doesn't trigger remounts of alllll the components	2016-02-08 17:20:52 +00:00
Richard van der Hoff	3ca2bbe31e	Drop a redundant 'else' from RoomView.render, and outdent a load of code ... ... in the hope of aiding readability slightly	2016-02-08 16:43:08 +00:00
David Baker	a2e50eb496	Merge pull request #143 from matrix-org/dbkr/fix_display_name_prompt_when_peeking ... Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined.	2016-02-08 16:03:37 +00:00
David Baker	9bf8f37e5f	explicitly check join status as it's clearer	2016-02-08 16:03:04 +00:00
Kegan Dougal	2027ed9f49	Fix bug where clicking on the email tile didn't work	2016-02-08 15:21:23 +00:00
Kegan Dougal	70ed0be389	Merge branch 'develop' into kegan/invite-autocompleting-race	2016-02-08 15:06:13 +00:00
Kegan Dougal	3fa23798ea	Split out invite memberlist logic into its own component	2016-02-08 15:05:35 +00:00
David Baker	baba500150	Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined. ... Fixes https://github.com/vector-im/vector-web/issues/885	2016-02-08 14:33:10 +00:00
David Baker	05f1e1e205	Merge pull request #140 from matrix-org/dbkr/fix_tab_complete ... Fix tab complete	2016-02-08 14:19:06 +00:00
Kegan Dougal	7ccce1dc91	Reset truncation when the text box is cleared	2016-02-05 16:58:37 +00:00
Kegan Dougal	5dafe1f4a6	Fix canonical alias bug showing the first alias if one was not set. ... <select> rests on the first value if the defaultValue is null. This first value should've been 'not set'.	2016-02-05 16:22:24 +00:00
Kegsay	ac67cd556a	Merge pull request #142 from matrix-org/kegan/truncate-invite-search-list ... Fix vector-im/vector-web#851 by truncating the search results	2016-02-05 15:56:23 +00:00
Kegsay	4ce41f7f6c	Merge pull request #141 from matrix-org/kegan/room-settings-refactor ... Refactor room settings	2016-02-05 15:50:39 +00:00
Kegan Dougal	b99c6b9a97	camelCasePlease	2016-02-05 15:48:04 +00:00
Kegan Dougal	a0c5b30fd6	Fix vector-im/vector-web#851 by truncating the search results	2016-02-05 15:24:51 +00:00
Kegan Dougal	03f19eba55	Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits.	2016-02-05 14:38:28 +00:00
David Baker	500c12b1f2	Fix tab complete ... rate limited functions can't have arguments, so don't pass the room into _updateTabCompleteList as it's always the room in our state.	2016-02-05 14:32:30 +00:00
Kegan Dougal	0cbf9dba87	Glue more things back together	2016-02-05 11:59:19 +00:00
Kegan Dougal	78354d0bc7	Yank out color settings from RoomSettings to ColorSettings	2016-02-05 11:27:11 +00:00
David Baker	9525808cd0	Merge pull request #137 from matrix-org/dbkr/roomlist_unregister_event_handlers ... Unregister some event handlers we'd registered but never unregister.	2016-02-05 10:48:22 +00:00
David Baker	0ae548cf5d	Merge pull request #139 from matrix-org/dbkr/rate_limit_funcs ... Make the function call-rate limiting a generic thing and use it in more places.	2016-02-05 10:15:55 +00:00
David Baker	63776509a6	Make the function call-rate limiting a generic thing and use it in more places.	2016-02-04 18:06:24 +00:00
Richard van der Hoff	5ae532dae2	Merge pull request #138 from matrix-org/rav/update_rr_semantics ... Tweaks to the semantics for sending RRs and handling room switches	2016-02-04 17:42:15 +01:00
Richard van der Hoff	d14c1a82b2	Tweaks to the semantics for sending RRs and handling room switches ... * Only send read receipts when we are at the bottom of a room; this is a simple and effective way of stopping the green bar of doom from jumping down the room slightly behind the scroll. * Jump to read-up-to mark when switching back to a room if we were following the live timeline before.	2016-02-04 16:27:49 +00:00
Kegan Dougal	74e16ac83e	Merge branch 'develop' into kegan/room-settings-refactor	2016-02-04 16:20:24 +00:00
Kegan Dougal	73df5a2828	Modify how checked state is passed around ... Prefer onChange -> setState to ref grabbing so we can expose public setters and not be tied down to certain element implementations.	2016-02-04 16:18:59 +00:00
David Baker	c0d93a78bc	Unregister some event handlers we'd registered but never unregister.	2016-02-04 15:55:24 +00:00
Kegsay	75ff4f0f95	Merge pull request #135 from matrix-org/kegan/sync-limit ... Set the sync limit back to sane levels	2016-02-04 15:47:31 +00:00
David Baker	d1467d2319	Merge pull request #136 from matrix-org/dbkr/prompt_display_name_on_join ... Prompt for display name before joining your first room	2016-02-04 15:32:52 +00:00
Kegan Dougal	4013dae770	Start refactoring RoomSettings ... - Don't manipulate settings in RoomView. Make it RoomSettings' job. - Return Promise[] from AliasSettings.save() rather than an allSettled promise so callers can have more granularity over what to do with it (.all vs .allSettled) - General refactoring of RoomSettings. Most things are broken now and are not submitted. Add util methods to grab values out of events.	2016-02-04 15:26:12 +00:00
David Baker	167da10b8b	address PR comments	2016-02-04 15:07:30 +00:00
David Baker	6e424780f1	typo	2016-02-04 14:38:05 +00:00
David Baker	d0c8dadaf6	Merge pull request #134 from matrix-org/dbkr/fix_preview_bar ... Put the room preview bar back for rooms that aren't peekable	2016-02-04 14:10:18 +00:00
Richard van der Hoff	309f1e2c8f	Merge pull request #131 from matrix-org/rav/search_clickthrough ... Enable clicking on search results to switch to the result in context.	2016-02-04 15:06:39 +01:00
Richard van der Hoff	63b50ed230	Merge pull request #132 from matrix-org/rav/fix_404_on_echo ... Don't try to use local echoes as scroll tokens	2016-02-04 15:05:35 +01:00
Richard van der Hoff	8f5c739886	Clean up scrollToken assignment	2016-02-04 14:05:16 +00:00
Kegan Dougal	f3fa5d6a2a	Set the sync limit back to sane levels	2016-02-04 13:30:25 +00:00
David Baker	b0da54533d	Don't do this check - it's not valid since we set the room in onRoomName	2016-02-04 13:25:45 +00:00
David Baker	891f4761a0	Add comments and only set a room / init the timeline if we don't already have a room	2016-02-04 13:21:42 +00:00
Kegsay	6c9d48bd3a	Merge pull request #128 from matrix-org/kegan/alias-settings ... Split out alias settings into its own component: AliasSettings	2016-02-04 13:14:19 +00:00
David Baker	574560cc05	remove listener on unmount	2016-02-04 13:06:59 +00:00
David Baker	47fef0896f	Prompt for display name before joining your first room (if you haven't set one). ... Fixes https://github.com/vector-im/vector-web/issues/758	2016-02-04 11:49:10 +00:00
David Baker	3c2c2b051b	Listen for Room and use this to init the timeline, not Room.name	2016-02-04 11:29:00 +00:00
David Baker	c9a3ad31ab	Comment error handling	2016-02-04 11:17:39 +00:00
David Baker	5c430395ea	init timeline when we get the room, as otherwise we never load it after joining	2016-02-04 10:50:21 +00:00
David Baker	164c9b9031	Check error to see if it's actually a failure to peek	2016-02-03 16:53:48 +00:00
Kegan Dougal	8b96af4ccb	Display the version in UserSettings. Change MatrixChat.onNewVersion to onVersion	2016-02-03 16:51:53 +00:00
David Baker	cebc2f5306	Put the room preview bar back for rooms that aren't peekable (since we always tried to peek, it would fail which would reject the promise and cause loadingTimeline to stay true forever).	2016-02-03 16:23:57 +00:00
Kegan Dougal	7bdd9f57a5	Add MatrixChat.onNewVersion to trigger the new version bar	2016-02-03 16:16:52 +00:00
Richard van der Hoff	d7576d223d	Don't try to use local echoes as scroll tokens ... Local echoes don't have a (usable) event id, so don't use them when remembering the scroll state of a room.	2016-02-03 15:34:20 +00:00
David Baker	11df2fc285	Merge remote-tracking branch 'origin/develop' into dbkr/no_auto_join	2016-02-03 15:18:18 +00:00
Richard van der Hoff	e747beac58	Enable clicking on search results to switch to the result in context.	2016-02-03 15:06:52 +00:00
Richard van der Hoff	e01d61dfeb	Merge branch 'rav/timeline_window' into rav/link_to_event ... Conflicts: src/components/structures/MatrixChat.js src/components/structures/ScrollPanel.js	2016-02-03 14:12:28 +00:00
Richard van der Hoff	2479c81cf6	Merge remote-tracking branch 'origin/develop' into rav/timeline_window	2016-02-03 14:09:50 +00:00
Richard van der Hoff	c82b364ca8	Address review comments ... Mostly renaming things and adding comments.	2016-02-03 08:03:10 +00:00
Richard van der Hoff	3b1ed3a014	Fix react warnings when a RR animation is happening during room switch ... If the animation of an RR removal is active when we change room, we end up getting a callback after the RoomView has been unmounted. Guard against this to avoid getting React warnings.	2016-02-02 17:59:11 +00:00
David Baker	b0f0d5f6d0	Null check room because those events will be emitted before the room is stored.	2016-02-02 16:34:41 +00:00
Kegsay	20f77d1224	Merge pull request #125 from matrix-org/kegan/trailing-slash ... Strip trailing slashes on HS/IS URLs on register/login	2016-02-02 16:04:19 +00:00
David Baker	1cabe2ec37	Don't auto join rooms: always 'autoPeek' (ie. see if we can peek, otherwise offer to join)	2016-02-02 15:50:15 +00:00
David Baker	4e4e5be9a1	Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818.	2016-02-02 14:14:18 +00:00
Kegan Dougal	ce789ba962	Split out alias settings into its own component: AliasSettings	2016-02-02 12:46:14 +00:00
David Baker	c187eda832	Don't assert that we're not logged in before starting registration because uprading is now a thing.	2016-02-01 16:53:39 +00:00
Richard van der Hoff	d9e13780b8	Implement direct-to-event linking. ... This adds support for links to particular event ids: add /<eventId> to the URL for a room. This commit also ensures that we scroll to the 'read marker' when switching to a room which has no previous scroll state, as well as preventing that marker from going past the middle of the screen. This also reinstates the preservation of scroll state when switching rooms, which was disabled previously.	2016-02-01 16:31:12 +00:00
Kegan Dougal	e6c93530e2	Strip trailing slashes on HS/IS URLs on register/login	2016-02-01 14:19:20 +00:00
Richard van der Hoff	f0cf5c0aff	Update onRoomTimeline comment	2016-02-01 12:35:41 +00:00
Richard van der Hoff	2c04b9cb5b	Merge pull request #124 from ajohnson23/messages_scrolldown_fix ... Fix improper scrolldown button display issue.	2016-02-01 11:38:14 +01:00
Andrew Johnson	fe9d7d10b9	Fix improper scrolldown button display issue. ... This fixes an intermittent issue where the scrolldown button or "new messages below" button would display even when the messages panel was scrolled to the very bottom. Furthermore, when new messages arrived, the messages panel would not automatically scroll down to show the new messages. Fixes https://github.com/vector-im/vector-web/issues/805	2016-01-29 22:32:32 -05:00
David Baker	7301f53807	Merge pull request #121 from matrix-org/dbkr/fix_registration_guest_access ... Fix registration: don't auto-log in as a guest if we have a URL from …	2016-01-28 16:21:16 +00:00
Kegsay	6bb69ef2d1	Merge pull request #120 from matrix-org/kegan/bulk-email-invite ... Support bulk invitations via text separators	2016-01-28 16:21:05 +00:00
David Baker	401d18bcc6	Fix registration: don't auto-log in as a guest if we have a URL from sydent.	2016-01-28 15:42:14 +00:00
David Baker	640e87e7c5	Merge pull request #117 from matrix-org/dbkr/guest_warning_bar ... Add warning bar for guest users.	2016-01-28 13:44:06 +00:00
David Baker	83119d21d6	New style guest warning bar	2016-01-28 12:59:51 +00:00
Kegsay	12463aec4d	Merge pull request #115 from matrix-org/kegan/fix-3pid-signup ... Redirect to the registration page when landing with ?email=	2016-01-28 12:00:06 +00:00
Kegan Dougal	bdc1028a7e	Support bulk invitations via text separators ... Valid separators are , ; <space>	2016-01-28 11:56:20 +00:00
David Baker	796a2e5e3a	Revert e5f4fa8c46 as it's no longer what's desired.	2016-01-28 11:15:43 +00:00
Richard van der Hoff	a4f4bb9e72	Convert RoomView to using a TimelineWindow ... Instead of using the Room's active timeline directly, use a TimelineWindow. This shouldn't (yet) have much effect, beyond maybe making scrollback after a gappy sync slightly more efficient. For now, I have disabled the 'restoreScrollState' functionality. This will be reinstated once I land the link-to-event code.	2016-01-28 10:53:43 +00:00
Kegan Dougal	81cc30bab2	Null guard because this may not exist in the DOM.	2016-01-28 10:52:08 +00:00
Kegan Dougal	e017559765	New line	2016-01-28 09:58:51 +00:00
David Baker	f745e941ec	Fix exception thrown if any custom tags are set	2016-01-28 09:41:46 +00:00
David Baker	7ea45f9888	Move message count to suffix in title, as requested by @ara4n	2016-01-27 18:03:01 +00:00
David Baker	e5f4fa8c46	Add warning bar for guest users. Fixes https://github.com/vector-im/vector-web/issues/770	2016-01-27 17:58:47 +00:00
David Baker	4661bb0942	Don't show a spinner while we're waiting for the user to do something	2016-01-27 15:44:12 +00:00
David Baker	8360c112fb	Put the favicon badge call in a try block, as per comment	2016-01-27 15:19:25 +00:00
Kegan Dougal	db8fab8019	Redirect to the registration page when landing with ?email= ... Fixes "Missing access token" error.	2016-01-27 10:47:54 +00:00
Matthew Hodgson	c1f28bb6b9	hide 'unknown screen' warning	2016-01-24 19:14:14 +00:00
Matthew Hodgson	6eea1f7f83	try for a simpler invite placeholder look & feel	2016-01-24 19:02:18 +00:00
Matthew Hodgson	872b9be17a	increase truncatelist size to match INITIAL_LOAD_NUM_MEMBERS	2016-01-24 18:24:26 +00:00
Matthew Hodgson	bc60435750	improve settings layout and fix FF bugs	2016-01-24 18:15:08 +00:00
Matthew Hodgson	3da76192a1	title attr	2016-01-24 02:01:45 +00:00
Matthew Hodgson	f15564074c	track whether we're scrolled to bottom or not and display UI for warning & jumping there if needed.	2016-01-24 01:51:01 +00:00
Kegsay	9a6f33861f	Merge pull request #112 from matrix-org/kegan/email-invite-tile ... Add a tile to the invitee list which represents an email tile	2016-01-22 17:35:17 +00:00
Kegan Dougal	437280020c	Turn off autocomplete for search list	2016-01-22 17:32:43 +00:00
Kegan Dougal	e78c1fba87	Hide 'Email: ' is the first char is @	2016-01-22 17:28:23 +00:00
Matthew Hodgson	b19a318b2d	put a black badge on unread notifications, and a red one for unread highlights	2016-01-22 17:22:49 +00:00
Kegan Dougal	c3f786cc5e	Add a tile to the invitee list which represents an email tile	2016-01-22 17:20:52 +00:00
Matthew Hodgson	4631648f26	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop	2016-01-22 17:01:28 +00:00
Matthew Hodgson	24225af416	work around history visibility roomsetting UI some more	2016-01-22 17:01:15 +00:00
Kegsay	2e154c7478	Merge pull request #110 from matrix-org/kegan/3pid-invite-refresh-mlist ... Refresh the membership list on 3PID invites	2016-01-22 16:13:42 +00:00
Kegan Dougal	99da0ef656	Fix vector-im/vector-web#694 - Empty invitee list ... The invitee list is lazy-loaded 50ms after the first render. We were relying on setState from the member lazy-load to also kick the invitee list. However, setState is synchronous and we were loading the invitee list afterwards, which meant that the SearchableEntityList wouldn't have any invitees until the next render().	2016-01-22 16:11:09 +00:00
Kegan Dougal	38d5c7d5c5	Filter out undefined/null children which won't render	2016-01-22 15:57:42 +00:00
Matthew Hodgson	1dd2cbed63	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop	2016-01-22 15:51:34 +00:00
Matthew Hodgson	0bef94a6ce	fudge around https://github.com/vector-im/vector-web/issues/731	2016-01-22 15:51:27 +00:00
Kegan Dougal	675e0f176f	Add onShowMoreRooms prop for kicking gemini	2016-01-22 15:46:38 +00:00
Matthew Hodgson	0bdd674f7f	fix invalid powerlevel setting	2016-01-22 15:29:57 +00:00
Kegan Dougal	366a24bbe4	Refresh the membership list on 3PID invites	2016-01-22 15:11:36 +00:00
Kegan Dougal	7ef1ba0b44	Unbreak RoomHeader	2016-01-22 11:48:26 +00:00
Kegan Dougal	f213901e29	Return early when calculating one-to-one room avatars ... Object.keys() is O(n) and is wasted because we only care if the keys are 1 or 2. Use `for .. in` instead and return early if there are >2 keys. Profiling indicates this cuts wasted time from ~74ms to ~32ms for me (who has a large number of rooms with large numbers of people in them).	2016-01-22 11:11:56 +00:00
manuroe	a627ee7ef6	Fixed ternary operation	2016-01-22 08:54:40 +01:00
Matthew Hodgson	8ccc3f04c3	correct layout for truncated lists	2016-01-21 17:39:12 +00:00
Kegsay	b45e5e6eb5	Merge pull request #108 from matrix-org/kegan/member-list-perf ... Add "and X more" overflow tile to joined member list	2016-01-21 16:15:12 +00:00
Kegan Dougal	dfab32394d	Set truncation to 10 for now.	2016-01-21 16:03:32 +00:00
Kegan Dougal	d72ab641d0	Expand the list when the overflow element is clicked ... Negative truncateAt values means "do not truncate".	2016-01-21 15:57:59 +00:00
Matthew Hodgson	c5099a837b	doh - anyone can set their own tags...	2016-01-21 15:08:14 +00:00
Kegan Dougal	eed83f982e	Add a suitable overflow tile for the member list	2016-01-21 11:41:28 +00:00
Kegan Dougal	9f362e488c	Add a TruncatedList component, which truncates children passed to it.	2016-01-21 11:30:37 +00:00
David Baker	13e70e6956	Merge remote-tracking branch 'origin/develop' into unread_sync	2016-01-21 10:36:29 +00:00
David Baker	99a491bb0e	Merge pull request #68 from matrix-org/notif_sync ... Set room highlight from unread_notification_count	2016-01-21 10:31:42 +00:00
David Baker	acce08194d	Apply patch to the right branch: update for new count format	2016-01-21 10:23:18 +00:00
David Baker	1c54c64850	Merge pull request #99 from matrix-org/user_settings_on_register ... Show user settings screen on registration	2016-01-21 10:11:28 +00:00
David Baker	a0cc3720a9	Merge pull request #106 from matrix-org/dbkr/dont_spam_read_receipts ... Don't spam the same RR at the server until it acks it.	2016-01-21 10:01:30 +00:00
Matthew Hodgson	9bbb9f7b29	pretty invites!	2016-01-21 00:45:22 +00:00
Matthew Hodgson	eab0ca8716	fix bottom margin on FF	2016-01-21 00:39:10 +00:00
Matthew Hodgson	4d549304b6	Fix autoshow	2016-01-21 00:26:44 +00:00
Matthew Hodgson	9ce4148925	go splitscreen at the first sign of an invite search	2016-01-21 00:25:47 +00:00
Matthew Hodgson	deca90d0a7	fix up Start Chat behaviour as per Amandine's feedback	2016-01-21 00:16:10 +00:00
Matthew Hodgson	35c141cda9	reduce size of auxpanel when editing roomsettings	2016-01-20 23:09:36 +00:00
Matthew Hodgson	6f6db75ea1	improve banned users layout	2016-01-20 22:47:42 +00:00
Matthew Hodgson	c0aa15aa09	now with gemini	2016-01-20 22:11:58 +00:00
Matthew Hodgson	3aaf934c97	implement the correct design for memberlist, modulo gemini	2016-01-20 22:04:49 +00:00
David Baker	548dac2ad9	Use new unread count methods	2016-01-20 17:19:52 +00:00
Matthew Hodgson	964e7c3739	fix user_levels some more	2016-01-20 17:15:01 +00:00
Matthew Hodgson	705730d450	fix user_levels	2016-01-20 17:12:55 +00:00
Matthew Hodgson	442e090f37	button layout	2016-01-20 17:09:46 +00:00
Matthew Hodgson	76b7788ba6	usersettings rhs button	2016-01-20 17:07:00 +00:00
Matthew Hodgson	c64f08dcc3	fix missing aliases	2016-01-20 16:53:46 +00:00
Matthew Hodgson	76279e2940	fix roomsettings a bit	2016-01-20 16:39:26 +00:00
David Baker	0052fbd6cb	Don't spam the same RR at the server until it acks it.	2016-01-20 16:39:25 +00:00
Matthew Hodgson	14c2d945d6	oops, use right class	2016-01-20 15:58:17 +00:00
David Baker	83634bf930	Update for new unread count format	2016-01-20 15:56:11 +00:00
Matthew Hodgson	dbcbd2aad8	fix badge layout	2016-01-20 15:52:34 +00:00
Matthew Hodgson	5c105a50e2	Merge branch 'matthew/roompreview' of https://github.com/matrix-org/matrix-react-sdk into matthew/roompreview	2016-01-20 15:49:02 +00:00
Matthew Hodgson	4d2608017b	fix CSS for ChangeAvatar placeholder	2016-01-20 15:39:56 +00:00
Kegan Dougal	b296d05b35	Fix finally NPE	2016-01-20 15:38:34 +00:00
Kegan Dougal	8dc21ec837	Fix race condition when joining rooms ... Problem: Hitting join on a room invite would show spinner, then join room screen then the messages. Cause: The UI to show a spinner is set via the "joining" flag. This flag was only set for the duration of the /join HTTP request. This is insufficient because it races with actual room info arriving from /sync. If this info does not arrive before the /join HTTP request returns, "joining" is false but the current membership state of the user is still invite. Fix: The "joining" flag is still set when the /join HTTP request is made, but it is only turned off when the join event arrives from /sync. Extras: This fix should also work when joining a room not from an invite.	2016-01-20 15:25:40 +00:00
Kegan Dougal	edb67b778d	Merge branch 'develop' into matthew/roompreview	2016-01-20 14:42:04 +00:00
Kegan Dougal	fee7ee5dcc	Load the user list eventually if we have no Room object	2016-01-20 14:41:48 +00:00
Kegan Dougal	a0aaae49dd	Merge branch 'develop' into matthew/roompreview	2016-01-20 14:27:25 +00:00
Kegsay	c3c7c90de0	Merge pull request #103 from matrix-org/kegan/invite-search ... Add global search with ability to invite from said list	2016-01-20 14:26:17 +00:00