Commit graph

8 commits

Author SHA1 Message Date
J. Ryan Stinnett
fbb65f068a Support admin configurable message when reporting content
This adds support for an admin-configured message in config.json to be shown in
the report content dialog to allow linking to community rules, etc.

Fixes https://github.com/vector-im/riot-web/issues/11992
2020-01-22 14:07:18 +00:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Travis Ralston
042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston
d56f0f2a25 Convert many imports to handle ES6 exports
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Michael Telatynski
b6309a4294 Improve ReportEventDialog as per PR feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-12 12:52:11 +01:00
Michael Telatynski
d92f8e6d34 fix indentation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 16:47:16 +01:00
Michael Telatynski
22ee809922 Add way to report the content of a message
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 16:39:15 +01:00