Richard Lewis
|
29962ed89d
|
Add stickerpack strings.
|
2018-02-05 11:48:48 +00:00 |
|
lukebarnard
|
81eca49266
|
Merge branch 'luke/room-list-flux' of github.com:matrix-org/matrix-react-sdk into luke/room-list-flux
|
2018-02-05 11:40:42 +00:00 |
|
Luke Barnard
|
ff8fcb3139
|
Merge branch 'develop' into luke/room-list-flux
|
2018-02-05 11:39:39 +00:00 |
|
Weblate
|
5ddb0b9b4b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-05 10:21:10 +00:00 |
|
David Baker
|
ec3a37d9f3
|
Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard
guard against m.room.aliases events with no keys (redaction?)
|
2018-02-05 10:21:05 +00:00 |
|
Weblate
|
2d6dd988d6
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-05 10:14:28 +00:00 |
|
David Baker
|
3275a56013
|
Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites
Fix not showing Invited section if all invites are 3PID
|
2018-02-05 10:14:23 +00:00 |
|
Weblate
|
e1296a076e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-02-05 09:58:44 +00:00 |
|
Марко М. Костић
|
4133801390
|
Translated using Weblate (Serbian)
Currently translated at 78.4% (772 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
|
2018-02-05 09:58:44 +00:00 |
|
Simó Albert i Beltran
|
03b137d425
|
Translated using Weblate (Catalan)
Currently translated at 88.5% (871 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
|
2018-02-05 09:58:43 +00:00 |
|
David Baker
|
916ab68506
|
Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image
Fix Rich Replies on files
|
2018-02-05 09:58:37 +00:00 |
|
Nathan van Beelen
|
2a58de5cfc
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2018-02-04 14:24:39 +00:00 |
|
Nathan van Beelen
|
d884596a1f
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2018-02-04 14:23:33 +00:00 |
|
Osoitz
|
c3b000a368
|
Translated using Weblate (Basque)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
|
2018-02-02 08:28:22 +00:00 |
|
Michael Telatynski
|
d1a24ac87b
|
guard against m.room.aliases events with no keys (redaction?)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-02-02 08:12:56 +00:00 |
|
Kévin C
|
675bebee33
|
Translated using Weblate (French)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
|
2018-02-01 17:46:52 +00:00 |
|
Szimszon
|
cefd744aba
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
|
2018-02-01 16:15:54 +00:00 |
|
Krombel
|
325c9662c5
|
Translated using Weblate (German)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
|
2018-02-01 15:13:02 +00:00 |
|
Krombel
|
41c9cb1c27
|
Translated using Weblate (German)
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
|
2018-02-01 15:12:22 +00:00 |
|
Andrey
|
8b35a7b10f
|
Translated using Weblate (Russian)
Currently translated at 100.0% (222 of 222 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
|
2018-02-01 11:33:01 +00:00 |
|
David Baker
|
456aebe240
|
Merge pull request #6040 from sim6/sim6_catalan
Add Catalan
|
2018-02-01 10:47:01 +00:00 |
|
David Baker
|
66e20298a7
|
Merge pull request #5777 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-02-01 10:45:56 +00:00 |
|
David Baker
|
e51dbd49f9
|
Merge pull request #1728 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
|
2018-02-01 10:38:08 +00:00 |
|
David Baker
|
497cf21c86
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
|
2018-02-01 10:35:12 +00:00 |
|
Weblate
|
a6155c98ec
|
Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts:
src/i18n/strings/eo.json
|
2018-02-01 10:24:21 +00:00 |
|
Марко М. Костић
|
a26473b722
|
Translated using Weblate (Serbian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
|
2018-02-01 09:48:47 +00:00 |
|
Xose M
|
ed5162ef4e
|
Translated using Weblate (Galician)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
|
2018-02-01 09:48:46 +00:00 |
|
Tong Hui
|
930deaea9d
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
|
2018-02-01 09:48:45 +00:00 |
|
Simó Albert i Beltran
|
b80be62bb7
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
|
2018-02-01 09:48:45 +00:00 |
|
Osoitz
|
11806f2aa2
|
Translated using Weblate (Basque)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
|
2018-02-01 09:48:45 +00:00 |
|
David Baker
|
0d229f015b
|
Merge pull request #5718 from vector-im/t3chguy/devtools-118247
make FilteredList controlled, such that it can externally persist filter
|
2018-02-01 09:48:40 +00:00 |
|
Weblate
|
ee81d6aea1
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-31 18:10:59 +00:00 |
|
Nathan van Beelen
|
3a33eea5e9
|
Translated using Weblate (Dutch)
Currently translated at 75.5% (743 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2018-01-31 18:10:57 +00:00 |
|
David Baker
|
4c17b5f1c7
|
Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard
Null guard against falsey (non-null) props.node, to make react happy
|
2018-01-31 18:10:52 +00:00 |
|
Weblate
|
f193b3ae2c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-30 15:21:19 +00:00 |
|
David Baker
|
cfd1f28258
|
Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync
Use correct condition for getting account data after first sync
|
2018-01-30 15:21:12 +00:00 |
|
Michael Telatynski
|
8a6727ea98
|
This is actually MFileBody not MImageBody, change classname
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-30 10:55:23 +00:00 |
|
Weblate
|
1fa9e7420f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-30 10:27:20 +00:00 |
|
Марко М. Костић
|
977dec40a3
|
Translated using Weblate (Serbian)
Currently translated at 60.8% (599 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
|
2018-01-30 10:27:19 +00:00 |
|
Szimszon
|
fd4fc883c1
|
Translated using Weblate (Hungarian)
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
|
2018-01-30 10:27:19 +00:00 |
|
Walter
|
5e34c8043f
|
Translated using Weblate (German)
Currently translated at 98.9% (974 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
|
2018-01-30 10:27:19 +00:00 |
|
Xose M
|
8d902010f8
|
Translated using Weblate (Galician)
Currently translated at 99.1% (976 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
|
2018-01-30 10:27:18 +00:00 |
|
Nathan van Beelen
|
4afdefb926
|
Translated using Weblate (Dutch)
Currently translated at 73.9% (728 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2018-01-30 10:27:18 +00:00 |
|
Simó Albert i Beltran
|
5c7bdcec4f
|
Translated using Weblate (Catalan)
Currently translated at 88.5% (871 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
|
2018-01-30 10:27:18 +00:00 |
|
Osoitz
|
819dd93d1f
|
Translated using Weblate (Basque)
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
|
2018-01-30 10:27:18 +00:00 |
|
David Baker
|
c7afaed3a7
|
Merge pull request #1725 from matrix-org/luke/fix-room-list-reordering
Fix order calculation logic when reordering a room
|
2018-01-30 10:27:13 +00:00 |
|
lukebarnard
|
c5a3a02e1d
|
Fix order calculation logic when reordering a room
|
2018-01-30 10:14:05 +00:00 |
|
Michael Telatynski
|
6dd63ae644
|
Null guard against falsey (non-null) props.node, to make react happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-29 19:17:46 +00:00 |
|
Walter
|
078d156824
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (220 of 220 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
|
2018-01-29 17:06:45 +00:00 |
|
Michael Telatynski
|
5764280588
|
Persist contentState when sending SlashCommand via MessageComposerInput
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-29 09:09:22 +00:00 |
|