OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,761 Commits
205 Branches
546 Tags
417 MiB
Commit Graph

22761 Commits (b53b5cc45de7d70b8686246f2c8037845b1ba2a1)

Author SHA1 Message Date
Michael Telatynski 9cda84c675 fix kbd background colour 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-18 16:54:46 +00:00
Michael Telatynski cad28c81c0 Add Keyboard shortcuts dialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-18 16:40:21 +00:00
David Baker b8e6208cb2 Merge remote-tracking branch 'origin/develop' into uhoreg-uhoreg/symmetric-ssss-migrate 2020-03-18 14:49:25 +00:00
Weblate f35713bafa Merge branch 'origin/develop' into Weblate. 2020-03-18 14:04:02 +00:00
Tirifto a99b61a14b Translated using Weblate (Esperanto) 
Currently translated at 99.8% (2167 of 2171 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-03-18 14:04:02 +00:00
Michael Telatynski 42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini 
Remove Gemini Scrollbars
 2020-03-18 14:03:51 +00:00
Weblate d566c3653f Merge branch 'origin/develop' into Weblate. 2020-03-18 11:51:52 +00:00
random 863d0206d2 Translated using Weblate (Italian) 
Currently translated at 100.0% (2157 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-18 11:51:52 +00:00
Michael Telatynski ef79492f2c
Merge pull request #4209 from matrix-org/t3chguy/redesign/room_directory 
Room Directory Explore Servers redesign
 2020-03-18 11:51:42 +00:00
Weblate 0c4f0e4fcc Merge branch 'origin/develop' into Weblate. 2020-03-18 11:33:20 +00:00
Elwyn Malethan 5ee2a33faa Translated using Weblate (Welsh) 
Currently translated at 0.4% (9 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cy/
 2020-03-18 11:33:20 +00:00
Mejans 87cb4a98a7 Translated using Weblate (Occitan) 
Currently translated at 2.9% (63 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/oc/
 2020-03-18 11:33:20 +00:00
random d5b6392120 Translated using Weblate (Italian) 
Currently translated at 99.6% (2148 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-18 11:33:19 +00:00
David Baker fafddc9b50
Merge pull request #4110 from aaronraimist/mac-redo 
Fix redo keyboard shortcut on macOS
 2020-03-18 11:33:13 +00:00
Weblate c30720d71d Merge branch 'origin/develop' into Weblate. 2020-03-18 10:37:09 +00:00
catborise a34e8478d9 Translated using Weblate (Turkish) 
Currently translated at 77.8% (1679 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-03-18 10:37:09 +00:00
Pedro Silva c43dd8ce92 Translated using Weblate (Portuguese) 
Currently translated at 28.3% (611 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2020-03-18 10:37:08 +00:00
Mejans 61c3132cc5 Translated using Weblate (Occitan) 
Currently translated at 2.7% (59 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/oc/
 2020-03-18 10:37:08 +00:00
Kévin C 660bbfb2a9 Translated using Weblate (French) 
Currently translated at 100.0% (2157 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-18 10:37:07 +00:00
Jeff Huang bc410e0cd2 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2157 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-18 10:37:05 +00:00
Bruno Windels dcefcaf175
Merge pull request #4230 from matrix-org/bwindels/fixremovelocalaliaswithlag 
Fix: ensure local state for aliases doesn't get garbled up
 2020-03-18 10:36:57 +00:00
Bruno Windels f8c6097c39 remove logging 2020-03-18 11:18:48 +01:00
Bruno Windels 7b1b4cda14 ensure local state for aliases doesn't get garbled up 
when removing another alias before the response of the first comes back
 2020-03-17 20:37:44 +01:00
Weblate 79eee11673 Merge branch 'origin/develop' into Weblate. 2020-03-17 19:06:46 +00:00
Travis Ralston 1453120c66
Merge pull request #4208 from matrix-org/matthew/jump-to-bottom-ublock 
Rename 'jump to bottom' to avoid ublock block
 2020-03-17 13:06:41 -06:00
Aaron Raimist 038888f2d4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into mac-redo 2020-03-17 13:52:43 -05:00
Aaron Raimist 84a8ca6982
Fix typo 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-17 13:18:27 -05:00
Matthew Hodgson af023a2d7c rename 'jump to bottom' to avoid ublock block 2020-03-17 11:15:57 -06:00
Weblate 6b45cdf51e Merge branch 'origin/develop' into Weblate. 2020-03-17 16:47:23 +00:00
J. Ryan Stinnett fac4561ac8
Merge pull request #4225 from matrix-org/jryans/comp-sec-restore-slow 
Restore key backup in background after complete security
 2020-03-17 16:47:18 +00:00
Weblate 6e4b1f9431 Merge branch 'origin/develop' into Weblate. 2020-03-17 16:46:59 +00:00
J. Ryan Stinnett e51a7f3ca4
Merge pull request #4223 from matrix-org/jryans/key-backup-text-xsign 
Fix key backup trust text for cross-signing
 2020-03-17 16:46:53 +00:00
Weblate 905b8b466e Merge branch 'origin/develop' into Weblate. 2020-03-17 14:25:54 +00:00
RiotRobot b09c063d1b Reset matrix-js-sdk back to develop branch 2020-03-17 14:25:44 +00:00
Weblate 52b4876189 Merge branch 'origin/develop' into Weblate. 2020-03-17 14:25:00 +00:00
Besnik Bleta 51012702f2 Translated using Weblate (Albanian) 
Currently translated at 99.3% (2141 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-17 14:24:59 +00:00
RiotRobot 8e8723bb36 Merge branch 'master' into develop 2020-03-17 14:24:35 +00:00
RiotRobot a92fe9f846 Merge branch 'release-v2.2.3' 2020-03-17 14:21:35 +00:00
RiotRobot 1e3b917aed v2.2.3 2020-03-17 14:18:15 +00:00
RiotRobot 5b96408bc5 Prepare changelog for v2.2.3 2020-03-17 14:18:14 +00:00
RiotRobot 83b6155637 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:12:15 +00:00
Michael Telatynski 638629c2fa fix MyGroups scrollbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 13:28:07 +00:00
David Baker d72ce28a27 Merge branch 'uhoreg/symmetric-ssss-migrate' of git://github.com/uhoreg/matrix-react-sdk into uhoreg-uhoreg/symmetric-ssss-migrate 2020-03-17 13:12:05 +00:00
J. Ryan Stinnett 6e90498739
Merge pull request #4228 from matrix-org/jryans/hide-video-config-release 
Add default on config setting to control call button in composer
 2020-03-17 11:56:44 +00:00
Weblate 9fe8606e01 Merge branch 'origin/develop' into Weblate. 2020-03-17 11:56:40 +00:00
J. Ryan Stinnett 93b8dee33c
Merge pull request #4227 from matrix-org/jryans/hide-video-config 
Add default on config setting to control call button in composer
 2020-03-17 11:56:34 +00:00
Michael Telatynski 8fd3b96b72 fix styling/heights 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 11:53:19 +00:00
Zoe ea99eebb7b Report to the user when a key signature upload fails 2020-03-17 11:45:27 +00:00
J. Ryan Stinnett ec4e81de74 Add default on config setting to control call button in composer 
This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
 2020-03-17 11:43:03 +00:00
J. Ryan Stinnett 59b1cbd4b2 Add default on config setting to control call button in composer 
This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
 2020-03-17 11:33:10 +00:00