Bruno Windels 95a0ebaf06 Merge pull request #3796 from matrix-org/bwindels/verification-right-panel ... Initial support for verification in right panel		2020-01-20 17:18:32 +00:00
..
auth	[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop	2020-01-09 14:15:09 -07:00
avatars	Merge pull request #3855 from matrix-org/jryans/custom-status-leak	2020-01-16 22:05:50 +00:00
context_menus	Fix more imports post-merge	2020-01-09 14:19:19 -07:00
create_room	Convert CommonJS exports to ES6-compatible exports	2019-12-22 21:01:02 -07:00
dialogs	Merge pull request #3796 from matrix-org/bwindels/verification-right-panel	2020-01-20 17:18:32 +00:00
directory	Fix MatrixClientPeg imports	2019-12-22 21:15:54 -07:00
elements	Remove unused fetch polyfills, querystring, require-json. Move glob to dev-dep	2020-01-18 02:01:45 +00: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 import merge conflicts, removing any that aren't needed anymore	2020-01-09 14:17:33 -07:00
messages	pr feedback	2020-01-17 17:02:31 +01:00
right_panel	fix lint	2020-01-17 16:31:38 +01:00
room_settings	Appease the linter	2020-01-13 13:28:33 -07:00
rooms	Set flag before mutating on cut too	2020-01-20 13:03:09 +00:00
settings	Merge pull request #3864 from matrix-org/jryans/complete-sec-confused	2020-01-20 11:31:01 +00:00
terms	Convert many imports to handle ES6 exports	2019-12-22 21:04:42 -07:00
toasts	pr feedback	2020-01-17 17:02:31 +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