Commit graph

6938 commits

Author SHA1 Message Date
Luke Barnard
b40cc111bd Remove incidental diff syntax 2017-08-15 15:03:25 +01:00
Weblate
d443368aa3 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/en_EN.json
	src/i18n/strings/fr.json
	src/i18n/strings/ru.json
2017-08-15 14:00:35 +00:00
strix aluco
97ee9d72db Translated using Weblate (Ukrainian)
Currently translated at 19.1% (175 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-08-15 13:39:11 +00:00
Pitchaya Boonsarngsuk
df898e1c45 Translated using Weblate (Thai)
Currently translated at 70.4% (645 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
2017-08-15 13:39:10 +00:00
Sri Lakshmi
5112134345 Translated using Weblate (Telugu)
Currently translated at 36.7% (337 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
2017-08-15 13:39:10 +00:00
Max Sandholm
29b5a03e02 Translated using Weblate (Swedish)
Currently translated at 56.8% (521 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-08-15 13:39:10 +00:00
Simó Albert i Beltran
4da6c811e9 Translated using Weblate (Spanish)
Currently translated at 69.9% (641 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-08-15 13:39:10 +00:00
Alexey Murz Korepov
7bc754618e 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-08-15 13:39:10 +00:00
daniel tygel
2f373de574 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2017-08-15 13:39:10 +00:00
Tomasz Kontusz
435028a68b Translated using Weblate (Polish)
Currently translated at 30.5% (280 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-08-15 13:39:10 +00:00
test9753
3e765d52bc Translated using Weblate (Malayalam)
Currently translated at 4.1% (38 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/
2017-08-15 13:39:10 +00:00
Lauris Mierkalns
430389309d Translated using Weblate (Latvian)
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/lv/
2017-08-15 13:39:10 +00:00
yuurii
535b16ac3f Translated using Weblate (Japanese)
Currently translated at 20.8% (191 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2017-08-15 13:39:10 +00:00
random
e7ccd6792c Translated using Weblate (Italian)
Currently translated at 19.2% (176 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-08-15 13:39:10 +00:00
Oon Arfiandwi
2c3484bfe6 Translated using Weblate (Indonesian)
Currently translated at 25.3% (232 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/id/
2017-08-15 13:39:10 +00:00
Kevin Németh
013fa108b5 Translated using Weblate (Hungarian)
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/hu/
2017-08-15 13:39:10 +00:00
Bamstam
3578234689 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-08-15 13:39:10 +00:00
Brendan Abolivier
b77aa5b2a8 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-08-15 13:39:10 +00:00
Ross Schulman
b3989bb01a Translated using Weblate (Esperanto)
Currently translated at 1.4% (13 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2017-08-15 13:39:10 +00:00
Andrey
c332a26322 Translated using Weblate (English)
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/en_EN/
2017-08-15 13:39:09 +00:00
Nathan van Beelen
bd2fd07959 Translated using Weblate (Dutch)
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/nl/
2017-08-15 13:39:09 +00:00
Jeff Huang
7d7afeb276 Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2017-08-15 13:39:09 +00:00
Tong Hui
9150b687eb Translated using Weblate (Chinese (Simplified))
Currently translated at 40.6% (372 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-08-15 13:39:09 +00:00
Osoitz
cc6af53db8 Translated using Weblate (Basque)
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/eu/
2017-08-15 13:39:09 +00:00
Rami Taibah
14c474c6ef Translated using Weblate (Arabic)
Currently translated at 1.2% (11 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/
2017-08-15 13:39:09 +00:00
David Baker
e1ddd3781d Merge branch 'dbkr/userpicker' into dbkr/group_userlist 2017-08-15 14:10:45 +01:00
Luke Barnard
5b1467a4c9 Allow autocompletion when typing user IDs
Because we need to support tab completing `"@some_user"` if `@some_user` has a display name that is totally different and will therefore not match what the user typed in.

This does have the disadvantage of a display name appearing (the pill) that isn't at all what the user typed in, but the autocomplete box and the tooltip should give enough information to let the user know what's going on. (e.g. typing `@kyr*tab*` and getting `Remmy`).

This _does_ run contrary to vector-im/riot-web#4495

related to vector-im/riot-web#4794

cc @lampholder
2017-08-15 14:08:26 +01:00
David Baker
753ea38654 Add UserAddress 2017-08-15 14:01:50 +01:00
David Baker
0df8a63847 de-lint Invite.js 2017-08-15 13:50:15 +01:00
David Baker
81273ec855 Move non-invite specific stuff to UserAddress 2017-08-15 13:42:23 +01:00
David Baker
bbcf7e1d9b s/inviteList/userList/ 2017-08-15 13:30:13 +01:00
David Baker
a15c2100d1 Sort out right panel callapsing on GroupView 2017-08-15 13:12:39 +01:00
Luke Barnard
472b5b5350 Merge pull request #1299 from matrix-org/luke/fix-text-offsets-to-selection-state
Fix bugs in textOffsetsToSelectionState
2017-08-15 11:37:35 +01:00
David Baker
fa660c8211 PR feedback 2017-08-15 10:57:24 +01:00
David Baker
64f352dda7 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:07 +01:00
Luke Barnard
65dc9fda6e Alter comments 2017-08-15 09:25:23 +01:00
Luke Barnard
5f00bbbff6 Add comments 2017-08-15 09:22:50 +01:00
Luke Barnard
004cc42cfc Merge pull request #1298 from matrix-org/luke/store-history-as-raw-content
Store history as raw content
2017-08-15 09:18:22 +01:00
Luke Barnard
6baca05968 Merge pull request #1297 from matrix-org/luke/fix-user-pill-onclick
Add onClick to user pills
2017-08-15 09:15:50 +01:00
David Baker
b7b449434d Lint 2017-08-15 09:10:13 +01:00
David Baker
d1c54e1224 Switch to prop-types 2017-08-15 08:58:08 +01:00
krombel
00d69aa938 Update Link to Translation status
The translation is now done at translate.riot.im but the link was not updated
2017-08-15 00:32:38 +02:00
Zero
798d68b4c8 Include magnet scheme in sanitize HTML params
Update HtmlUtils sanitze-html params to include the magnet scheme
2017-08-14 19:42:00 +02:00
David Baker
1b66e88b6e ChatInviteDialog -> UserPickerDialog pt 2
The other changes I forgot to add
2017-08-14 17:43:00 +01:00
David Baker
447aa1e5a0 Refactor ChatInviteDialog to be UserPickerDialog
Now it's just a means of choosing users and all the actual inviting
functionality is moved out to Invite.js. This will allow us to
reuse it for inviting to groups.

Adds the ability to restrict what types of addresses may be chosen,
although this isn;t used yet, it will be necessary for groups
because groups don't support 3pid invites.
2017-08-14 17:38:59 +01:00
Luke Barnard
844ca249d0 Fix bugs in textOffsetsToSelectionState
This just had some thinkos in it. Namely the conditionals were slightly wrong and this lead to negative offset selection state being returned, causing vector-im/riot-web#4792

fixes vector-im/riot-web#4792
2017-08-14 17:31:16 +01:00
Luke Barnard
ecef9cf22f Use plaintext when loading a markdown history item into RT mode 2017-08-14 16:48:29 +01:00
Luke Barnard
6b1b643d41 Merge branch 'develop' into luke/store-history-as-raw-content 2017-08-14 16:42:22 +01:00
Luke Barnard
7d10a7556b Merge pull request #1295 from matrix-org/luke/fix-emoji-picker-gone
preventDefault when moving autocomplete selection with vertical arrow
2017-08-14 16:37:32 +01:00
Luke Barnard
5eff2a3df2 Merge branch 'develop' into luke/fix-user-pill-onclick 2017-08-14 16:32:01 +01:00