Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
10,418 Commits 1 Branch 646 Tags
a470f250b59bc97a972a91304754da6fe7dc1cff
Commit Graph

8739 Commits

Author SHA1 Message Date
Weblate a470f250b5 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:39:00 +00:00
Luke Barnard 5b8e453484 Merge pull request #1991 from matrix-org/t3chguy/delint_MImageBody 
delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry
 2018-06-22 10:38:56 +01:00
Weblate fe3b9dbed2 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:35:34 +00:00
Luke Barnard f15b877a55 Merge pull request #1977 from matrix-org/t3chguy/ctrl-k_tab 
allow using tab to navigate room list in a smarter way
 2018-06-22 10:35:28 +01:00
Weblate 4ef8defd90 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:34:10 +00:00
Luke Barnard 9265f0d032 Merge pull request #1990 from matrix-org/t3chguy/no_displayname 
fix no displayname usersettings
 2018-06-22 10:34:04 +01:00
Weblate 3b2349b28c Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:24:10 +00:00
Luke Barnard 8b257f2f50 Merge pull request #1989 from matrix-org/t3chguy/right_click_tagpanel_contextmenu 
trigger TagTile context menu on right click
 2018-06-22 10:23:58 +01:00
random ca2937cd65 Translated using Weblate (Italian) 
Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-06-21 15:38:26 +00:00
Weblate 6642292d1e Merge remote-tracking branch 'origin/develop' into develop 2018-06-21 13:07:59 +00:00
Michael Telatynski 26aec4364d Merge pull request #2000 from matrix-org/t3chguy/deduplicate_address_picker 
hide already chosen results from AddressPickerDialog
 2018-06-21 14:07:52 +01:00
Michael Telatynski be612998bd invert boolean operation for readability and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 12:14:16 +01:00
Michael Telatynski 0737965079 s/userList/selectedList/ & s/queryList/suggestedList/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 12:13:27 +01:00
Weblate dd421b92cd Merge remote-tracking branch 'origin/develop' into develop 2018-06-21 11:00:21 +00:00
Luke Barnard e148eb1a93 Merge pull request #2002 from matrix-org/t3chguy/fix_ChatCreateOrReuseDialog_onCancel 
delint ChatCreateOrReuseDialog
 2018-06-21 12:00:15 +01:00
Weblate 0fabed5570 Merge remote-tracking branch 'origin/develop' into develop 2018-06-21 10:42:59 +00:00
Michael Telatynski a0207fb7fd Merge pull request #1982 from matrix-org/t3chguy/nvl/fix_set_password-email_flow 
fix set password & email flow possible to get stuck and onBlur murdering your email
 2018-06-21 11:42:53 +01:00
Michael Telatynski 2428eb12af delint ChatCreateOrReuseDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 11:37:37 +01:00
Slavi Pantaleev cb6c41ae66 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-06-21 09:50:06 +00:00
Weblate 0c38f9aa40 Merge remote-tracking branch 'origin/develop' into develop 2018-06-21 09:13:31 +00:00
Marek Lach d4e3301dd9 Translated using Weblate (Czech) 
Currently translated at 90.2% (1080 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2018-06-21 09:13:29 +00:00
Michael Telatynski fd252ded60 take into account the addressType also 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 00:47:21 +01:00
Michael Telatynski 4040e3f5cf delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 00:37:37 +01:00
Michael Telatynski bce87829b6 hide already chosen results from AddressPickerDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 00:33:24 +01:00
Marek Lach 28ef65c4aa Translated using Weblate (Slovak) 
Currently translated at 100.0% (1197 of 1197 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-06-20 17:18:20 +00:00
Michael Telatynski 884fa3b913 use existing command hashmap over linear array search 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-20 17:25:23 +01:00
Michael Telatynski 7d9d17145c change so that if someone enters invalid command with args we strict match 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-20 17:21:06 +01:00
Michael Telatynski f5b12bd66a slash got consumed in the consolidation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-20 17:09:49 +01:00
Weblate 8a4f6f0048 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/gl.json
 2018-06-20 09:13:31 +00:00
David Baker e5a509bb91 i18n & prunei18n 2018-06-20 10:04:03 +01:00
David Baker 2e2c347ef7 Merge remote-tracking branch 'origin/develop' into dbkr/unlabs_replies 2018-06-20 10:03:05 +01:00
Miguel Branco 0011f23125 Translated using Weblate (Galician) 
Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-06-20 09:01:27 +00:00
David Baker 0e8b4ac2ad i18n & prunei18n 2018-06-20 10:01:09 +01:00
David Baker e67dae704a Take replies out of labs! 2018-06-20 09:57:11 +01:00
Michael Telatynski fffb8379d8 delint MImageBody, fixes anonymous class and hyphenated style keys which made react cry 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 08:37:11 +01:00
Michael Telatynski 9fa7cb8635 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 07:57:28 +01:00
Michael Telatynski baf0d37983 un-break having no displayname user settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-19 07:56:04 +01:00
Michael Telatynski 29ea4025d4 trigger TagTile context menu on right click 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 22:13:20 +01:00
Weblate 56507c1f4b Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 18:33:09 +00:00
Michael Telatynski e79738de8a Merge branch 't3chguy/improve_command_provider' into develop 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/autocomplete/CommandProvider.js
 2018-06-18 19:32:54 +01:00
Michael Telatynski 9107744da7 simplify arrow func 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 19:32:12 +01:00
Michael Telatynski 5bf3e5b00a consolidate the two locations commands are defined, as it was a MESS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 19:31:40 +01:00
Michael Telatynski f2e4e515c1 delint EditableText 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 18:21:16 +01:00
Michael Telatynski 3449a60d32 fix onBlur breaking the SetEmail field (setting it back empty :() 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 18:21:04 +01:00
Michael Telatynski 015d433235 fix a way to get stuck in set password/email flow 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 18:14:48 +01:00
Michael Telatynski 6301c04590 Merge branch 'develop' into t3chguy/ctrl-k_tab 2018-06-18 18:01:41 +01:00
Weblate 9f9dbda7f7 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 16:55:07 +00:00
Miguel Branco 0383937e0d Translated using Weblate (Galician) 
Currently translated at 100.0% (1203 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-06-18 16:55:05 +00:00
Luke Barnard d6f0f77561 Fix MATRIXTO_URL_PATTERN RegExp groups 
Fixes https://github.com/vector-im/riot-web/issues/6900
Fixes https://github.com/vector-im/riot-web/issues/6899
 2018-06-18 17:46:22 +01:00
Luke Barnard bea52eccf8 Remove unused import, constant 2018-06-18 17:40:48 +01:00