Travis Ralston 5f2df15987 Merge branch 'develop' into travis/invite-polish

2020-01-24 08:56:18 -07:00

..

auth

Unnecessary blank line

2020-01-24 09:36:22 +00:00

avatars

Merge pull request #3855 from matrix-org/jryans/custom-status-leak

2020-01-16 22:05:50 +00:00

context_menus

Be consistent about our settings svg, free the other one

2020-01-22 15:34:17 +00:00

create_room

Convert CommonJS exports to ES6-compatible exports

2019-12-22 21:01:02 -07:00

dialogs

Add some debugging around the recently DM'd users

2020-01-23 17:35:36 -07:00

directory

Fix MatrixClientPeg imports

2019-12-22 21:15:54 -07:00

elements

Actually add the secret to the QR code url

2020-01-23 20:19:17 -07:00

emojipicker

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

globals

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

groups

Fix roving room list for resizer and ff tabstop a11y

2020-01-22 10:36:20 +00:00

messages

fix lint

2020-01-24 12:08:47 +01:00

right_panel

Merge pull request #3871 from matrix-org/travis/qr-verif-rp

2020-01-24 08:55:40 -07:00

room_settings

Appease the linter

2020-01-13 13:28:33 -07:00

rooms

Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass

2020-01-24 13:54:51 +00:00

settings

Unintentional commit

2020-01-24 09:37:43 +00:00

terms

Convert many imports to handle ES6 exports

2019-12-22 21:04:42 -07:00

toasts

show to_device verification in dialog, not right panel

2020-01-24 11:59:17 +01:00

verification

Merge pull request #3839 from matrix-org/travis/sourcemaps

2020-01-15 10:11:33 -07:00

voip

Merge branch 'travis/babel7-wp-es6-export' into travis/sourcemaps-es6

2019-12-22 21:20:13 -07:00