mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 17:41:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
24032 commits 219 branches 562 tags 474 MiB
Commit graph

24032 commits

This branch
This branch
All branches
Author SHA1 Message Date
Osoitz
e02d061545 Translated using Weblate (Basque) 
Currently translated at 100.0% (2294 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-04-27 09:13:58 +00:00
Txopi
ba7b39dcc7 Translated using Weblate (Basque) 
Currently translated at 100.0% (2294 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-04-27 09:13:55 +00:00
Agusti Bau
98a949bed1 Refactored DNDTagTile to use useContextMenu 
Signed-off-by: Agusti Bau <agustibau@gmail.com>
 2020-04-26 18:54:35 +02:00
Michael Telatynski
4fc8fc9d6c cap width of editable item list item to leave space for its X remove button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-26 12:52:17 +01:00
Agusti Bau
5f3e3b3ec2 Extracted context menu from TagTile to DNDTagTile 2020-04-25 01:09:07 +02:00
Weblate
a5a9d96673 Merge branch 'origin/develop' into Weblate. 2020-04-24 17:56:45 +00:00
David Baker
121ac14273
Merge pull request #4485 from matrix-org/dbkr/setup_encryption_dialog_icon 
Make icon change in SetupEncryptionDialog
 2020-04-24 18:56:40 +01:00
David Baker
4e0f0bb299
Merge pull request #4490 from matrix-org/dbkr/setup_encryption_dialog_icon_rel 
Make icon change in SetupEncryptionDialog
 2020-04-24 18:56:22 +01:00
Travis Ralston
477875e012
Merge pull request #4488 from matrix-org/travis/release/labs-remove-padlocks 
Remove invite only padlocks feature flag for release
 2020-04-24 10:48:46 -06:00
Weblate
1e33570689 Merge branch 'origin/develop' into Weblate. 2020-04-24 16:45:09 +00:00
Travis Ralston
3b7cd3106e
Merge pull request #4487 from matrix-org/travis/labs-remove-padlocks 
Remove invite only padlocks feature flag
 2020-04-24 10:45:03 -06:00
David Baker
cb4030f0c2
Merge pull request #4489 from matrix-org/dbkr/correct_toast_rel 
Fix incorrect toast if security setup skipped
 2020-04-24 17:40:33 +01:00
David Baker
b3fac7c2cb Move store subscribe to didmount 2020-04-24 17:40:21 +01:00
David Baker
c684898ba0 Make icon change in SetupEncryptionDialog 
Fixes https://github.com/vector-im/riot-web/issues/13368
 2020-04-24 17:40:14 +01:00
David Baker
6460f6303c Move store subscribe to didmount 2020-04-24 17:36:02 +01:00
Weblate
d18ba9bed0 Merge branch 'origin/develop' into Weblate. 2020-04-24 16:33:42 +00:00
David Baker
1c00709029
Merge pull request #4486 from matrix-org/dbkr/correct_toast 
Fix incorrect toast if security setup skipped
 2020-04-24 17:33:36 +01:00
David Baker
d550f6c564 Fix incorrect toast if security setup skipped 
DevieListener didn't wait for the user's device list to be downloaded
so it would think the user didn't have cross-signing set up.

Also clear the rest of the state on stop().

Fixes https://github.com/vector-im/riot-web/issues/13372
 2020-04-24 17:33:31 +01:00
Travis Ralston
353810ce63 Remove invite only padlocks feature flag 
Fixes https://github.com/vector-im/riot-web/issues/13366

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
 2020-04-24 10:06:34 -06:00
Travis Ralston
117322b3b5 Remove invite only padlocks feature flag 
Fixes https://github.com/vector-im/riot-web/issues/13366

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
 2020-04-24 10:05:28 -06:00
David Baker
a1e174d8b8 Fix incorrect toast if security setup skipped 
DevieListener didn't wait for the user's device list to be downloaded
so it would think the user didn't have cross-signing set up.

Also clear the rest of the state on stop().

Fixes https://github.com/vector-im/riot-web/issues/13372
 2020-04-24 15:58:28 +01:00
David Baker
bbce37b92f Make icon change in SetupEncryptionDialog 
Fixes https://github.com/vector-im/riot-web/issues/13368
 2020-04-24 15:39:54 +01:00
Michael Telatynski
7b9c46a5a9
Merge pull request #4483 from matrix-org/t3chguy/cherry-pick/1 
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
 2020-04-24 13:45:15 +01:00
Michael Telatynski
42a857cb5e Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 
(cherry picked from commit 972f9d354d)
 2020-04-24 13:24:54 +01:00
Weblate
8c0bb43637 Merge branch 'origin/develop' into Weblate. 2020-04-24 12:23:45 +00:00
Michael Albert
8c414014e6 Translated using Weblate (German) 
Currently translated at 77.2% (1771 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-24 12:23:45 +00:00
Michael Telatynski
30a409a74e
Merge pull request #4482 from matrix-org/revert-4344-t3chguy/emojibase 
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
 2020-04-24 13:23:38 +01:00
Michael Telatynski
972f9d354d
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 2020-04-24 12:25:19 +01:00
Weblate
070535d082 Merge branch 'origin/develop' into Weblate. 2020-04-24 05:43:41 +00:00
Imre Kristoffer Eilertsen
a15db97b77 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 49.2% (1130 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-04-24 05:43:40 +00:00
Travis Ralston
d8eb761106
Merge pull request #4481 from matrix-org/travis/fix-widget-params-again 
Fix widget URL templating (again)
 2020-04-23 23:43:35 -06:00
Travis Ralston
50783c2432 Appease the linter 2020-04-23 23:25:53 -06:00
Travis Ralston
28865e27bc Don't overwrite the 'domain' data key for all widgets 
Some widgets, which aren't Jitsi widgets, might need this to be something else.
 2020-04-23 15:24:27 -06:00
Travis Ralston
efaf4fbbda Decode dollar signs in safe widget URLs before rendering/templating 
Fixes https://github.com/vector-im/riot-web/issues/13344
 2020-04-23 15:24:27 -06:00
J. Ryan Stinnett
dd532d5a6c
Merge pull request #4480 from matrix-org/jryans/login-recovery-link-release 
Fix recovery link on login verification flow
 2020-04-23 18:24:55 +01:00
Weblate
c9ac8cd88f Merge branch 'origin/develop' into Weblate. 2020-04-23 17:24:51 +00:00
J. Ryan Stinnett
3b362f2845
Merge pull request #4479 from matrix-org/jryans/login-recovery-link 
Fix recovery link on login verification flow
 2020-04-23 18:24:45 +01:00
J. Ryan Stinnett
949b916091 Fix recovery link on login verification flow 
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
 2020-04-23 18:18:25 +01:00
J. Ryan Stinnett
5af3d83cc7 Fix recovery link on login verification flow 
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
 2020-04-23 18:14:30 +01:00
Michael Telatynski
531de19fa4 Revert "Discard unused CompatibilityPage.js in react-sdk" 
This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:58 +01:00
Michael Telatynski
e3ba9c9b38 Discard unused CompatibilityPage.js in react-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:11:29 +01:00
Weblate
3eeb6ca2c5 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:57:25 +00:00
Szimszon
f768b23b38 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2295 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-04-23 14:57:25 +00:00
Bruno Windels
0c1414aca9
Merge pull request #4476 from rkfg/pill-fix 
Make avatars in pills occupy the entire space using cropping
 2020-04-23 14:57:19 +00:00
RiotRobot
941709d19a v2.5.0-rc.4 2020-04-23 15:55:37 +01:00
RiotRobot
b3753f3407 Prepare changelog for v2.5.0-rc.4 2020-04-23 15:55:37 +01:00
RiotRobot
86200812a5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:49:21 +01:00
Weblate
f2ca8f1d2c Merge branch 'origin/develop' into Weblate. 2020-04-23 14:18:16 +00:00
Travis Ralston
35dd892dce
Merge pull request #4458 from matrix-org/travis/fix-sticker-picker-add 
Use WidgetType more often to avoid breaking new sticker pickers
 2020-04-23 08:18:12 -06:00
Weblate
9f05bc5c45 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:17:59 +00:00