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

20025 commits

This branch
This branch
All branches
Author SHA1 Message Date
J. Ryan Stinnett
afac8827ca
Merge pull request #3721 from matrix-org/jryans/sign-in-to-session 
Replace sign-ins with sessions
 2019-12-12 17:03:10 +00:00
J. Ryan Stinnett
38ee1aed09 Replace sign-ins with sessions 
The designs were changed to use the term "sessions" instead of "sign-ins".
 2019-12-12 16:35:02 +00:00
J. Ryan Stinnett
3cbb3c12cd Update cross-signing details on trust changes 2019-12-12 15:42:27 +00:00
J. Ryan Stinnett
6338ee9683 Only allow key caching inside the access helper 2019-12-12 15:34:01 +00:00
J. Ryan Stinnett
458cc9598d Support restoring key backup with stored secret 2019-12-12 15:18:36 +00:00
J. Ryan Stinnett
e87ff54eee Clean up cross-signing debug panel 2019-12-12 14:27:57 +00:00
J. Ryan Stinnett
4417235d9e Show whether backup key is stored 2019-12-12 14:06:44 +00:00
J. Ryan Stinnett
d2f2d3b344 Handle cross-singing sigs in key backup details 2019-12-12 13:51:45 +00:00
Weblate
47c6023b1a Merge branch 'origin/develop' into Weblate. 2019-12-11 17:50:53 +00:00
Travis Ralston
7230d51cca
Merge pull request #3703 from matrix-org/travis/right-panel-v2 
Refactor RightPanel to match expected behaviour
 2019-12-11 10:50:45 -07:00
