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 |
|
Luke Barnard
|
df58715a17
|
Merge pull request #1998 from matrix-org/t3chguy/fix_commands
slash got consumed in the consolidation
|
2018-06-21 10:13:23 +01: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
|
4508da5666
|
only override contextmenu if closeMenu is provided
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-20 18:03:15 +01:00 |
|
Michael Telatynski
|
7cd8a5a2b2
|
allow chaining right click contextmenus
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-20 18:01:37 +01: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 |
|
David Baker
|
4dba23b81d
|
Merge pull request #1997 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
|
2018-06-20 14:06:05 +01:00 |
|
Weblate
|
14cf2327b4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-06-20 12:56:37 +00:00 |
|
David Baker
|
a6d9c25b70
|
Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands
refactor, consolidate and improve SlashCommands
|
2018-06-20 13:56:29 +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
|
86abf8bf50
|
Merge pull request #1996 from matrix-org/dbkr/unlabs_replies
Take replies out of labs!
|
2018-06-20 10:10:24 +01: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
|
5cc15b2e03
|
add additional classes which protect the text from overflowing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-19 19:11:22 +01:00 |
|
Michael Telatynski
|
287745f8c6
|
delint, remove unused imports and fix flow annotations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-19 12:06:13 +01:00 |
|
Michael Telatynski
|
c1e608f1a8
|
show permalinks to communities as Pills
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-19 11:53:17 +01:00 |
|
Michael Telatynski
|
b79cd205a0
|
Support autocompleting Communities
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-19 11:52:48 +01:00 |
|
Michael Telatynski
|
72f50a8c61
|
rewrite group permalinks in <a hrefs> also
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-19 11:51:06 +01:00 |
|
Michael Telatynski
|
6200c147a6
|
Upload File confirmation modal steals focus, send it back to composer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-19 08:41:24 +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
|
5293fcc768
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-06-18 18:44:08 +00:00 |
|
Michael Telatynski
|
1352abf317
|
Merge pull request #1987 from matrix-org/luke/fix-matrix-to-regex
re-merge reset PR
|
2018-06-18 19:44:03 +01:00 |
|
Michael Telatynski
|
9de6bf4f5a
|
once command has a space, strict match instead of fuzzy match
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit a852033)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-18 19:36:11 +01:00 |
|
Michael Telatynski
|
107802fa29
|
simplify arrow func
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-18 19:34:46 +01:00 |
|
Michael Telatynski
|
85ddc0651b
|
consolidate the two locations commands are defined, as it was a MESS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-06-18 19:34:40 +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 |
|