Commit graph

960 commits

Author SHA1 Message Date
Stefan Parviainen
9edcd0a9e5 Translated using Weblate (Finnish)
Currently translated at 78.8% (729 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-10-16 13:46:39 +00:00
Weblate
09b381bc82 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 09:17:50 +00:00
André Breda
b8aa9e8bc1 Translated using Weblate (Portuguese)
Currently translated at 94.3% (872 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-16 09:17:50 +00:00
Bamstam
62897457fa Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 09:17:50 +00:00
David Baker
e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Krombel
b230bb02b3 Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 21:08:30 +00:00
Bamstam
b483b4f3a0 Translated using Weblate (German)
Currently translated at 99.7% (922 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:15:27 +00:00
Krombel
9a6bbf373b Translated using Weblate (German)
Currently translated at 99.6% (921 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:14:44 +00:00
Bamstam
851e278295 Translated using Weblate (German)
Currently translated at 99.4% (919 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:13:25 +00:00
Krombel
8f5cb598f0 Translated using Weblate (German)
Currently translated at 99.3% (918 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:12:33 +00:00
Andrey
bee1623ddc Translated using Weblate (Russian)
Currently translated at 100.0% (924 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-15 06:03:47 +00:00
Weblate
10019fb890 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:03:23 +00:00
Bamstam
b171636e1b Translated using Weblate (German)
Currently translated at 99.5% (917 of 921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 00:03:22 +00:00
Matthew Hodgson
2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages
Message/event pinning
2017-10-15 01:03:18 +01:00
Weblate
8f86a58261 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:45:53 +00:00
Matthew Hodgson
e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Weblate
a6a0fbfc91 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:43:16 +00:00
Matthew Hodgson
f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
Travis Ralston
8a641c7173 Hide message pinning behind a labs setting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
Travis Ralston
c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Weblate
9051efeecf Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:44:35 +00:00
Matthew Hodgson
9f64261707 Merge branch 'develop' into travis/alone_warning 2017-10-14 22:43:36 +01:00
Weblate
dde0cc1baa Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:13:35 +00:00
Matthew Hodgson
3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
Weblate
fd6d1f0a75 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:06:20 +00:00
Andrey
6dad6da66e Translated using Weblate (Russian)
Currently translated at 94.8% (870 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-14 21:06:20 +00:00
Carlos Marques
8efeab924a Translated using Weblate (Portuguese)
Currently translated at 93.0% (853 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-14 21:06:19 +00:00
Bamstam
329e258122 Translated using Weblate (German)
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-14 21:06:19 +00:00
Michael Telatynski
c1edc0c32e
add option to disable BigEmoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:40:45 +01:00
Travis Ralston
97ebd27175 Add missing translation
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 23:08:41 -06:00
Szimszon
34e9b10e95 Translated using Weblate (Hungarian)
Currently translated at 100.0% (917 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-13 16:44:09 +00:00
Luke Barnard
83e7fc242a Merge branch 'develop' into luke/groups-room-directory-esque 2017-10-13 17:48:35 +02:00
Luke Barnard
77418f535e Modify GroupView UI
- Remove featured users/rooms
 - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
 - Make the group view body scrollable
2017-10-13 16:46:33 +01:00
Szimszon
f5abd1c2c8 Translated using Weblate (Hungarian)
Currently translated at 93.5% (858 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-13 15:14:44 +00:00
Krombel
8405ec327e Translated using Weblate (German)
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-13 13:22:10 +00:00
Krombel
a9831f342f Translated using Weblate (German)
Currently translated at 93.4% (857 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-13 10:53:42 +00:00
Bamstam
e9cc088f7b Translated using Weblate (German)
Currently translated at 92.9% (852 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-13 10:50:50 +00:00
Weblate
872fc948c4 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 09:31:54 +00:00
Andrey
ead0b5d43f Translated using Weblate (Russian)
Currently translated at 92.8% (850 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-13 09:31:54 +00:00
Bamstam
264fe81f20 Translated using Weblate (German)
Currently translated at 93.1% (852 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-13 09:31:53 +00:00
Luke Barnard
065ae9580d Merge pull request #1459 from matrix-org/luke/groups-invite-warm-fuzzy
Add warm fuzzy dialog for inviting users to a group
2017-10-13 11:31:48 +02:00
Stefan Parviainen
45137f030b Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:18:50 +02:00
Andrey
915c15b454 Translated using Weblate (Russian)
Currently translated at 91.4% (837 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-12 17:38:22 +00:00
Osoitz
a0b3b29b68 Translated using Weblate (Basque)
Currently translated at 92.4% (846 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-10-12 17:38:21 +00:00
David Baker
ff3a2c1807 Translated using Weblate (English (United States))
Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-10-12 16:39:41 +00:00
Weblate
11b4ffe302 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/fr.json
	src/i18n/strings/it.json
	src/i18n/strings/nl.json
	src/i18n/strings/ru.json
	src/i18n/strings/th.json
2017-10-12 16:20:59 +00:00
Kevin Brubeck Unhammer
55cdbe6655 Translated using Weblate (Norwegian Bokmål)
Currently translated at 0.1% (1 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2017-10-12 15:29:32 +00:00
Carlos Marques
5955eab29a Translated using Weblate (Portuguese)
Currently translated at 100.0% (855 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-12 10:39:16 +00:00
Travis Ralston
f3b1baa3c0 Suggest to invite people when speaking in an empty room
Adds vector-im/riot-web#1053

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 21:15:00 -06:00
Stefan Parviainen
f694fb24ff Fix merge-conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 20:02:14 +02:00