Weblate
e4134a485b Merge branch 'origin/develop' into Weblate. 2019-12-11 17:50:43 +00:00
Szimszon
eb671c3724 Translated using Weblate (Hungarian) 
Currently translated at 98.9% (1944 of 1966 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-12-11 17:50:43 +00:00
Kévin C
53692c0938 Translated using Weblate (French) 
Currently translated at 98.5% (1936 of 1966 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-12-11 17:50:41 +00:00
Besnik Bleta
24ea1424c5 Translated using Weblate (Albanian) 
Currently translated at 99.3% (1952 of 1966 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-12-11 17:50:40 +00:00
Travis Ralston
633aa59e6c
Merge pull request #3716 from matrix-org/travis/mjolnir-render 
Render policy room event updates in the timeline
 2019-12-11 10:50:27 -07:00
David Baker
2a90f287c6 Added translation using Weblate (Mongolian) 2019-12-11 17:29:58 +00:00
J. Ryan Stinnett
8cbc9baddd Add testing flow for new key backups with SSSS 
This adds a path to test key backups with SSSS via an extra button only visible
when the cross-signing feature is enabled.
 2019-12-11 16:32:49 +00:00
J. Ryan Stinnett
66f7600969 Add accessSecretStorage helper with common flow setup 
This moves the details of dialogs that may be needed when accessing secret
storage to centralised helper. In addition, this clears the secret storage key
cache so that keys are only live for a single operation.
 2019-12-11 15:07:46 +00:00
J. Ryan Stinnett
c5099b9b96 Re-add the secret storage key cache 2019-12-11 14:28:02 +00:00
Weblate
6d77144e2a Merge branch 'origin/develop' into Weblate. 2019-12-11 11:32:49 +00:00
J. Ryan Stinnett
2a91a6d08c
Merge pull request #3718 from matrix-org/travis/wrap-encryption 
Wrap the await call for unknown device lookups
 2019-12-11 11:32:43 +00:00
Weblate
00c694d691 Merge branch 'origin/develop' into Weblate. 2019-12-11 11:04:44 +00:00
J. Ryan Stinnett
c2cd97fab3
Merge pull request #3640 from matrix-org/jryans/4s-new-key-backup 
Add testing flow to bootstrap secret storage
 2019-12-11 11:04:36 +00:00
Weblate
73cc855826 Merge branch 'origin/develop' into Weblate. 2019-12-11 10:39:17 +00:00
Kévin C
9dbd6e815f Translated using Weblate (French) 
Currently translated at 100.0% (1935 of 1935 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-12-11 10:39:16 +00:00
J. Ryan Stinnett
108293dcba Flip back to develop 2019-12-11 10:39:04 +00:00
J. Ryan Stinnett
fae819dfe5 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-12-11 10:05:20 +00:00
Weblate
4b9afe78c2 Merge branch 'origin/develop' into Weblate. 2019-12-11 09:36:54 +00:00
Szimszon
af890cd517 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1935 of 1935 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-12-11 09:36:54 +00:00
Jeff Huang
a4dc8c650e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1935 of 1935 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-12-11 09:36:53 +00:00
Michael Telatynski
cb50f5ff5f
Merge pull request #3715 from matrix-org/t3chguy/fix_roomlist_context_menu_regression 
Fix remaining context menu regressions
 2019-12-11 09:36:45 +00:00
Travis Ralston
db91465c56 Wrap the await call for unknown device lookups 
Otherwise we're awaiting the result of `map()`, which isn't accurate.
 2019-12-10 22:00:08 -07:00
Weblate
ddfa28723b Merge branch 'origin/develop' into Weblate. 2019-12-10 17:43:44 +00:00
Michael Telatynski
c1b1f98201
Merge pull request #3712 from matrix-org/t3chguy/react16_refs 
Migrate away from React Legacy string refs
 2019-12-10 17:43:37 +00:00
Weblate
4c431dd88a Merge branch 'origin/develop' into Weblate. 2019-12-10 17:19:57 +00:00
random
adc96514e7 Translated using Weblate (Italian) 
Currently translated at 100.0% (1933 of 1933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-12-10 17:19:57 +00:00
Tentarial
77da7afdc0 Translated using Weblate (German) 
Currently translated at 79.9% (1545 of 1933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-12-10 17:19:56 +00:00
Krombel
03e0f6f8c5 Translated using Weblate (German) 
Currently translated at 79.9% (1545 of 1933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-12-10 17:19:55 +00:00
Travis Ralston
b6d0308a54
Merge pull request #3706 from matrix-org/travis/dm-copy 
Update copy for DM invites
 2019-12-10 10:19:47 -07:00
Travis Ralston
c8c344804e Remove special case RHS resizer logic 
It doesn't seem to affect anything by being removed.
 2019-12-10 10:01:45 -07:00
Travis Ralston
b93cadf4d1 Reset the right panel when changing rooms/groups 
This is to prevent the member info from staying open, which could explode if the user isn't in the room you're switching to.
 2019-12-10 09:58:44 -07:00
J. Ryan Stinnett
4956e83228 Remove secret storage key cache for now 2019-12-10 16:53:15 +00:00
J. Ryan Stinnett
80c120b93b Cross-signing storage now handled in JS SDK 2019-12-10 16:47:18 +00:00
Travis Ralston
4548713c19 Appease the linter 2019-12-09 20:38:56 -07:00
Travis Ralston
f529a6c7a2 Render policy room event updates in the timeline 
Fixes https://github.com/matrix-org/mjolnir/issues/15

This should be completely safe to deploy, even without a labs flag, because policy rooms (ban lists) are usually only joined by the people who know what they are. This also has no relation to the Mjolnir functionality currently in Riot, though it does make seeing your ban list a bit less awkward. 

Ban list rules only show up in ban list rooms and rarely show up in public rooms, hence the somewhat vague messaging. It should be obvious that it's a ban list room due to the surrounding room decoration/purpose.
 2019-12-09 20:36:00 -07:00
Michael Telatynski
44adda3547 Add right-click context menu to GroupInviteTile.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-10 00:14:36 +00:00
Michael Telatynski
5c92f8ab25 Fix RoomTile right click context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-10 00:08:45 +00:00
Michael Telatynski
52c20db963 Fix chevron offset for toRightOf 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-09 23:58:09 +00:00
Michael Telatynski
196d8fcd90
Merge pull request #3714 from matrix-org/t3chguy/fix_mab_regression 
Fix message action bar reaction picker regression
 2019-12-09 23:53:28 +00:00
Michael Telatynski
2691d1a611 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_mab_regression 2019-12-09 14:13:11 +00:00