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
ad2517bd8b
Uppercase the first letter of the app tile name.
2017-06-28 10:27:06 +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
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
edae66fd3a
fix one major cause of stuck unread notifications
2017-06-26 14:28:56 +01:00
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
d4034105a4
Revert support for ~~gh strikeout~~
2017-06-26 10:10:31 +01:00
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
c1bceb81d2
Merge branch 'develop' into luke/fix-rte-strikeout
2017-06-26 09:41:17 +01:00
f091d209b9
Merge branch 'develop' into luke/fix-rte-tab-complete-after-join
2017-06-26 09:39:49 +01:00
caa0250d30
Merge pull request #1144 from matrix-org/rte-fixes2
...
RTE Fixes
2017-06-26 09:38:14 +01:00
3cdc7c9114
Add copyright headers
2017-06-23 18:30:16 +01:00
f0f4a16e97
Translate autocomplete delay
2017-06-23 18:28:02 +01:00
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
c0e48c72fc
Remove dep on liblevenstein
...
While we don't actually use it
2017-06-23 18:03:32 +01:00
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
89afcfd897
Linting
2017-06-23 17:35:07 +01:00
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
738f261d5d
Add missing translations for RTE ops
2017-06-23 16:14:22 +01:00
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
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
ec36a348be
comment why we send the empty string
2017-06-23 14:48:15 +01:00
c51255da40
Submit empty string username when on phone number login
2017-06-23 14:34:19 +01:00
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
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
8f3eb89f8b
Fix potential race in setting client listeners
2017-06-23 10:48:21 +01:00
Richard Lewis