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

9099 commits

Author SHA1 Message Date
Michael Telatynski
96163d1402
prevent multiple ports (🔢1234:1234) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 23:41:46 +01:00
Michael Telatynski
9f3a121abc
optimize linkify-matrix by skipping an intermediary state 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 23:36:01 +01:00
Michael Telatynski
09b09846cf
allow :port specifiers in roomalias,groupid and userid as per spec 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 23:33:35 +01:00
Peter Vágner
5c7f2cc32f Translated using Weblate (Slovak) 
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-06-26 19:58:27 +00:00
Weblate
12d020909e Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 17:26:34 +00:00
David Baker
67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist 
fix historical section
 2018-06-26 18:26:29 +01:00
Weblate
a1b32d865d Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 17:23:42 +00:00
David Baker
fddb576c3a
Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize 
Fix RoomSubList headers by re-commiting 1faecfd
 2018-06-26 18:23:38 +01:00
Weblate
45c31c0b24 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:46:57 +00:00
Peter Vágner
fc593d7359 Translated using Weblate (Slovak) 
Currently translated at 99.8% (1204 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-06-26 16:46:57 +00:00
Michael Telatynski
f40802e9d8
Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop 
don't fire share dialog when clicking timestamp of event,
 2018-06-26 17:46:52 +01:00
Weblate
0724a033a6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:15:25 +00:00
Peter Vágner
d91730d930 Translated using Weblate (Slovak) 
Currently translated at 99.7% (1203 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-06-26 16:15:24 +00:00
David Baker
10e39d5a5d
Merge pull request #2019 from matrix-org/t3chguy/room_settings_leave_room 
when the user switches room, close room settings
 2018-06-26 17:15:19 +01:00
Michael Telatynski
a548c83647
when the user switches room, close room settings 
this is especially annoying if they choose Leave Room
which indirectly switches room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 17:07:39 +01:00
Luke Barnard
19e948155c Redact pathnames with origin file:// 2018-06-26 17:06:45 +01:00
Weblate
12e5eb5f78 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:00:07 +00:00
Peter Vágner
cef624d6be Translated using Weblate (Slovak) 
Currently translated at 99.8% (1202 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-06-26 16:00:06 +00:00
Andrey
e1afe2a469 Translated using Weblate (Russian) 
Currently translated at 99.6% (1200 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-06-26 16:00:06 +00:00
Marek Lach
b1b140d7aa Translated using Weblate (Czech) 
Currently translated at 89.8% (1082 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2018-06-26 16:00:05 +00:00
Michael Telatynski
67f803bc5f
don't fire share dialog when clicking timestamp of event, 
it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 16:59:49 +01:00
Marek Lach
4fb4589ebd Translated using Weblate (Slovak) 
Currently translated at 99.7% (1201 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-06-26 15:52:27 +00:00
David Baker
0ee8d18f5a More code de-duping 2018-06-26 16:41:44 +01:00
David Baker
c780cd05a8 Change argument order of setRoomWidget 
So when deleting a widget we can just omit the ones we don't need
 2018-06-26 16:33:28 +01:00
David Baker
a88297d7a6 More code reuse 2018-06-26 16:27:17 +01:00
David Baker
9539a749e5 More refactoring 2018-06-26 16:03:58 +01:00
David Baker
cb89406d3e Indent 2018-06-26 15:42:29 +01:00
David Baker
4a39297e65 PR feedback 2018-06-26 15:41:43 +01:00
Krombel
c971b685ad Translated using Weblate (German) 
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-06-26 14:35:54 +00:00
David Baker
0a6450507e Bits of PR feedback 2018-06-26 15:21:22 +01:00
David Baker
b6f3b2f594 More code re-use 2018-06-26 12:28:59 +01:00
David Baker
ca8a4a0c3f Remove unused function 2018-06-26 12:08:33 +01:00
David Baker
6cf11a15e6 Move WidgetUtils to utils dir 2018-06-26 11:59:16 +01:00
David Baker
0f2c47937c Merge the two different widget utils files 2018-06-26 11:52:21 +01:00
David Baker
069080e7ed lint 2018-06-26 09:41:20 +01:00
Michael Telatynski
abd37d141e
clear up if statement to make it more readable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:54:38 +01:00
Michael Telatynski
f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
 2018-06-26 07:51:16 +01:00
Michael Telatynski
cdf7101222
run gen-i18n and prune-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:46:48 +01:00
Michael Telatynski
9b50daa748
give Historical an emptyContent to make it look more consistent 
and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:46:33 +01:00
Osoitz
e2edf78abb Translated using Weblate (Basque) 
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-06-26 04:44:14 +00:00
Jeff Huang
f88d26d71c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-06-26 00:20:06 +00:00
Szimszon
c23bb39203 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-06-25 17:43:22 +00:00
Kévin C
95728e73bb Translated using Weblate (French) 
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-06-25 16:12:33 +00:00
Luke Barnard
e292ee942f Fix RoomSubList headers by re-commiting 1faecfd 
The original got reverted in ebfafb36 somehow.
 2018-06-25 16:37:45 +01:00
David Baker
5c8eeff08a Refactor widgets code 
Split logic out of setWidget & re-use it when we add jitsi widgets.

Also fix the detection of existing jitsi widgets and make that use
getRoomWidgets() too.

Add error message when a jitsi call is already in process.
 2018-06-25 15:30:04 +01:00
Weblate
bc7858193b Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 13:29:14 +00:00
Michael Telatynski
de316134a9
Merge branch 'develop' into t3chguy/login_local_error 2018-06-25 13:35:14 +01:00
Weblate
9a2c838ae2 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 12:24:34 +00:00
David Baker
6577671cf0
Merge pull request #2011 from matrix-org/t3chguy/improve_linkifier 
Improve Linkifier
 2018-06-25 13:24:28 +01:00
Weblate
67e150aea1 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 12:23:09 +00:00
David Baker
317c38ccdf
Merge pull request #2010 from matrix-org/t3chguy/message_context_menu 
use enum constants for EventStatus and correct isSent check
 2018-06-25 13:23:02 +01:00
Kévin C
24a48daad8 Translated using Weblate (French) 
Currently translated at 100.0% (1200 of 1200 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-06-25 11:48:27 +00:00
Weblate
ff655a6bdd Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 11:13:26 +00:00
David Baker
7ef4377e57
Merge pull request #2007 from matrix-org/t3chguy/accent_insensitive_userprovider 
accent insensitive autocomplete
 2018-06-25 12:13:20 +01:00
Osoitz
f941587d01 Translated using Weblate (Basque) 
Currently translated at 100.0% (1200 of 1200 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-06-25 10:56:39 +00:00
Weblate
fb7c26d21c Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:50:21 +00:00
David Baker
553111b6e2
Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee 
default to not showing url previews in e2ee rooms.
 2018-06-25 11:50:14 +01:00
Weblate
b38149e74d Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:34:16 +00:00
David Baker
e29e106efc
Merge pull request #1999 from matrix-org/t3chguy/chain_contextmenu 
allow chaining right click contextmenus
 2018-06-25 11:34:10 +01:00
Weblate
4d85d0ab53 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:30:12 +00:00
Michael Telatynski
301b8b8c56
Merge pull request #1954 from matrix-org/t3chguy/hide_empty_sublist 
hide empty roomsublists when filtering via search/tagpanel
 2018-06-25 11:30:03 +01:00
Weblate
7f8f6910ef Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:18:24 +00:00
Luke Barnard
fc816369da
Merge pull request #2012 from matrix-org/t3chguy/autocomplete_mid_word 
prevent user,room,group autocomplete firing mid-word
 2018-06-25 11:18:16 +01:00
Kenneth Larsson
6addfdbcbb Translated using Weblate (Swedish) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-06-25 10:12:30 +00:00
Weblate
0bf4fbdfa9 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 09:22:36 +00:00
Luke Barnard
a24cb8e678
Merge pull request #2008 from matrix-org/t3chguy/focus_composer 
fix instances of composer not getting/regaining focus
 2018-06-25 10:22:29 +01:00
Michael Telatynski
fabdf22aad
delint RoomSubList and generate eslintignore file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-25 09:54:33 +01:00
Weblate
c518d0df9a Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 08:53:31 +00:00
strix aluco
06f55b51b8 Translated using Weblate (Ukrainian) 
Currently translated at 27.5% (330 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2018-06-25 08:53:30 +00:00
Марко М. Костић
0ccca7972e Translated using Weblate (Serbian) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-06-25 08:53:30 +00:00
Paweł Kozioł
e1f82f4120 Translated using Weblate (Polish) 
Currently translated at 93.8% (1124 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-06-25 08:53:30 +00:00
Luke Barnard
383dccebb4
Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes 
notif panel fixes
 2018-06-25 09:53:24 +01:00
Michael Telatynski
a174555452
hide RoomSubList if has 0 tiles and either searchFilter or emptyContent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-25 09:42:42 +01:00
Michael Telatynski
f21f7eff45
add word boundary to Community,Room,User provider regexps 
to stop the autocompleter firing mid-word
and remove any unused capture groups

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-25 09:32:51 +01:00
Slavi Pantaleev
fcda7f4d40 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-06-24 19:08:12 +00:00
Michael Telatynski
1d2945036f
allow TLD to come anywhere in the domain, because com isn't JUST a TLD 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 19:42:03 +01:00
Michael Telatynski
2d11d6dcc0
accept repeated TLDs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 19:29:26 +01:00
Michael Telatynski
6e0db5bfb6
use enum constants for EventStatus and correct isSent check 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:41:50 +01:00
Michael Telatynski
8251de4e35
run gen-i18n and prune-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:26:44 +01:00
Michael Telatynski
61def4a973
highlight top field if blank otherwise the password field. 
remove unused refs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:26:16 +01:00
Michael Telatynski
4a5fbf2c84
clear error on login type change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:13:40 +01:00
Michael Telatynski
15e75ca7b3
generate local errors for blank fields during login 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 17:12:00 +01:00
Michael Telatynski
e1ba6949d0
expand composer input focus region and apply cursor:text to it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 16:40:53 +01:00
Michael Telatynski
eb80022991
focus composer after interacting with e2ee statusbar/udd 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 16:40:27 +01:00
Miguel Branco
ec12b6dce0 Translated using Weblate (Galician) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-06-23 12:55:07 +00:00
Марко М. Костић
346a3353de Translated using Weblate (Serbian) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-06-23 09:04:08 +00:00
Osoitz
eccc17fc69 Translated using Weblate (Basque) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-06-23 07:56:10 +00:00
Kévin C
917c655a9f Translated using Weblate (French) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-06-23 07:19:15 +00:00
Michael Telatynski
6a84a7ab32
apply stripDiacritics to QueryMatcher instead of individually 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 02:22:07 +01:00
Michael Telatynski
7cdc91856b
retain pre-stripped text so it can be used for rendering 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 02:12:01 +01:00
Michael Telatynski
54bccd2016
make Accent Insensitive match more generic and apply to rooms too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 02:10:31 +01:00
Michael Telatynski
104e8d9cba
delint and add flow annotations to make my editor happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 02:00:36 +01:00
Michael Telatynski
ce04c745e5
strip diacritics for user autocomplete 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:56:24 +01:00
Michael Telatynski
f7a0ad3aa0
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:29:38 +01:00
Michael Telatynski
807d72f2d9
nullguard SenderProfile,broke when NotifPanel had evs from forgotten rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:22:38 +01:00
Michael Telatynski
aff2cc9065
EventTile:notif apply EmojiText to room name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 01:21:42 +01:00
Michael Telatynski
b23f84e1f5
add XXX comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 19:23:39 +01:00
Michael Telatynski
b7396c8ef0
trigger urlPreviews state update on {,room}AccountData changes of settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 19:17:55 +01:00
Michael Telatynski
d1600bdacf
fix event type which room-account settings were read from 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 19:17:31 +01:00
Michael Telatynski
d4f9fec707
run gen-i18n and prune-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:48:48 +01:00
Michael Telatynski
acbc84a69c
switch to another settings key for e2e url previews to protect on change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:44:54 +01:00
Michael Telatynski
ed4b82f8fc
update wording and style it like text (text cursor) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:36:19 +01:00
Michael Telatynski
ed1f801254
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:36:07 +01:00
Michael Telatynski
a45dc837b4
add copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:36:01 +01:00
Michael Telatynski
891070d001
update UrlPreview settings to be more privacy-aware in e2ee rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 18:35:54 +01:00
Weblate
b24e599c45 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 15:01:56 +00:00
Michael Telatynski
5b027c6410
Merge pull request #2003 from matrix-org/t3chguy/lang_select_register_view 
factor out conditional LanguageSelector as functional component
 2018-06-22 16:01:51 +01:00
Weblate
52fe65f8b1 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 14:46:14 +00:00
Michael Telatynski
548a06cad2
use JSX and import via sdk rather than directly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 14:47:57 +01:00
Michael Telatynski
32ab997230
properly style Group Pill 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 14:38:06 +01:00
Jeff Huang
f236b319cc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-06-22 12:20:07 +00:00
Michael Telatynski
d92d95c37d
don't fall back to getGroups as it gets it no additional data 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 12:11:16 +01:00
Michael Telatynski
9ee78de7e5
pr iteration, don't assume js-sdk stores group stuff other than groupId 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-22 12:05:46 +01:00
Michael Telatynski
561b9699fc
Merge branch 'develop' into t3chguy/community_autocomplete 2018-06-22 12:00:34 +01:00
Weblate
f887369a54 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 10:45:23 +00:00
David Baker
771eac0075
Merge pull request #1971 from matrix-org/dbkr/jitsi_makewidget 
Very basic Jitsi integration
 2018-06-22 11:45:18 +01:00
Weblate
6583befa76 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 10:41:20 +00:00
Luke Barnard
3aee0b56ae
Merge pull request #1994 from matrix-org/t3chguy/fix_group_tile_overflow 
add additional classes which protect the text from overflowing
 2018-06-22 11:41:13 +01:00
David Baker
6252f5b818 Merge remote-tracking branch 'origin/develop' into dbkr/jitsi_makewidget 2018-06-22 11:31:54 +01:00
David Baker
9d68c9e1a1 Logging & comment fix 2018-06-22 11:24:30 +01:00
Weblate
8eeff746d3 Merge remote-tracking branch 'origin/develop' into develop 2018-06-22 09:56:22 +00:00
Michael Telatynski
88ecaced82
Merge pull request #1992 from matrix-org/t3chguy/focus_rte_after_when_uploadingFile 
Upload File confirmation modal steals focus, send it back to composer
 2018-06-22 10:56:17 +01:00
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
f32da97a3a
delint and run generate-eslint-error-ignore-file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 14:04:08 +01:00
Michael Telatynski
58be44ad9e
factor out conditional LanguageSelector as functional component 
and reuse in Login, ForgotPassword and Registration views

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-21 13:51:39 +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
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
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
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
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
Michael Telatynski
a8520335ef
once command has a space, strict match instead of fuzzy match 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 17:37:55 +01:00
Miguel Branco
55a6a4dd8f 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 15:28:27 +00:00
Weblate
0933640922 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 15:08:48 +00:00
Miguel Branco
03bec1b515 Translated using Weblate (Galician) 
Currently translated at 98.5% (1185 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 15:08:47 +00:00
David Baker
e1e60cb147 delint CallHandler 2018-06-18 16:00:42 +01:00
David Baker
276c7a9c4d Fix blank sticker picker 
Let the battle of z-indexes commence

https://github.com/matrix-org/matrix-react-sdk/pull/1948/files#diff-8bc8827809a72c7548846c443d19f00aR29
 2018-06-18 15:24:34 +01:00
Weblate
35966415a6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 12:56:07 +00:00
David Baker
499bb5cfb4
Merge pull request #1972 from matrix-org/t3chguy/media_fixes 
fix e2ee file/media stuff
 2018-06-18 13:56:00 +01:00
Weblate
bfad84a4d6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 12:53:25 +00:00
David Baker
e7aa2ae009
Merge pull request #1978 from matrix-org/t3chguy/right_click_contextmenu 
right click for room tile context menu
 2018-06-18 13:53:20 +01:00
Weblate
a8a8e358c6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 12:48:44 +00:00
David Baker
0d05250914
Merge pull request #1983 from matrix-org/t3chguy/fix_filepanel_showing_roomavatar 
only show m.room.message in FilePanel
 2018-06-18 13:48:39 +01:00
Michael Telatynski
1ae51a8332
use changed argument in js-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 13:48:23 +01:00
Michael Telatynski
f88a2fd8fc
make GroupInviteTile context menu appear where you right clicked instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 12:16:33 +01:00
Michael Telatynski
e0d36b18c9
make RoomTile context menu appear where you right clicked instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 12:08:47 +01:00
Krombel
15892a8c6a Translated using Weblate (German) 
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/de/
 2018-06-18 10:55:30 +00:00
Michael Telatynski
1a236499b1
fix import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-18 11:54:06 +01:00
Weblate
c3b2c88dec Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 10:51:12 +00:00