Michael Telatynski 9a15d4cfc1 Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event ...

 Conflicts:

	src/i18n/strings/en_EN.json

2019-09-12 12:45:16 +01:00

..

auth

Apply PR feedback

2019-09-11 17:44:04 +01:00

avatars

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

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

context_menus

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

2019-09-12 12:45:16 +01:00

create_room

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

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

dialogs

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

2019-09-12 12:45:16 +01:00

directory

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

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

elements

Switch to createReactClass: views/elements & views/groups. React 16 :D

2019-09-06 18:35:52 +01:00

globals

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

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

groups

Switch to createReactClass: views/elements & views/groups. React 16 :D

2019-09-06 18:35:52 +01:00

messages

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

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

right_panel

adjust prop in HeaderButton

2019-04-11 18:32:38 +02:00

room_settings

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

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

rooms

invert and rename changed to saveDisabled for clarity

2019-09-11 17:37:11 +01:00

settings

Update all 3PID state in Settings when IS changes

2019-09-11 16:21:42 +01:00

terms

Appease the linter

2019-08-19 23:03:01 -06:00

verification

Make the verification cancelled dialog say OK instead of Cancel

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

voip

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

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