Commit Graph

62531 Commits

Author SHA1 Message Date
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 83353e9419 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps 2017-06-27 12:40:32 +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 f6627937fa CSS for GroupView 2017-06-27 11:52:46 +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
Tom Tryfonidis a122e72a2b Translated using Weblate (Greek)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
2017-06-27 07:53:29 +00:00
Tom Tryfonidis 3b527bc2c7 Translated using Weblate (Greek)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-27 07:51:06 +00:00
Andrey 8222a4972f Translated using Weblate (Russian)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-27 02:39:46 +00: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
Tong Hui fcde56f614 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-06-26 15:29:11 +00:00
Brendan Abolivier 5e857afd5e Translated using Weblate (French)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-26 15:27:40 +00:00
Brendan Abolivier 59692d0190 Translated using Weblate (French)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-26 15:22:45 +00: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
Krombel 5d5d4bcc57 Added translation using Weblate (Persian) 2017-06-26 10:30:48 +00:00
Krombel 0771987e39 Translated using Weblate (German)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-26 10:30:10 +00:00
Bamstam d5594c883e Translated using Weblate (German)
Currently translated at 99.7% (914 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-26 10:29:30 +00: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
Carlos A. Carnero Delgado 15634a8435 Translated using Weblate (Spanish)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-06-26 03:22:58 +00:00
IMIN a0afb915a2 Translated using Weblate (Korean)
Currently translated at 100.0% (916 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-25 22:55:32 +00:00
IMIN d05d7a09c4 Translated using Weblate (Korean)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2017-06-25 22:02:04 +00:00
bldrzzy af0effabc2 Translated using Weblate (Polish)
Currently translated at 16.3% (150 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-06-25 21:41:44 +00:00
bldrzzy b4b4b8d350 Translated using Weblate (Polish)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2017-06-25 20:47:40 +00:00
Sylvia van Os 9541fc1033 Mirror local video feed 2017-06-25 22:13:00 +02:00
Rayeshman ffcc495f98 Added translation using Weblate (Persian) 2017-06-25 09:38:31 +00:00
Szimszon 63a5f22e58 Translated using Weblate (Hungarian)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-06-25 07:33:29 +00:00
Walter ef32c9ce96 Translated using Weblate (Ukrainian)
Currently translated at 18.7% (172 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-24 16:30:26 +00:00