Commit Graph

62531 Commits

Author SHA1 Message Date
Andreas Marek d0ba79996f Translated using Weblate (German)
Currently translated at 99.8% (907 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-26 09:36:10 +00:00
David Baker bf4289632b Merge pull request #1539 from matrix-org/luke/feature-optionally-mirror-local-video
Add option to mirror local video feed
2017-10-26 10:36:03 +01:00
Luke Barnard 591a7f4b86 Default to false 2017-10-26 10:06:04 +01:00
Luke Barnard 97b9cf6402 Actually use the synced setting 2017-10-26 09:58:46 +01:00
David Baker e6c3483c8b Add correct telegram link 2017-10-26 09:58:05 +01:00
Weblate ffd526af1a Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 08:55:24 +00:00
Andrey 0453b1c422 Translated using Weblate (Russian)
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-10-26 08:55:23 +00:00
Jan Kudrik 15466f02ed Translated using Weblate (Czech)
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
2017-10-26 08:55:22 +00:00
Luke Barnard 507cef3ba4 Merge pull request #5437 from vector-im/luke/feature-optionally-mirror-local-video
Re-PR #4412
2017-10-26 09:55:17 +01:00
David Baker ebbb677f2c Update telegram link 2017-10-26 09:53:05 +01:00
Matthew Hodgson 5c32b5b11a fix i18n 2017-10-26 02:10:03 +01:00
Matthew Hodgson 13c1829cd4 fix droptarget 2017-10-26 02:09:56 +01:00
Matthew Hodgson deb0f902e3 linting 2017-10-26 01:59:18 +01:00
Matthew Hodgson 6212e805d2 spell out fonts 2017-10-26 01:52:57 +01:00
Matthew Hodgson 1237de3ef0 Merge branch 'develop' into matthew/status 2017-10-26 01:47:22 +01:00
Matthew Hodgson 225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Matthew Hodgson 5a9dae5ff1 use generic 'text button' for delete buttons in UserSettings 2017-10-26 01:44:05 +01:00
Matthew Hodgson ac7a94afb2 apply theme tint at launch 2017-10-26 01:43:42 +01:00
Matthew Hodgson f86b616769 status homepage 2017-10-26 01:38:07 +01:00
Matthew Hodgson ea19096db3 skin all the buttons 2017-10-25 23:56:31 +01:00
Matthew Hodgson a152eba023 fix panel-divider-color 2017-10-25 22:55:32 +01:00
Matthew Hodgson b3a8593468 make tinter coarsely theme aware 2017-10-25 22:48:27 +01:00
Matthew Hodgson 953398b486 statusify main chat 2017-10-25 22:48:13 +01:00
Matthew Hodgson 79a9f2168b get rid of hardcoded font 2017-10-25 22:47:55 +01:00
Andrey 935e6baf88 Translated using Weblate (Russian)
Currently translated at 100.0% (908 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-25 17:52:03 +00:00
Travis Ralston 6c796cd311 Re-add i18n post-merge
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:28:57 -06:00
Travis Ralston 45ca890f68 Merge remote-tracking branch 'vector-im/develop' into travis/presence 2017-10-25 11:27:22 -06:00
Travis Ralston 53185fc23d Remove i18n for making the merge easier
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:27:16 -06:00
Travis Ralston 24000ee456 Re-add i18n for labs
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:23:04 -06:00
Travis Ralston e773585a02 Merge remote-tracking branch 'matrix-org/develop' into travis/presence
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:39 -06:00
Travis Ralston 5c9970950b Undo i18n change to make merge easier
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:12 -06:00
Luke Barnard 044519f9ea Add more specific css class to allow for optional flipping 2017-10-25 18:18:37 +01:00
Luke Barnard 3ae97348f8 Add option to mirror local video feed 2017-10-25 18:17:33 +01:00
Luke Barnard 5db44bd4ae Merge branch 'develop' into TheLastProject-reverse-video 2017-10-25 18:06:16 +01:00
Weblate a382834e56 Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 16:47:29 +00:00
Bamstam 841e274b07 Translated using Weblate (German)
Currently translated at 99.8% (906 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-25 16:47:28 +00:00
Jan Kudrik 9b93804afa Translated using Weblate (Czech)
Currently translated at 60.1% (546 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-25 16:47:28 +00:00
Luke Barnard 4cfbd66729 Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip
Use the correct userId when displaying who redacted a message
2017-10-25 17:47:22 +01:00
Luke Barnard cedc0b27a9 Handle redaction with no sender 2017-10-25 17:37:20 +01:00
Luke Barnard 5990e41bd7 Use the correct userId when displaying who redacted a message 2017-10-25 17:24:45 +01:00
Stefan Parviainen 53e983f9c7 Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
Weblate 007177b7ba Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 15:54:00 +00:00
Luke Barnard bc3df74c2f Merge pull request #5410 from lub/patch-1
fix comma error of features example
2017-10-25 16:53:55 +01:00
Weblate 3fc0c455fa Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 15:52:03 +00:00
Bamstam 4a8729dd1d Translated using Weblate (German)
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-10-25 15:52:02 +00:00
Luke Barnard f6a920a018 Merge pull request #5387 from vector-im/t3chguy/devtools-filter-case-sens
Devtools: make filtering case-insensitive
2017-10-25 16:51:57 +01:00
Andrey 45632b4191 Translated using Weblate (Russian)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-25 15:48:44 +00:00
Michael Telatynski fd7e057ec0 Merge branch 'develop' into t3chguy/invite_in_memberinfo 2017-10-25 16:33:50 +01:00
Weblate f8229b7d59 Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 14:52:56 +00:00
David Baker 8ed3474b64 Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists
Only show editing UI for aliases/related_groups for users /w power
2017-10-25 15:52:51 +01:00