2183 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	4a6a9bd95b	Remove redundant setState ... Duplicated in `finally`	2016-08-10 18:28:20 +01:00
Richard van der Hoff	bb3a0ff08a	Merge pull request #404 from matrix-org/dbkr/fix_settings_persistence ... Fix settings resetting on refresh	2016-08-10 18:19:18 +01:00
David Baker	92762eca74	Fix settings resetting on refresh ... Don't clear localstorage when replacing the client: we clear it when logging out so this is just redundant, and since we now use replaceClient to unpickle a session from localstorage, this was blowing away all our setting on every refresh. Also Move all of the localstorage code to Lifecycle (except device ID but this will probably be generated on the server soon anyway). We previously cleared localstorage on logout in Lifecycle so persist the session in Lifecycle.setLoggedIn() to be symmetrical.	2016-08-10 18:04:22 +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
David Baker	839b985289	Merge pull request #400 from matrix-org/rav/cancel_rate_limited_funcs ... Cancel calls to rate-limited funcs on unmount	2016-08-10 15:37:02 +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	6aa5e5a493	Merge pull request #399 from matrix-org/rav/refactor_session_rehydration ... Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader	2016-08-10 12:56:01 +01:00
Richard van der Hoff	0bcc4a6bad	Merge pull request #398 from matrix-org/dbkr/hide_integrations_header ... Don't show integrations header if setting not on	2016-08-10 12:06:12 +01:00
Richard van der Hoff	3922f6a1b7	Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader ... This means that we don't create a spurious MatrixClient which is thrown away by the SessionLoader (whilst still ensuring that the rehydrated matrixclient follows the same code path as matrixclients created at other points in the session load process).	2016-08-10 11:59:24 +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	1b414cad18	Add max-width to emoji completions.	2016-08-10 00:52:55 +05:30
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	e144da75e3	Comment onLoggedOut & consistent comment style	2016-08-04 10:49:34 +01:00
Richard van der Hoff	e1fea24fd6	Merge pull request #389 from matrix-org/dbkr/room_published_check_controlled ... Don't leave isRoomPublished as undefined	2016-08-04 10:42:34 +01:00
Richard van der Hoff	24cc4f52bf	Downgrade emojione to 2.2.3 ... ... because @aviraldg says > 2.2.3 is broken :/	2016-08-03 21:36:52 +01:00
Richard van der Hoff	f4e40696bc	Bump emojione to 2.2.3 ... Because @aviraldg says it's better.	2016-08-03 21:17:54 +01:00