d61525e420
Merge pull request #1152 from matrix-org/rxl881/apps
...
Add support for apps
2017-06-28 16:06:20 +01:00
ea83d7eee2
Add missing import and fix apps reference.
2017-06-28 15:53:18 +01:00
b3eee0c007
Merge pull request #1153 from matrix-org/luke/fix-rte-pre-extra-nls
...
Work around draft-js-export-html#62 by post-processing <br>\n
2017-06-28 15:13:39 +01:00
9b24f70d00
Update comment
2017-06-28 14:29:53 +01:00
dc72dfae7a
Merge pull request #1154 from matrix-org/luke/fix-rte-emoji-suggestions
...
Order emojis by standard ordering, add alternate shortnames
2017-06-28 14:28:11 +01:00
eeb1c33868
Do the less invasive fix of replacing `<br>\n` with `\n` but only within `<pre>`
2017-06-28 14:27:24 +01:00
3a10cda2ca
Add translations.
2017-06-28 13:55:18 +01:00
f8c064ec25
REmove redundant call to _getApps
2017-06-28 13:45:29 +01:00
48eb6f251b
Update comment
2017-06-28 13:44:44 +01:00
30f80b57f2
Instead of making this part of the build process, let the devs generate stripped-emoji.json
...
With the expectation that when the file needs to be regenerated to include other keys, the developer will run this script.
2017-06-28 13:28:48 +01:00
e70eca0b0c
Comment unused code and add TODO to handle scalar errors.
2017-06-28 12:58:09 +01:00
d06d066050
Move getInitialState to top of file.
2017-06-28 12:54:47 +01:00
e752cc8557
Use 'this' in preference to local reference.
2017-06-28 12:32:38 +01:00
481a66ef3c
Fix header.
2017-06-28 12:26:05 +01:00
93bdfc99df
i18n "Cancel" alt text.
2017-06-28 12:25:36 +01:00
ddea1f35d2
Fix header.
2017-06-28 12:23:33 +01:00
ff1636aaf5
Simplify boolean assignment.
2017-06-28 12:21:05 +01:00
06dafdc099
Remove unused state variable.
2017-06-28 12:20:07 +01:00
bf2a4afce5
Change to allow setting of DEBUG at run-time.
2017-06-28 12:02:07 +01:00
2b1d15717a
Add translation for Matrix Apps labs setting.
2017-06-28 12:00:22 +01:00
22ddbc63c3
Make lib dir prior to building
...
-p option will not error if lib already exists
2017-06-28 11:54:05 +01:00
f73fa4b49b
Move processing into renamed function processHtmlforSending
...
And explain why this fix is necessary
2017-06-28 11:49:50 +01:00
2b8da85726
Strip the emoji meta-data for the data we need
...
This is done at build time by parsing emojione/emoji.json, stripping it and then writing to ./lib/stripped-emoji.json.
2017-06-28 11:36:19 +01:00
8ca3b382ed
Use emojione/emoji.json because we don't want two sets of emoji meta
2017-06-28 11:19:16 +01:00
f4db765239
Fix indentation
2017-06-28 10:32:46 +01:00
907aaebe2f
Remove redundant emoji data file
2017-06-28 10:31:59 +01:00
ad2517bd8b
Uppercase the first letter of the app tile name.
2017-06-28 10:27:06 +01:00
9d339b96bd
Order emojis by standard ordering, add alternate shortnames
...
Also, increase the maximum number of emoji shown to 20.
2017-06-27 20:13:48 +01:00
69589c19e7
Work around draft-js-export-html#62 by post-processing <br>\n
...
Fixes https://github.com/vector-im/riot-web/issues/4446 by post-processing the output HTML from draft-js-export-html by replacing `<br>\n` with `<br>`. This works for content within or outside of `<pre>`. If we replace with `\n` instead, the newlines only apply in `<pre>` tags so we use `<br>`.
2017-06-27 18:33:45 +01:00
be60dfdc3a
Merge pull request #1151 from matrix-org/luke/fix-rte-pasting-multi-line-code
...
Overide default draft-js handling of pasting text/html
2017-06-27 18:03:27 +01:00
3872f0750c
Only show apps button if labs feature enabled.
2017-06-27 17:40:28 +01:00
338a4db87f
Only show apps drawer if matrix apps labs setting ids enabled
2017-06-27 17:40:09 +01:00
8dfd047f03
Don't show widgets when editing room settings and lint fixes.
2017-06-27 17:39:29 +01:00
7a7687699b
Add matrix apps to Labs settings
2017-06-27 17:38:33 +01:00
5307731dfd
Overide default draft-js handling of pasting text/html
...
This is surprisingly needed to avoid an issue with draft-js that causes multi-line madness when pasting code and then applying format-as-code to it - https://github.com/vector-im/riot-web/issues/2120#issuecomment-271735729 .
The issue sounds like it is https://github.com/facebook/draft-js/issues/170#issuecomment-195026203 and the suggstion is to override the text pasting handler https://github.com/facebook/draft-js/issues/170#issuecomment-215983216 . Meanwhile they haven't modified the default pasting behaviour afaics.
I've discovered a separate issue that is apparent even after this suggested fix. (https://github.com/vector-im/riot-web/issues/4446 )
2017-06-27 17:10:28 +01:00
4645ba1bba
Merge pull request #1150 from matrix-org/luke/fix-rte-dev-tools-toggle
...
Allow toggling of dev tools when RTE focussed
2017-06-27 15:38:19 +01:00
ba31a32440
Allow toggling of dev tools when RTE focussed
2017-06-27 15:17:57 +01:00
aab4c097e6
Make query parameters generic.
2017-06-27 12:26:13 +01:00
ad9a3d9ddc
Remove unused case statement.
2017-06-27 11:55:32 +01:00
89f051e693
Fix automerge error.
2017-06-27 11:52:49 +01:00
ddc0da396d
Merge in changes from develop
2017-06-27 11:44:36 +01:00
63b1250385
Add comment
2017-06-27 11:39:20 +01:00
1f1352786f
Temporarily disable Jitsi default
2017-06-27 11:38:14 +01:00
18ea76b864
Removed commented code
2017-06-27 11:31:00 +01:00
e343e99355
Cleaned up unused files and removed commented code
2017-06-27 11:28:38 +01:00
fbaa3de28b
Null-guard m.video info
...
Fixes https://github.com/vector-im/riot-web/issues/4423
2017-06-26 22:22:03 +01:00
447f93ba73
Merge pull request #1074 from kyrias/only-highlight-specified-language
...
Only syntax highlight if language was specified
2017-06-26 18:25:33 +01:00
48c32172fd
TextualBody: only highlight code block if language was specified
...
The highlight.js autodetection is finicky and often wrong, so disable
highlighting unless the language was explicitly specified, or if the
user has explicitly enabled it in the settings.
Fixes vector-im/riot-web#508 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-06-26 17:45:40 +02:00
661e6a6d01
HtmlUtils: Allow language- classes on code blocks through the sanitizer
...
This is required to be able to specify the highlight language in fenced
blocks like the following:
```python
print("foo")
```
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-06-26 17:45:38 +02:00
f9b37208a3
Merge pull request #1147 from matrix-org/matthew/stuck-unread
...
fix one major cause of stuck unread notifications
2017-06-26 14:57:25 +01:00
Richard Lewis