diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
| commit | 10294b60824347d73b01f7ce4add18467d1e6f0c (patch) | |
| tree | 06d04a0a2e0ccf183bfc602ce9694d5958ed7a2e /webclient/app.js | |
| parent | Make feedback table also store sender. (diff) | |
| parent | grammar fix (diff) | |
| download | synapse-10294b60824347d73b01f7ce4add18467d1e6f0c.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/_base.py
Diffstat (limited to 'webclient/app.js')
| -rw-r--r-- | webclient/app.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/webclient/app.js b/webclient/app.js index 2133a98cbf..651aeeaa77 100644 --- a/webclient/app.js +++ b/webclient/app.js @@ -70,4 +70,9 @@ matrixWebClient $timeout(function() { element[0].focus() }, 0); } }; - }]); + }]) + .filter('to_trusted', ['$sce', function($sce){ + return function(text) { + return $sce.trustAsHtml(text); + }; + }]); \ No newline at end of file |