Richard Lewis
7a7687699b
Add matrix apps to Labs settings
2017-06-27 17:38:33 +01:00
Luke Barnard
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
Luke Barnard
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
Luke Barnard
ba31a32440
Allow toggling of dev tools when RTE focussed
2017-06-27 15:17:57 +01:00
David Baker
aa7a113324
More PR feedback
2017-06-27 13:41:43 +01:00
David Baker
87fac367ac
quote consistency
2017-06-27 13:37:59 +01:00
David Baker
6c9716637e
Fix linting errors
2017-06-27 13:13:00 +01:00
Richard Lewis
aab4c097e6
Make query parameters generic.
2017-06-27 12:26:13 +01:00
Richard Lewis
ad9a3d9ddc
Remove unused case statement.
2017-06-27 11:55:32 +01:00
Richard Lewis
89f051e693
Fix automerge error.
2017-06-27 11:52:49 +01:00
David Baker
2aeaaf26ca
remove inline css
2017-06-27 11:52:23 +01:00
Richard Lewis
ddc0da396d
Merge in changes from develop
2017-06-27 11:44:36 +01:00
Richard Lewis
63b1250385
Add comment
2017-06-27 11:39:20 +01:00
Richard Lewis
1f1352786f
Temporarily disable Jitsi default
2017-06-27 11:38:14 +01:00
Richard Lewis
18ea76b864
Removed commented code
2017-06-27 11:31:00 +01:00
Richard Lewis
e343e99355
Cleaned up unused files and removed commented code
2017-06-27 11:28:38 +01:00
David Baker
971f7ad045
Fix avatars
2017-06-27 10:32:21 +01:00
David Baker
867b47f4a2
PR feedback: remove phases
2017-06-27 10:28:46 +01:00
David Baker
f0aaca0a31
Fix some PR feedback
2017-06-27 10:05:05 +01:00
David Baker
c033d5defd
Missing React import
2017-06-27 09:58:29 +01:00
lukebarnard
fbaa3de28b
Null-guard m.video info
...
Fixes https://github.com/vector-im/riot-web/issues/4423
2017-06-26 22:22:03 +01:00
Matthew Hodgson
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
David Baker
09b1012388
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-26 17:49:06 +01:00
David Baker
812b3643de
Add message for HSes that don't support groups
...
Also add an unrelated missed translation
2017-06-26 17:47:17 +01:00
David Baker
a26498bc6c
Make 'group not found' work
2017-06-26 17:38:10 +01:00
Johannes Löthberg
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
Johannes Löthberg
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
David Baker
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
Matthew Hodgson
edae66fd3a
fix one major cause of stuck unread notifications
2017-06-26 14:28:56 +01:00
David Baker
bbd85891f4
Merge pull request #1146 from matrix-org/luke/fix-rte-strikeout
...
RTE: Use <del> for strikeout
2017-06-26 11:38:04 +01:00
Luke Barnard
d4034105a4
Revert support for ~~gh strikeout~~
2017-06-26 10:10:31 +01:00
David Baker
7998602f42
Merge pull request #1145 from matrix-org/luke/fix-rte-tab-complete-after-join
...
Update tab-complete state onRoom received after joining
2017-06-26 10:05:35 +01:00
Luke Barnard
c1bceb81d2
Merge branch 'develop' into luke/fix-rte-strikeout
2017-06-26 09:41:17 +01:00
Luke Barnard
f091d209b9
Merge branch 'develop' into luke/fix-rte-tab-complete-after-join
2017-06-26 09:39:49 +01:00
Luke Barnard
caa0250d30
Merge pull request #1144 from matrix-org/rte-fixes2
...
RTE Fixes
2017-06-26 09:38:14 +01:00
David Baker
3cdc7c9114
Add copyright headers
2017-06-23 18:30:16 +01:00
David Baker
f0f4a16e97
Translate autocomplete delay
2017-06-23 18:28:02 +01:00
Luke Barnard
9404dd30c5
Use <del> for strikeout
...
We've swapped to commonmark, which uses <del> instead of ~~ for strikeout, so make the RTE insert <del> when we apply strikeout. Also, when ~~ is inserted, transform them into <del> for simplicity. This means giving an input of ~~test~~ is effectively the same as giving an input of <del>test</del>.
2017-06-23 18:19:06 +01:00
David Baker
c0e48c72fc
Remove dep on liblevenstein
...
While we don't actually use it
2017-06-23 18:03:32 +01:00
Luke Barnard
ddb84f034e
Update tab-complete state onRoom received after joining
...
As opposed to doing it when the component mounts.
Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)
2017-06-23 17:52:50 +01:00
Luke Barnard
89afcfd897
Linting
2017-06-23 17:35:07 +01:00
Luke Barnard
004d4828f8
Make the tests pass
...
sendTextMessage is not called when RTE Markdown is enabled, but rather sendHtmlMessage
2017-06-23 17:08:37 +01:00
David Baker
2efa099de2
Use function from HTMLUtils for sanitizing
...
Encapsulates things a little nicer
2017-06-23 17:02:54 +01:00
Luke Barnard
738f261d5d
Add missing translations for RTE ops
2017-06-23 16:14:22 +01:00
Luke Barnard
87609582c6
Merge branch 'develop' into rte-fixes2
...
Conflicts:
package.json
src/autocomplete/CommandProvider.js
src/autocomplete/UserProvider.js
src/components/structures/RoomView.js
src/components/structures/UserSettings.js
src/components/views/rooms/MessageComposerInput.js
2017-06-23 15:30:06 +01:00
David Baker
0207f3cc02
Merge pull request #1143 from matrix-org/luke/fix-login-multiple-fields
...
Only submit phone number when phone loginType is selected
2017-06-23 14:48:52 +01:00
David Baker
ec36a348be
comment why we send the empty string
2017-06-23 14:48:15 +01:00
Luke Barnard
c51255da40
Submit empty string username when on phone number login
2017-06-23 14:34:19 +01:00
Luke Barnard
f5353fcdc5
Only submit phone number when phone loginType is selected
...
Otherwise submit a phoneNumber and phoneCountry of `null` (when logging in with email or username).
Fixes https://github.com/vector-im/riot-web/issues/4000
2017-06-23 13:43:52 +01:00
Luke Barnard
cddac3516b
Merge pull request #1142 from matrix-org/dbkr/fix_potential_start_client_race_2
...
Fix potential race in setting client listeners
2017-06-23 12:56:14 +01:00
