2145 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Matthew Hodgson	6632322029	spell out that conference calling is hit and miss	2016-08-03 19:56:13 +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	afa46a855b	Merge remote-tracking branch 'origin/develop' into dbkr/deactivate_account	2016-08-03 17:52:35 +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	b32a19a0f1	Comments	2016-08-03 17:23:09 +01:00
David Baker	0919e41469	Fix MatrixClientPeg.start() ... Move import & use `this`	2016-08-03 16:45:23 +01:00
David Baker	009c768b72	Comma fail	2016-08-03 16:41:22 +01:00
David Baker	9bf45fb556	Add start wrapper in MatrixClientPeg ... to handle the opts dictionary	2016-08-03 16:39:47 +01:00
David Baker	b95a1c4a4b	Just doc with the MatrixClientCreds object	2016-08-03 16:31:42 +01:00
David Baker	a5384d32e2	Copy opts to set pendingEventOrdering	2016-08-03 16:28:37 +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	03dbdd8c59	Merge pull request #387 from matrix-org/rav/react_test_debug ... Add more logging to TimelinePanel-test	2016-08-03 16:13:23 +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
Richard van der Hoff	8a57881618	Add more logging to TimelinePanel-test ... In an attempt to figure out why this is timing out sometimes, add even more debugging.	2016-08-03 15:24:56 +01:00
Matthew Hodgson	f95a11a9bf	Merge pull request #369 from matrix-org/wmwragg/mention-state-menu ... Wmwragg/mention state menu	2016-08-03 15:22:39 +01:00
David Baker	ff2dd74429	Merge pull request #383 from matrix-org/matthew/fix-video-upload ... fix upload for video or image files where sniffing fails	2016-08-03 15:04:53 +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
Aviral Dasgupta	8e66e6dfdd	fix: Switch to opacity: 0 for composer emoji. ... This seems to be the best option for displaying emoji in the composer. While it means selected emoji don't actually have the selection colour applied, it's the most functional of all the options. Facebook uses the same approach.	2016-08-03 18:27:49 +05:30
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
David Baker	1ff2ce60ff	Merge pull request #382 from aviraldg/fix-autocomplete-confirm ... fix: autocomplete to use tab instead of return	2016-08-03 13:28:11 +01:00
Matthew Hodgson	569b6057c3	fix upload for video or image files where sniffing the content.info fails	2016-08-03 13:27:06 +01:00
Aviral Dasgupta	1f9a396fa5	fix: autocomplete to use tab instead of return	2016-08-03 17:51:40 +05:30
Matthew Hodgson	104ccc751f	Merge pull request #375 from aviraldg/fix-574 ... strip (IRC) displayname suffix from autocomplete	2016-08-03 13:00:30 +01:00
Aviral Dasgupta	2cddf18461	strip (IRC) displayname suffix from autocomplete ... Fixes vector-im/vector-web#574	2016-08-03 17:26:05 +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	da03af6c1c	Fix tests	2016-08-03 10:51:58 +01:00