nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
10,390 Commits 258 Branches 582 Tags
21978b18df2ecdde7ef91b8c96a9c80e8d42e8a1
Commit Graph

10390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Telatynski
21978b18df 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-29 11:28:15 +01:00
Michael Telatynski
c4b6b458f2 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-29 11:28:03 +01:00
David Baker
64fc7d3840 v0.12.8-rc.2 2018-06-22 18:08:57 +01:00
David Baker
f94ecf9ff5 Prepare changelog for v0.12.8-rc.2 2018-06-22 18:08:57 +01:00
David Baker
60a9752e6e Merge pull request #2005 from matrix-org/t3chguy/fix_commands 
slash got consumed in the consolidation
 2018-06-22 17:59:27 +01:00
David Baker
2b8bc8a800 v0.12.8-rc.1 2018-06-21 10:06:53 +01:00
David Baker
f3d54a49b6 Prepare changelog for v0.12.8-rc.1 2018-06-21 10:06:52 +01:00
David Baker
b18c95cdb5 js-sdk rc.1 2018-06-21 10:03:35 +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
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
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
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