Travis Ralston c0ffa8b59a Fix merge conflict between react warnings and SSO

2020-04-01 11:32:13 -06:00

..

auth

Fix merge conflict between react warnings and SSO

2020-04-01 11:32:13 -06:00

avatars

Use componentDidMount in place of componentWillMount where possible

2020-03-31 14:14:17 -06:00

context_menus

Use componentDidMount in place of componentWillMount where possible

2020-03-31 14:14:17 -06:00

create_room

…

dialogs

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

2020-04-01 11:14:19 -06:00

directory

Fix missed copy

2020-03-16 12:28:20 +00:00

elements

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

2020-04-01 11:14:19 -06:00

emojipicker

Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets

2020-03-28 00:51:01 +00:00

globals

…

groups

Use componentDidMount in place of componentWillMount where possible

2020-03-31 14:14:17 -06:00

messages

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

2020-04-01 11:14:19 -06:00

right_panel

Merge pull request #4313 from matrix-org/travis/react-warnings/1-componentDidMount

2020-04-01 11:13:04 -06:00

room_settings

Field: make id optional, generate one if not provided

2020-03-29 22:59:15 +01:00

rooms

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

2020-04-01 11:14:19 -06:00

settings

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

2020-04-01 11:14:19 -06:00

terms

Use noreferrer in addition to noopener for edge case browsers

2020-02-23 22:14:29 +00:00

toasts

Merge branch 'dbkr/wait_for_upgrade_to_complete' into dbkr/ssss_upgrade_copy

2020-03-26 11:14:33 +00:00

verification

Fix UserInfo e2e buttons to match Figma

2020-04-01 12:21:18 +01:00

voip

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

2020-04-01 11:14:19 -06:00