PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
6100 commits 1 branch 0 tags 338 MiB
Commit graph

6100 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
9818007022 Fix i18n variable names and )s syntax for TE.json (Tegulu) 2017-08-15 17:29:55 +01:00
Luke Barnard
60c2532616 Merge pull request #1304 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-08-15 16:27:42 +01:00
Luke Barnard
454a848e47 Remove erroneous line 2017-08-15 15:10:23 +01:00
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
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
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
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
Luke Barnard
e48c4911b8 Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel 
Revert "At /user, view member of current room"
 2017-08-14 16:31:24 +01:00
Luke Barnard
1ce433b5f6 Merge pull request #1296 from matrix-org/luke/fix-rm-stuck-on-1-event-mels 
Display RM when it = a standalone member event
 2017-08-14 15:51:22 +01:00
Luke Barnard
0079e70006 Display RM when it = a standalone member event 
Standalone = not next to any member events in the timeline.

fixes vector-im/riot-web#4694
 2017-08-14 15:40:49 +01:00
Luke Barnard
ecd1735a11 Merge pull request #1293 from matrix-org/luke/disable-matrix-apps 
Disable widgets prior to release
 2017-08-14 15:17:53 +01:00
Luke Barnard
9742962d61 preventDefault when moving autocomplete selection with vertical arrow 
Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790
 2017-08-14 15:16:13 +01:00
Luke Barnard
867e83edff Fix log to include some useful info 2017-08-14 14:47:26 +01:00
Luke Barnard
bb229d33a4 Add onClick to user pills 
instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.
 2017-08-14 14:44:08 +01:00
Luke Barnard
2844b574d5 Re-add useful comment 2017-08-14 14:41:03 +01:00
Luke Barnard
b59de7964c Wait for first sync before dispatching view_user on /user 
the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.
 2017-08-14 14:37:49 +01:00
Luke Barnard
d9e8292a5e Revert "At /user, view member of current room" 2017-08-14 14:06:54 +01:00
Luke Barnard
3d5d7fa9c8 Lint 2017-08-14 13:59:12 +01:00
Luke Barnard
c97ae5c2e1 Override matrix-apps to be disabled 
- ignores localStorage setting
 - hides feature from labs section in user settings
 2017-08-14 12:29:42 +01:00