David Baker e5f913bc11 Merge remote-tracking branch 'origin/develop' into dbkr/change_is

2019-08-13 12:56:58 +01:00

..

auth

Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig

2019-08-12 14:19:17 +01:00

avatars

Fix RoomAvatarEvent historic fallback

2019-08-09 11:31:04 +01:00

context_menus

Hide settings button on Room Tile Context Menu for myMembership=invite

2019-08-06 16:25:29 +01:00

create_room

Remove use of deprecated React.PropTypes

2017-12-26 14:03:18 +13:00

dialogs

Remove ChatCreateOrReuseDialog

2019-08-07 12:18:41 -06:00

directory

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

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

elements

s/tooltip/tooltipContent/

2019-08-13 11:01:04 +01:00

globals

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

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

groups

avoid using import * as Matrix

2019-08-06 14:04:33 +01:00

messages

Merge pull request #3291 from matrix-org/t3chguy/fix_RoomAvatarEvent

2019-08-13 09:32:26 +01:00

right_panel

adjust prop in HeaderButton

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

room_settings

make things a tad saner

2019-07-06 11:16:01 +01:00

rooms

Disable 'Start New Chat' button in MemberInfo if we already have chats

2019-08-07 12:06:27 -06:00

settings

Merge remote-tracking branch 'origin/develop' into dbkr/change_is

2019-08-13 12:56:58 +01:00

verification

Make the verification cancelled dialog say OK instead of Cancel

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

voip

Convert image URLs in React to require calls

2019-01-17 22:06:49 -06:00