mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 17:56:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
16294 commits 203 branches 553 tags 406 MiB
Commit graph

16294 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bruno Windels
b16bc0178a insert manually, as insertHTML command moves caret inconsistently 
across browsers
 2019-06-19 17:42:18 +02:00
Bruno Windels
f0271b593d remove special casing for moving caret after newline and pills 
not needed anymore with new caret logic and having caret nodes
 2019-06-19 17:42:18 +02:00
Bruno Windels
a229641985 use caret nodes in caret positioning code, to move caret out of pills 2019-06-19 17:42:18 +02:00
Bruno Windels
607fc328ed also process first part when processing empty and mergeable parts 
this was preventing clearing an emtpy plain part when inserting
a pill-candidate at the beginning of the model, which
prevented a caret node from being inserted before the pill.
 2019-06-19 17:42:18 +02:00
Bruno Windels
75fc769742 insert "caret nodes" where pills don't have an adjacent text node 
just empty spans, where the caret can be placed.
 2019-06-19 17:42:18 +02: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
David Baker
9641110315
Merge pull request #3118 from matrix-org/dbkr/already_registered 
Restore warning for if you're already logged in
 2019-06-19 09:27:31 +01:00
David Baker
c8e121dc70 Restore warning for if you're already logged in 
...when clicking an email link. Although now we can complete the
registration because we can do so without replacing your session.
 2019-06-18 18:43:14 +01:00
Weblate
456fa7a26b Merge branch 'origin/develop' into Weblate. 2019-06-18 16:44:47 +00:00
Bruno Windels
bb97653455
Merge pull request #3113 from matrix-org/bwindels/mediadeviceslabels 
Provide default name if device label is missing
 2019-06-18 16:44:43 +00:00
Weblate
1a23265742 Merge branch 'origin/develop' into Weblate. 2019-06-18 16:43:19 +00:00
Bruno Windels
63fba611c0
Merge pull request #3108 from matrix-org/bwindels/edit-room-notif-pill 
Support @room pills while editing
 2019-06-18 16:43:14 +00:00
RiotRobot
a835d916e1 v1.2.2-rc.2 2019-06-18 15:52:29 +01:00
RiotRobot
043cae2aa9 Prepare changelog for v1.2.2-rc.2 2019-06-18 15:52:29 +01:00
RiotRobot
27a94bb250 js-sdk rc.2 2019-06-18 15:46:23 +01:00
David Baker
ab4142ab5a Merge remote-tracking branch 'origin/develop' into release-v1.2.2 2019-06-18 15:25:44 +01:00