Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,254 Commits 206 Branches 552 Tags 519 MiB
50315557ba
Commit Graph

16254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno Windels
50315557ba
Merge pull request #3130 from matrix-org/bwindels/disable-left-right-autocomplete 
Disable left/right arrow navigating completions for now
 2019-06-21 12:32:11 +00:00
Bruno Windels
cf0799289d Disable left/right arrow navigating completions for now 
as the autocomplete is now very eager to appear, this breaks
caret navigation when typing e.g. anything with a colon.

Ideally, we should make the AC less eager to appear,
but this is a quick fix for now.
 2019-06-21 13:48:52 +02:00
Bruno Windels
701e18d588
Merge pull request #3128 from matrix-org/bwindels/edit-nested-lists 
Fix: take list nesting into account for indenting
 2019-06-21 10:55:37 +00:00
Bruno Windels
503d702f47 take list nesting into account for indenting 2019-06-21 11:40:27 +02:00
J. Ryan Stinnett
d3b552411c
Merge pull request #3127 from matrix-org/t3chguy/file_upload_filesize 
Add file size to UploadConfirmDialog
 2019-06-21 09:19:27 +01:00
Michael Telatynski
dea412c906 Add file size to UploadConfirmDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-21 09:03:28 +01:00
Travis Ralston
2a0660c545
Merge pull request #3123 from matrix-org/travis/sas-timeouts 
Consider cancelled verifications when mounting IncomingSasDialog
 2019-06-20 14:29:20 -06:00
Travis Ralston
0f8dd102bf Move early-cancel stuff to constructor 2019-06-20 14:17:06 -06:00
Travis Ralston
55eec80771
Merge pull request #3124 from matrix-org/travis/sas-ok 
Make the verification cancelled dialog say OK instead of Cancel
 2019-06-20 07:58:38 -06:00
