3051 commits

Author	SHA1	Message	Date
Travis Ralston	0a3bc1c667	Don't try to show redacted messages ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 11:21:44 -06:00
Travis Ralston	aff02885de	Don't fail if an event doesn't belong to a room. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 11:21:21 -06:00
Travis Ralston	965a25ba84	Fix bug where rooms missing m.room.pinned_events could not pin messages ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 11:08:22 -06:00
Travis Ralston	f7389b70aa	Hide the pin option in the context menu if the user can't pin messages ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 11:01:17 -06:00
Travis Ralston	efdb4b02c6	i18n for 'Jump to message' button ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 10:55:52 -06:00
Travis Ralston	59a253af37	Don't show the unpin button if the user can't unpin the message. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 10:53:44 -06:00
Travis Ralston	9b11f576fe	Add action bar to pinned event tiles; support unpinning from the panel ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 10:42:58 -06:00
Travis Ralston	fa5a23e0df	Permalink pins to their original events ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 10:42:58 -06:00
Travis Ralston	5daa16ab53	Add panel for pinned messages. ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 10:42:58 -06:00
Travis Ralston	774c3dbd38	Pin/unpin message option in a message's context menu ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-29 10:42:58 -06:00
Luke Barnard	d3b8d8bf9d	Create basic icon for the GroupRoomList tab and adding rooms to groups	2017-09-29 17:03:58 +01:00
Luke Barnard	5544270bc4	Merge pull request #5131 from vector-im/luke/groups-button ... Add button to get to MyGroups	2017-09-29 11:00:29 +01:00
Luke Barnard	47919bc291	Honour the Groups feature flag	2017-09-29 10:39:49 +01:00
Luke Barnard	f9a92ad15a	Lint	2017-09-28 10:02:16 +01:00
Luke Barnard	ce13837216	Remove key prop pass-thru on HeaderButton ... This is redundant and throws a warning	2017-09-28 09:46:10 +01:00
Luke Barnard	9c86a655ca	Add button to get to MyGroups	2017-09-27 17:46:53 +01:00
Luke Barnard	1740319b7a	Add margin to flair avatars to separate them	2017-09-27 14:15:21 +01:00
Luke Barnard	2adf08dee0	CSS for GroupView: align "save"/"cancel" buttons in settings	2017-09-27 10:31:35 +01:00
David Baker	f64f293cdb	Merge pull request #5125 from vector-im/luke/groups-add-rooms ... Implement "Add room to group" feature	2017-09-26 18:15:54 +01:00
Luke Barnard	888e3abc75	Implement "Add room to group" feature ... This step needs to be taken before adding a room to a group summary	2017-09-26 14:35:38 +01:00
David Baker	94855c0f48	Merge pull request #4967 from vector-im/rob/electron-screensharing ... Add Jitsi screensharing support in electron app	2017-09-25 17:00:00 +01:00
David Baker	798558e5cc	Merge pull request #5117 from vector-im/luke/refactor-right-panel-header-buttons ... Refactor right panel header buttons	2017-09-25 16:37:44 +01:00
Robert Swain	f79b8e0c71	ElectronPlatform: Import desktopCapturer explicitly	2017-09-25 17:19:04 +02:00
Robert Swain	44c0fb77da	Merge branch 'develop' into rob/electron-screensharing	2017-09-25 17:16:21 +02:00
Luke Barnard	bfdb92ff6b	Nit: Re-order property	2017-09-25 16:13:54 +01:00
Luke Barnard	77f30aacf9	Re-add clickPhase for FilePanel header button	2017-09-25 16:13:13 +01:00
Luke Barnard	fd7e81193e	Less coupling between HeaderButton and RightPanel ... Use isHighlighted as a prop instead of computing based on phases and currentPhase	2017-09-25 16:06:46 +01:00
Luke Barnard	75fef3f21a	Merge pull request #5104 from vector-im/dbkr/publicity_toggle ... CSS for publicity status & toggle button	2017-09-25 14:53:23 +01:00
Luke Barnard	28e9fdc873	rebase in progress; onto 7137ba71	2017-09-25 14:42:44 +01:00
Luke Barnard	7137ba7188	Refactor right panel header buttons ... To reduce repetition of code, simplify the process of adding header buttons and remove the need for many handler functions.	2017-09-25 14:13:02 +01:00
David Baker	813615610f	CSS for publicity status & toggle button	2017-09-22 19:27:36 +01:00
Luke Barnard	1b67e7d606	CSS for "X" in top right of features users/rooms	2017-09-22 15:58:36 +01:00
Luke Barnard	0eefae031f	Merge pull request #5096 from vector-im/luke/groups-membership-section-redesign ... Redesign membership section of GroupView	2017-09-21 17:49:55 +01:00
Luke Barnard	96b9570465	Update comment	2017-09-21 17:31:06 +01:00
Luke Barnard	96bb804eb8	Redesign membership section of GroupView	2017-09-21 15:11:57 +01:00
Luke Barnard	0d4b3b41f9	CSS for GroupView: Add a User ... codep matrix-org/matrix-react-sdk#1402	2017-09-20 17:07:32 +01:00
Matthew Hodgson	fbe1c82dfa	Merge pull request #5074 from vector-im/t3chguy/devtools-1 ... T3chguy/devtools 1	2017-09-19 22:14:52 +01:00
David Baker	8fc69198b1	Merge pull request #5085 from vector-im/luke/fix-separate-sender-profile ... Alter opacity for flair	2017-09-19 17:21:57 +01:00
Luke Barnard	0d6b09a5f6	Merge branch 'develop' into luke/fix-ugly-integ-button	2017-09-19 17:03:06 +01:00
Luke Barnard	7469ab5ed9	Alter opacity for flair ... Apply 0.7 opacity to flair, but keep name and aux at 0.5	2017-09-19 16:56:46 +01:00
Luke Barnard	fbcccd8be0	Merge pull request #4830 from vector-im/dbkr/group_userlist ... Group Membership UI	2017-09-19 13:26:02 +01:00
Luke Barnard	d25c3be627	CSS to fix ugly integrations button ... See matrix-org/matrix-react-sdk#1399	2017-09-19 11:59:51 +01:00
Luke Barnard	38c0d62478	Fix typo for integs error button error	2017-09-19 10:46:00 +01:00
Michael Telatynski	00976d9338	i18n new DevTools strings ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-18 12:04:11 +01:00
Michael Telatynski	dccee6d419	add ability to filter room state types/results ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-18 12:03:11 +01:00
Michael Telatynski	af450df513	add ability to jump from RSE to Send Custom State Event prefilled ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-18 11:27:31 +01:00
Michael Telatynski	821ab6c13e	switch to controlled inputs and require eventType !== '' ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-09-18 11:06:46 +01:00
Matthew Hodgson	828e9d5eb4	Merge pull request #4735 from vector-im/t3chguy/devtools ... T3chguy/devtools	2017-09-17 23:15:28 +01:00
Travis Ralston	ac0f593c7c	CSS for unignore button in UserSettings ... Signed-off-by: Travis Ralston <travpc@gmail.com>	2017-09-14 15:34:45 -06:00
David Baker	06fe240be2	Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist	2017-09-13 16:35:37 +01:00