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

10473 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
51560c516d
Merge pull request #1986 from matrix-org/luke/fix-matrix-to-regex 
Fix matrix.to URL RegExp
 2018-06-18 17:54:59 +01: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
Luke Barnard
ad76f1bce6
Merge pull request #1984 from matrix-org/dbkr/fix_stickers 
Fix blank sticker picker
 2018-06-18 16:08:36 +01: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
Krombel
a7f82365a8 Translated using Weblate (German) 
Currently translated at 99.1% (1193 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:51:10 +00:00
David Baker
1ab902d738
Merge pull request #1981 from matrix-org/t3chguy/improve_command_provider 
improve command provider
 2018-06-18 11:51:06 +01:00
Weblate
521c6b66e6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 10:23:54 +00:00
David Baker
d1982c8317
Merge pull request #1980 from matrix-org/t3chguy/fix_copy-code-block_hscroll 
affix copyButton so that it doesn't get scrolled horizontally
 2018-06-18 11:23:48 +01:00
Weblate
8590ad3e35 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 10:22:57 +00:00
David Baker
a32ffa83ef
Merge pull request #1979 from matrix-org/t3chguy/max_continuation_interval 
split continuation if there is a gap in conversation
 2018-06-18 11:22:51 +01:00
Weblate
b48da72174 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 09:47:25 +00:00
David Baker
a918d73c29
Merge pull request #1973 from matrix-org/t3chguy/fix_react_proptypes_warnings 
fix a bunch of instances of react console spam
 2018-06-18 10:47:20 +01:00
Weblate
ed1e65aa0d Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 09:12:31 +00:00
David Baker
210d920a92
Merge pull request #1949 from matrix-org/luke/track-uisis-piwik 
Track decryption success/failure rate with piwik
 2018-06-18 10:12:26 +01:00
Weblate
05c1fcbe01 Merge remote-tracking branch 'origin/develop' into develop 2018-06-18 08:35:53 +00:00
Paweł Kozioł
21bbf5dd9b Translated using Weblate (Polish) 
Currently translated at 79.7% (959 of 1203 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-06-18 08:35:53 +00:00
Luke Barnard
2379d42162
Merge pull request #1975 from matrix-org/t3chguy/route_matrixto_group_links 
route matrix.to/#/+... links internally (not just group ids)
 2018-06-18 09:35:46 +01:00
Osoitz
9251c80783 Translated using Weblate (Basque) 
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/eu/
 2018-06-17 08:34:45 +00:00
Michael Telatynski
eb32dda260
given we also want to hide widget events, hide all except m.room.message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 19:52:15 +01:00
Michael Telatynski
b87824ba92
hide m.room.avatar from FilePanel via sync filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 19:50:51 +01:00
Weblate
224d55fbd9 Merge remote-tracking branch 'origin/develop' into develop 2018-06-16 18:16:59 +00:00
Kévin C
6d978e0185 Translated using Weblate (French) 
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/fr/
 2018-06-16 18:16:58 +00:00