Michael Telatynski bf06b1f379 Merge branches 'develop' and 't3chguy/remove_avatar_2.0' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_avatar_2.0 ...

 Conflicts:

	res/css/views/settings/_ProfileSettings.scss

2019-12-16 16:23:25 +00:00

..

auth

Make Combobox dropdown keyboard and screen reader accessible

2019-12-15 15:04:57 +00:00

avatars

s/ContextualMenu/ContextMenu/

2019-12-02 23:21:59 +00:00

context_menus

s/ContextualMenu/ContextMenu/

2019-12-02 23:21:59 +00:00

create_room

Switch to createReactClass: *everything else*. React 16 :D

2019-09-06 18:38:11 +01:00

dialogs

Switch to react-focus-lock for it to comprehend Portals

2019-12-16 12:16:41 +00:00

directory

Replace React.PropTypes with usage of the prop-types package

2019-07-31 12:19:29 +01:00

elements

Merge pull request #3729 from matrix-org/t3chguy/aria_dropdown

2019-12-16 11:14:46 +00:00

emojipicker

Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus

2019-12-02 23:20:47 +00:00

globals

React error/warning cleanup

2019-10-08 12:10:37 +01:00

groups

Merge pull request #3703 from matrix-org/travis/right-panel-v2

2019-12-11 10:50:45 -07:00

messages

Use static modals for verification

2019-12-13 13:55:28 +00:00

right_panel

Update room / user decoration for cross-signing

2019-12-13 17:57:26 +00:00

room_settings

open ImageView when clicking on a set avatar

2019-12-16 15:21:05 +00:00

rooms

Merge pull request #3728 from matrix-org/jryans/verify-users

2019-12-16 10:12:46 +00:00

settings

open ImageView when clicking on a set avatar

2019-12-16 15:21:05 +00:00

terms

fix sdk import

2019-09-27 12:20:48 +01:00

toasts

Use static modals for verification

2019-12-13 13:55:28 +00:00

verification

Make the verification cancelled dialog say OK instead of Cancel

2019-06-19 15:07:45 -06:00

voip

Migrate string refs over to createRef

2019-12-08 12:16:17 +00:00