3490 commits

Author	SHA1	Message	Date
Michael Telatynski	ea6e1b6f72	Merge branch 'develop' into t3chguy/warn_self_mute	2018-06-29 19:17:43 +01:00
Michael Telatynski	85a0736c78	update wording as per D4ve's feedback ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-29 19:16:56 +01:00
Luke Barnard	016e9176f6	Fix room topics/names reseting when UserSetting re-renders ... This reverts a fix to EditableText introduced in https://github.com/matrix-org/matrix-react-sdk/pull/1445 which introduced a bug that causes room name and topic to reset when UserSettings is rerendered because `initialValue != this.value` This also fixes the same bug originally fixed by #1445: >fix entering the same thing twice (which had the bug of not >emptying the "new" field) which, in other words meant that clicking "+" when adding a room alias would not reset the contents of the bottom-most alias in the list. The fix is to increment the `key` of the element, causing a new instance to be mounted instead of passing new props to the existing one.	2018-06-28 18:11:52 +01:00
Luke Barnard	6345fcb8f2	Fix incorrectly positioned copy button on <pre> blocks	2018-06-27 11:31:55 +01:00
David Baker	6fb57c0c66	Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click ... on room sub list badge click goto first relevant room	2018-06-27 10:29:22 +01:00
Michael Telatynski	a6ab51cd73	change GroupInviteTile from RoomSubList css so new :hover won't apply ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-27 09:50:32 +01:00
David Baker	67dc8f2a8e	Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist ... fix historical section	2018-06-26 18:26:29 +01:00
David Baker	fddb576c3a	Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize ... Fix RoomSubList headers by re-commiting 1faecfd	2018-06-26 18:23:38 +01:00
Michael Telatynski	f40802e9d8	Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop ... don't fire share dialog when clicking timestamp of event,	2018-06-26 17:46:52 +01:00
Michael Telatynski	67f803bc5f	don't fire share dialog when clicking timestamp of event, ... it was tripping people up and broke search permalinks Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-26 16:59:49 +01:00
David Baker	0ee8d18f5a	More code de-duping	2018-06-26 16:41:44 +01:00
David Baker	c780cd05a8	Change argument order of setRoomWidget ... So when deleting a widget we can just omit the ones we don't need	2018-06-26 16:33:28 +01:00
David Baker	a88297d7a6	More code reuse	2018-06-26 16:27:17 +01:00
David Baker	6cf11a15e6	Move WidgetUtils to utils dir	2018-06-26 11:59:16 +01:00
David Baker	0f2c47937c	Merge the two different widget utils files	2018-06-26 11:52:21 +01:00
Michael Telatynski	f5519c21b9	Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/i18n/strings/en_EN.json	2018-06-26 07:51:16 +01:00
Michael Telatynski	9b50daa748	give Historical an emptyContent to make it look more consistent ... and also to unbreak it since now !emptyContent get hidden Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-26 07:46:33 +01:00
Luke Barnard	e292ee942f	Fix RoomSubList headers by re-commiting 1faecfd ... The original got reverted in ebfafb36 somehow.	2018-06-25 16:37:45 +01:00
Michael Telatynski	de316134a9	Merge branch 'develop' into t3chguy/login_local_error	2018-06-25 13:35:14 +01:00
David Baker	317c38ccdf	Merge pull request #2010 from matrix-org/t3chguy/message_context_menu ... use enum constants for EventStatus and correct isSent check	2018-06-25 13:23:02 +01:00
David Baker	553111b6e2	Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee ... default to not showing url previews in e2ee rooms.	2018-06-25 11:50:14 +01:00
Luke Barnard	a24cb8e678	Merge pull request #2008 from matrix-org/t3chguy/focus_composer ... fix instances of composer not getting/regaining focus	2018-06-25 10:22:29 +01:00
Luke Barnard	383dccebb4	Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes ... notif panel fixes	2018-06-25 09:53:24 +01:00
Michael Telatynski	6e0db5bfb6	use enum constants for EventStatus and correct isSent check ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 17:41:50 +01:00
Michael Telatynski	61def4a973	highlight top field if blank otherwise the password field. ... remove unused refs Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 17:26:16 +01:00
Michael Telatynski	4a5fbf2c84	clear error on login type change ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 17:13:40 +01:00
Michael Telatynski	15e75ca7b3	generate local errors for blank fields during login ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 17:12:00 +01:00
Michael Telatynski	e1ba6949d0	expand composer input focus region and apply cursor:text to it ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 16:40:53 +01:00
Michael Telatynski	f7a0ad3aa0	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 01:29:38 +01:00
Michael Telatynski	807d72f2d9	nullguard SenderProfile,broke when NotifPanel had evs from forgotten rooms ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 01:22:38 +01:00
Michael Telatynski	aff2cc9065	EventTile:notif apply EmojiText to room name ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-23 01:21:42 +01:00
Michael Telatynski	acbc84a69c	switch to another settings key for e2e url previews to protect on change ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-22 18:44:54 +01:00
Michael Telatynski	ed4b82f8fc	update wording and style it like text (text cursor) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-22 18:36:19 +01:00
Michael Telatynski	891070d001	update UrlPreview settings to be more privacy-aware in e2ee rooms ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-22 18:35:54 +01:00
Michael Telatynski	32ab997230	properly style Group Pill ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-22 14:38:06 +01:00
Michael Telatynski	d92d95c37d	don't fall back to getGroups as it gets it no additional data ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-22 12:11:16 +01:00
Michael Telatynski	561b9699fc	Merge branch 'develop' into t3chguy/community_autocomplete	2018-06-22 12:00:34 +01:00
David Baker	771eac0075	Merge pull request #1971 from matrix-org/dbkr/jitsi_makewidget ... Very basic Jitsi integration	2018-06-22 11:45:18 +01:00
Luke Barnard	3aee0b56ae	Merge pull request #1994 from matrix-org/t3chguy/fix_group_tile_overflow ... add additional classes which protect the text from overflowing	2018-06-22 11:41:13 +01:00
David Baker	6252f5b818	Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget	2018-06-22 11:31:54 +01:00
Luke Barnard	5b8e453484	Merge pull request #1991 from matrix-org/t3chguy/delint_MImageBody ... delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry	2018-06-22 10:38:56 +01:00
Luke Barnard	9265f0d032	Merge pull request #1990 from matrix-org/t3chguy/no_displayname ... fix no displayname usersettings	2018-06-22 10:34:04 +01:00
Luke Barnard	8b257f2f50	Merge pull request #1989 from matrix-org/t3chguy/right_click_tagpanel_contextmenu ... trigger TagTile context menu on right click	2018-06-22 10:23:58 +01:00
Michael Telatynski	26aec4364d	Merge pull request #2000 from matrix-org/t3chguy/deduplicate_address_picker ... hide already chosen results from AddressPickerDialog	2018-06-21 14:07:52 +01:00
Michael Telatynski	be612998bd	invert boolean operation for readability and add comment ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-21 12:14:16 +01:00
Michael Telatynski	0737965079	s/userList/selectedList/ & s/queryList/suggestedList/ ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-21 12:13:27 +01:00
Luke Barnard	e148eb1a93	Merge pull request #2002 from matrix-org/t3chguy/fix_ChatCreateOrReuseDialog_onCancel ... delint ChatCreateOrReuseDialog	2018-06-21 12:00:15 +01:00
Michael Telatynski	a0207fb7fd	Merge pull request #1982 from matrix-org/t3chguy/nvl/fix_set_password-email_flow ... fix set password & email flow possible to get stuck and onBlur murdering your email	2018-06-21 11:42:53 +01:00
Michael Telatynski	2428eb12af	delint ChatCreateOrReuseDialog ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-21 11:37:37 +01:00
Michael Telatynski	fd252ded60	take into account the addressType also ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-06-21 00:47:21 +01:00