Commit Graph
8002 Commits
Author SHA1 Message Date
Michael Telatynski 97fecaedc2 improve wording
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:26:42 +01:00
Michael Telatynski 4a0a5c6bef Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to 2018-04-27 11:23:12 +01:00
Michael Telatynski 82d117974f Remove unused import
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:16:29 +01:00
Michael Telatynski 3de679b084 Add comment to HtmlUtils.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:14:50 +01:00
Michael TelatynskiandGitHub 0f11bc62cc undo code style change 2018-04-23 10:58:39 +01:00
Michael Telatynski 5f920f729b Reset accidental merge changes 2.0
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-23 10:35:02 +01:00
Michael Telatynski 057815ac9f Reset accidental merge changes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-23 10:30:14 +01:00
Michael TelatynskiandGitHub d680d805ce Merge branch 'develop' into t3chguy/m.relates_to 2018-04-23 10:14:48 +01:00
Matthew HodgsonandGitHub 44d92bb32e Merge pull request #1843 from aidalgol/room-avatar-lightbox
Add UI for displaying room avatars full size
2018-04-21 20:35:13 +01:00
Aidan Gauland 6a918861bb Add UI for displaying room avatars full size
Change the onClick action on the RoomAvatar inside RoomHeader so that it brings
up a lightbox with the full-size avatar.
2018-04-21 15:47:31 +12:00
David Baker 196b855cd5 Merge translations from riot-web
Translations that were added to the riot-web repo after the
containing files had been moved here.
2018-04-20 15:50:23 +01:00
David Baker ce3d813c12 Prune i18n 2018-04-20 15:37:19 +01:00
David Baker 6154c13c95 Re-run npm run i18n 2018-04-20 15:35:31 +01:00
Weblate 54561b655a Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/bg.json
	src/i18n/strings/da.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/eo.json
	src/i18n/strings/eu.json
	src/i18n/strings/gl.json
	src/i18n/strings/it.json
	src/i18n/strings/ja.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/sk.json
	src/i18n/strings/zh_Hans.json
2018-04-20 13:57:45 +00:00
adrian-007andWeblate 105a0d6891 Translated using Weblate (Polish)
Currently translated at 76.9% (778 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-04-20 13:43:36 +00:00
torikoandWeblate 53889706d7 Translated using Weblate (Japanese)
Currently translated at 8.8% (89 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2018-04-20 13:43:36 +00:00
Gergely BakosandWeblate e04c762a50 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-20 13:43:36 +00:00
Kévin CandWeblate a5f4782964 Translated using Weblate (French)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-20 13:43:36 +00:00
RainSlideandWeblate 9685118f16 Translated using Weblate (Chinese (Simplified))
Currently translated at 97.0% (981 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-20 13:43:35 +00:00
KrombelandWeblate 6177a42dbf Translated using Weblate (German)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-04-20 12:07:18 +00:00
Michael Telatynski 941bb94234 fix reply fallback blunder
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 10:15:15 +01:00
Michael Telatynski 7e8288f7ae i18n-gen, i18n-prune
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:39:14 +01:00
Michael Telatynski 06408f843b post BigMerge fixup - merge in stuff from riot-web PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:23:27 +01:00
Michael Telatynski 58cd585e86 start of BigMerge fixup
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-20 09:12:02 +01:00
ValandWeblate ccd295bc00 Translated using Weblate (French)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-20 06:21:09 +00:00
Peter VágnerandWeblate b0eb350c41 Translated using Weblate (Slovak)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-04-18 15:31:05 +00:00
WalterandWeblate 7934c50407 Translated using Weblate (Russian)
Currently translated at 99.9% (1010 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-18 15:31:04 +00:00
torikoandWeblate 7700df4c2d Translated using Weblate (Japanese)
Currently translated at 7.4% (75 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2018-04-18 15:31:04 +00:00
randomandWeblate 8fc7cc4075 Translated using Weblate (Italian)
Currently translated at 99.5% (1006 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-04-18 15:31:04 +00:00
Xose MandWeblate 249edb7b76 Translated using Weblate (Galician)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-04-18 15:31:04 +00:00
RainSlideandWeblate 895521f0e8 Translated using Weblate (Chinese (Simplified))
Currently translated at 90.8% (918 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-18 15:31:03 +00:00
Matthew Hodgson 92c98aa3e5 displayName should be tracked as static 2018-04-18 16:19:37 +01:00
Matthew Hodgson f84573ec9f convert HomePage to ES6 and split out the vectory bit 2018-04-18 10:23:32 +01:00
Matthew Hodgson d91c7f5e54 Add comment about enum hijinks 2018-04-17 16:53:11 +01:00
Matthew Hodgson ce809e16d9 fix i18n thinko on createTrackedDialog 2018-04-17 16:51:17 +01:00
Matthew Hodgson eca5a965c5 add i18n which weren't correctly copied over from vector-web by copy-i18n 2018-04-17 16:50:24 +01:00
Peter VágnerandWeblate e746fc99d3 Translated using Weblate (Slovak)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-04-17 14:04:49 +00:00
OsoitzandWeblate 1e61091423 Translated using Weblate (Basque)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-04-17 08:56:11 +00:00
Nathan van BeelenandWeblate 22f5d5ba6a Translated using Weblate (Dutch)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-04-16 08:27:51 +00:00
Matthew Hodgson 32dd7f976f merge vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 00:04:04 +01:00
Matthew Hodgson 4da804fd64 Merge branch 'develop' into matthew/fix_layering 2018-04-15 23:59:09 +01:00
Matthew Hodgson df564af8bd run prune-i18n to bring the translations back in line with normalised en_EN 2018-04-15 23:18:47 +01:00
Matthew Hodgson faa1924902 run gen-i18n to normalise en_EN and remove stuff still in vector-web 2018-04-15 23:18:18 +01:00
Matthew Hodgson cb5ff404e1 fix missing i18n 2018-04-15 23:16:31 +01:00
Matthew Hodgson a30fdaf293 copy all the i18n over from vector-web via copy-i18n.py 2018-04-15 23:00:38 +01:00
Xose MandWeblate 33632aaae6 Translated using Weblate (Galician)
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-04-15 19:13:14 +00:00
Matthew Hodgson 610747e76a fix paths and updateCheckStatusEnum 2018-04-13 16:49:59 +01:00
Michael Telatynski a90bd6cd4f Allow collapsing ReplyThread from MessageContextMenu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-13 12:28:58 +01:00
Weblate 841bf4f894 Merge remote-tracking branch 'origin/develop' into develop 2018-04-13 09:58:49 +00:00
RainSlideandWeblate acf8ea1a65 Translated using Weblate (Chinese (Simplified))
Currently translated at 81.0% (819 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-13 09:58:48 +00:00