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

22793 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
fd593280e0 Merge branch 'origin/develop' into Weblate. 2020-03-30 17:20:54 +00:00
Travis Ralston
b5688ac2b6
Merge pull request #4254 from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button 
Fix view community link icon contrast
 2020-03-30 11:20:49 -06:00
Weblate
b5587ea853 Merge branch 'origin/develop' into Weblate. 2020-03-30 17:08:55 +00:00
Travis Ralston
df60f9cd26
Merge pull request #4304 from matrix-org/travis/fix-confs 
Remove underscore from Jitsi conference names
 2020-03-30 11:08:49 -06:00
Travis Ralston
ca5d540311 Remove underscore from Jitsi conference names 
Fixes https://github.com/vector-im/riot-web/issues/12929

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
 2020-03-30 10:40:26 -06:00
Weblate
28356345fc Merge branch 'origin/develop' into Weblate. 2020-03-30 13:23:19 +00:00
Zoe
4e8cec354d
Merge pull request #4290 from matrix-org/foldleft/12484-user-shields 
Refactor shield display logic; changed rules for DMs
 2020-03-30 14:23:13 +01:00
Weblate
47783bd9b4 Merge branch 'origin/develop' into Weblate. 2020-03-30 12:43:01 +00:00
RiotRobot
78fd8e4569 Reset matrix-js-sdk back to develop branch 2020-03-30 13:42:52 +01:00
Weblate
8a372778be Merge branch 'origin/develop' into Weblate. 2020-03-30 12:42:27 +00:00
RiotRobot
9bfd88641d Merge branch 'master' into develop 2020-03-30 13:42:15 +01:00
RiotRobot
e32e9cec06 v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
af1446e0ff Prepare changelog for v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
d369695e22 Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:31:42 +01:00
Weblate
ba9b7d30dc Merge branch 'origin/develop' into Weblate. 2020-03-30 10:56:25 +00:00
random
b5c45b7d12 Translated using Weblate (Italian) 
Currently translated at 100.0% (2242 of 2242 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-30 10:56:25 +00:00
Bruno Windels
117ea5dc76
Merge pull request #4300 from matrix-org/bwindels/fixglobalscrollbars 
Fix: bring back global thin scrollbars
 2020-03-30 10:56:19 +00:00
Bruno Windels
eff9db4273 bring back global style rules for thin scrollbars (also FF now!) 2020-03-30 12:41:05 +02:00
Weblate
68ebba1f94 Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:43 +00:00
Michael Telatynski
90b8d87a39
Merge pull request #4297 from matrix-org/t3chguy/kbd11 
Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
 2020-03-30 10:30:38 +01:00
Weblate
4b480f0b6d Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:24 +00:00
Michael Telatynski
057ca35c24
Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog 
Field: make id optional, generate one if not provided
 2020-03-30 10:30:19 +01:00
Weblate
2035a038aa Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:02 +00:00
Michael Telatynski
5375f888ea
Merge pull request #4293 from matrix-org/t3chguy/fix_scrollbars 
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
 2020-03-30 10:29:56 +01:00
Weblate
8ef77fec8a Merge branch 'origin/develop' into Weblate. 2020-03-30 09:22:31 +00:00
Zoe
403d70897d
Merge pull request #4274 from matrix-org/foldleft/reset-refactor 
rename secret storage force-reset variable to avoid confusion
 2020-03-30 10:22:24 +01:00
Zoe
098df07c67 review feedback 2020-03-30 10:18:47 +01:00
Michael Telatynski
55c2d98571 Fix Field ctor 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 23:16:57 +01:00
Michael Telatynski
19aae087e0 Field: make id optional, generate one if not provided 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 22:59:15 +01:00
Michael Telatynski
167f953ac7 Document Composer:Escape to cancel a reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:35:35 +01:00
Michael Telatynski
acc41585ab Fix CmdOrCtrl+K for collapsed LHS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:33:27 +01:00
Michael Telatynski
2a54a8aa85 Escape should cancel a reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:33:01 +01:00
Szimszon
78e46f0476 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-29 14:27:22 +00:00
Tirifto
b7d33a4c9b Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-03-29 14:27:22 +00:00
Jeff Huang
164854b4f8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-29 14:27:21 +00:00
Michael Telatynski
f586aaab35 Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-28 00:51:01 +00:00
Weblate
5f9358796d Merge branch 'origin/develop' into Weblate. 2020-03-27 16:15:01 +00:00
Tuomas Hietala
39889a6e2b Translated using Weblate (Finnish) 
Currently translated at 92.0% (2062 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-03-27 16:15:01 +00:00
J. Ryan Stinnett
7bdd22ae03
Merge pull request #4291 from matrix-org/bwindels/fixcantdismissdevicetoast 
Fix: can't dismiss unverified session toast when encryption hasn't been upgraded
 2020-03-27 16:14:58 +00:00
Osoitz
71f8a49e60 Translated using Weblate (Basque) 
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-03-27 16:14:57 +00:00
Besnik Bleta
f90dfa2421 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2234 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-27 16:14:57 +00:00
Bruno Windels
29bb7e38fe fix undismissable toasts 2020-03-27 16:45:46 +01:00
Zoe
4f3d4426ea lint 2020-03-27 15:37:59 +00:00
Zoe
fda533ab48 test for shield behaviour 2020-03-27 15:25:44 +00:00
Zoe
1f0d7923d7 with output type 2020-03-27 13:51:30 +00:00
Zoe
5b7e7f49d1 lint 2020-03-27 13:50:03 +00:00
Zoe
5d7adef0a2 Factor out shield display rules into one file 2020-03-27 13:45:35 +00:00
Zoe
0f2e2ea069 Update shield display rules 2020-03-27 13:44:54 +00:00
Zoe
a02731f632 Merge branch 'develop' into foldleft/reset-refactor 2020-03-27 10:50:05 +00:00
Weblate
5c2c8ac3b0 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:21:58 +00:00