David Baker
796a8a182f
Merge pull request #3125 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-06-20 11:03:05 +01:00
random
a03a2d5b0f Translated using Weblate (Italian) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-06-20 09:56:34 +00:00
Tirifto
a39420f72c Translated using Weblate (Esperanto) 
Currently translated at 83.3% (1384 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-06-20 09:56:33 +00:00
Jeff Huang
cbce373697 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-06-20 09:56:33 +00:00
Slavi Pantaleev
1d4089dda7 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-06-20 09:56:32 +00:00
Travis Ralston
bf443149b5 Make the verification cancelled dialog say OK instead of Cancel 
Fixes https://github.com/vector-im/riot-web/issues/9306

Includes unexpected cleanup of i18n
 2019-06-19 15:07:45 -06:00
Travis Ralston
ff3c52a736 Consider cancelled verifications when mounting IncomingSasDialog 
The cancellation can be because of a background problem, or because the user received another verification request from the same user. The cancel function does get called, however due to the speed of our dialog handling the state ends up being lost forever. Instead of trying to de-layer dialogs, this just fastforwards the whole dialog to "cancelled" on mount if required.

Fixes https://github.com/vector-im/riot-web/issues/10118
 2019-06-19 14:59:59 -06:00
Weblate
a14505fe4c Merge branch 'origin/develop' into Weblate. 2019-06-19 18:18:41 +00:00
J. Ryan Stinnett
b16a3c53cd
Merge pull request #3122 from matrix-org/jryans/slim-contextualmenu 
Remove unused ContextualMenu features
 2019-06-19 19:18:37 +01:00
Weblate
c8ae58e06e Merge branch 'origin/develop' into Weblate. 2019-06-19 18:18:19 +00:00
J. Ryan Stinnett
78b0f61efe
Merge pull request #3119 from matrix-org/jryans/rename-tooltip-button 
Fix casing of TooltipButton
 2019-06-19 19:18:15 +01:00
Weblate
1af4587a69 Merge branch 'origin/develop' into Weblate. 2019-06-19 14:53:44 +00:00
Tuomas Hietala
dc947ab21c Translated using Weblate (Finnish) 
Currently translated at 99.4% (1651 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-06-19 14:53:44 +00:00
RiotRobot
e675244d40 Merge branch 'master' into develop 2019-06-19 15:53:16 +01:00
RiotRobot
2d6317fdd0 v1.2.2 2019-06-19 15:52:18 +01:00
RiotRobot
b91e5a7d7c Prepare changelog for v1.2.2 2019-06-19 15:52:17 +01:00
RiotRobot
21344609a4 released js-sdk 2019-06-19 15:47:31 +01:00
J. Ryan Stinnett
dc9282c539 Remove unused ContextualMenu features 2019-06-19 14:47:15 +01:00
Weblate
c7023951dd Merge branch 'origin/develop' into Weblate. 2019-06-19 12:33:23 +00:00
Tuomas Hietala
5c5c4cfbc1 Translated using Weblate (Finnish) 
Currently translated at 97.7% (1622 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-06-19 12:33:23 +00:00
David Baker
2247c5953d Fix conflicting PRs 2019-06-19 13:33:06 +01:00
Weblate
1441b68953 Merge branch 'origin/develop' into Weblate. 2019-06-19 12:30:10 +00:00
David Baker
86081c3c8f
Merge pull request #3120 from matrix-org/dbkr/badges_remove_dupe_code 
De-duplicate notif badge code
 2019-06-19 13:30:04 +01:00
Weblate
9fb8d1d410 Merge branch 'origin/develop' into Weblate. 2019-06-19 12:29:23 +00:00
Kévin C
057f2da327 Translated using Weblate (French) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-06-19 12:29:23 +00:00
Tuomas Hietala
a10675a400 Translated using Weblate (Finnish) 
Currently translated at 97.5% (1620 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-06-19 12:29:23 +00:00
Besnik Bleta
399f59130e Translated using Weblate (Albanian) 
Currently translated at 99.6% (1655 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-19 12:29:22 +00:00
David Baker
97d8fe6db3
Merge pull request #3121 from matrix-org/dbkr/count_rooms_with_notifs 
Fix favicon/title badge count
 2019-06-19 13:29:17 +01:00
David Baker
6eddce8c32 lint 2019-06-19 12:13:17 +01:00
David Baker
23b29ce3f5 Use the variables we just defined above 2019-06-19 12:12:19 +01:00
David Baker
edd43a2706 Fix favicon/title badge count 
This was using a separate function (in MatrixChat) that didn't
take into account whether we were supposed to be hiding the badge
for rooms so would include notifs that were hidden everywhere else.

Also make it a function & put it in RoomNotifs with all its friends.

Fixes https://github.com/vector-im/riot-web/issues/3060
 2019-06-19 12:06:32 +01:00
David Baker
0e6f401b62 copyright 2019-06-19 11:48:47 +01:00
David Baker
c57d93702a De-duplicate notif badge code 
We had two different places we were deciding whether to show a badge.
Let's just have one.
 2019-06-19 11:46:24 +01:00
J. Ryan Stinnett
bb4b5d7798 TooltipButton rename step 2 of 2 2019-06-19 11:32:03 +01:00
J. Ryan Stinnett
ab4c5f0152 TooltipButton rename step 1 of 2 2019-06-19 11:30:37 +01:00
J. Ryan Stinnett
4ec7a8ddff Fix casing of TooltipButton 
My brain can't deal with two different ways to write "Tooltip", so this
converges the naming to match the rest of the code base. Separate commits will
fix up the file names for case-insensitive file systems.
 2019-06-19 11:26:13 +01:00
Weblate
b062bb6553 Merge branch 'origin/develop' into Weblate. 2019-06-19 08:31:16 +00:00
J. Ryan Stinnett
9591e6b0d3
Merge pull request #3071 from matrix-org/t3chguy/authentication_password_field 
Switch ugly password boxes to Field or styled input
 2019-06-19 09:31:11 +01:00
Weblate
0c71aa2a57 Merge branch 'origin/develop' into Weblate. 2019-06-19 08:27:37 +00:00
Szimszon
6970552a87 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1660 of 1660 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-06-19 08:27:37 +00:00
Jeff Huang
e69e9dd705 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1660 of 1660 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-06-19 08:27:36 +00:00