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

2069 commits

Author SHA1 Message Date
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
David Baker
b10f7a47fd
Merge pull request #5324 from matrix-org/dbkr/hang_up_your_hangups 
Support rejecting calls
 2020-10-19 09:57:13 +01:00
Travis Ralston
5c79f35cc5
Merge pull request #5316 from matrix-org/travis/less-acl-noise 
Make the ACL update message less noisy
 2020-10-15 09:49:03 -06:00
David Baker
7ad366603a Support rejecting calls 
Use the 'reject' method when we want to reject an incoming call
rather than end one that's in progress. Also get our error messages
right for the other side rejecting the call (albeit still with
placeholder dialog-box UX).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1510
 2020-10-15 14:54:03 +01:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Arsh Sharma
7e4b32c0d2 fixing i18 error 2020-10-14 16:44:58 +05:30
Travis Ralston
161dc0b6c6 Add i18n 2020-10-13 15:11:48 -06:00
David Baker
55f77b04ae Rewrite call state machine 
* Remove the two separate enumerations of call state: now everything
   uses the js-sdk version of call state. Stop adding a separate
   'call_state' field onto the call object(!)
 * Better reflection of the actual state of the call in the call bar,
   so when it's connecting, it says connecting, and only says 'active call'
   when the call is actually active.
 * More typey goodness
 2020-10-09 18:56:07 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
4dd6e96bfd Regenerate strings 2020-10-07 13:00:27 +01:00
Michael Telatynski
55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 
 Conflicts:
	src/components/views/settings/ProfileSettings.js
 2020-10-06 10:51:30 +01:00
Michael Telatynski
39c49125ce
Merge pull request #5273 from matrix-org/t3chguy/fix/15323 
Update copy for `redact` permission
 2020-10-06 10:24:26 +01:00
Hubert Chathi
f5f0686586
Merge pull request #5239 from uhoreg/dehydration 
Add support for dehydrated devices
 2020-10-05 17:40:49 -04:00
Hubert Chathi
49cc62ca43 Oh right. Run i18n again. 2020-10-02 17:48:13 -04:00
Michael Telatynski
7d11c3092d Decorate failed e2ee downgrade attempts better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:38:02 +01:00
Hubert Chathi
bd9cebe35d oh right, I need to run the i18n script too 2020-10-01 21:52:28 -04:00
Michael Telatynski
c73ef57887 Update copy for redact permission 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:51:35 +01:00
Michael Telatynski
4bd7ae5131 Show server errors from saving profile settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:49:22 +01:00
Travis Ralston
5534206e77
Merge pull request #5223 from matrix-org/travis/ft-sep1620/04-jitsi-hangup 
Make the hangup button do things for conference calls
 2020-09-29 11:06:21 -06:00
Travis Ralston
bfa269a848 Update copy 2020-09-29 10:20:54 -06:00
Travis Ralston
9df175212e Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-28 13:43:47 -06:00
Travis Ralston
42955856d5 Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious 2020-09-28 13:41:48 -06:00
David Baker
585c7637d6
Merge pull request #5248 from matrix-org/dbkr/callhandler_to_ts 
Convert CallHandler to typescript
 2020-09-25 15:52:21 +01:00
David Baker
80f47f0378 i18n 2020-09-24 16:20:32 +01:00
Travis Ralston
2d46ca1d15
Merge pull request #5243 from matrix-org/travis/workflow/design/sep2120 
Rework profile area for user and room settings to be more clear
 2020-09-24 08:39:01 -06:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files 
Add a note to use the desktop builds when seshat isn't available
 2020-09-22 10:25:34 -06:00
Travis Ralston
be6c242206
Merge pull request #5240 from matrix-org/travis/communities/v2-proto/permissions 
Add some permission checks to the communities v2 prototype
 2020-09-22 10:21:39 -06:00
Travis Ralston
4f983ad9a1 Rework profile sections of user and room settings 
Mostly by design request. Some is freehand, to be reviewed.
 2020-09-21 21:00:51 -06:00
J. Ryan Stinnett
115c7ccd4e Support HS-preferred Secure Backup setup methods 
This adds support for the `secure_backup_setup_methods` key, which allows HS
admins to state that Element should simplify down to only one setup method,
rather than offering both.

Fixes https://github.com/vector-im/element-web/issues/15238
 2020-09-21 16:10:42 +01:00
Travis Ralston
26b18811ce Add some permission checks to the communities v2 prototype 
Prototype behaviour:
* If you can't create a room in the community, say so.
  * The UX for this could probably be improved, but for now the intention is to not break muscle memory by hiding the create room option.
* If you can't change settings in the community, or can't invite people, don't show those respective options.
  * Breaking muscle memory here is moderately okay.
 2020-09-18 16:04:19 -06:00
Michael Telatynski
2492041ee4
Merge pull request #5236 from matrix-org/t3chguy/fix/15237 
Rename apps back to widgets
 2020-09-18 19:04:34 +01:00
Travis Ralston
8838bd724b Update copy for files 2020-09-18 10:58:17 -06:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
Michael Telatynski
949b8d9afe Rename apps back to widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 16:35:42 +01:00
Travis Ralston
46f6c140e6
Merge pull request #5231 from matrix-org/travis/e2e-default-serverside 
Disable the e2ee toggle when creating a room on a server with forced e2e
 2020-09-18 07:50:45 -06:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup 
Defer encryption setup until first E2EE room
 2020-09-18 10:28:33 +01:00
Travis Ralston
38f8c0a835 Disable the e2ee toggle when creating a room on a server with forced e2e 
Fixes https://github.com/vector-im/element-web/issues/15186
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1470
 2020-09-17 22:46:01 -06:00
Michael Telatynski
25171347a0 i18n 2020-09-17 13:57:47 +01:00
Michael Telatynski
f52b267bd3 i18n 2020-09-17 12:07:17 +01:00
Travis Ralston
bfbbf44dfc Add a note to use the desktop builds when seshat isn't available 
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
 2020-09-16 17:23:37 -06:00
Travis Ralston
f412f8defe Change copy if the widget is unpinned 2020-09-16 14:59:15 -06:00
Travis Ralston
1ffc6d5bd3 Make the hangup button do things for conference calls 
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
  * If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
  * If you're not able to modify widgets in the room, hang up.

For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
 2020-09-16 14:35:55 -06:00
Travis Ralston
12fb1ee1cf Clean up now-unused code 2020-09-16 12:43:28 -06:00
Travis Ralston
b4af0140d4 Render Jitsi widget state events in a more obvious way 
A clear improvement to this would be to include join/leave buttons in the tiles, however this is currently deferred.
 2020-09-16 12:38:47 -06:00
Michael Telatynski
4db9ac16b5
Merge pull request #5211 from matrix-org/t3chguy/fix/15173 
Hide Analytics sections if piwik config is not provided
 2020-09-16 16:34:55 +01:00
Michael Telatynski
9be04f8a67 i18n 2020-09-16 16:10:43 +01:00
Michael Telatynski
a784e29622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15174 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-16 16:09:08 +01:00
Michael Telatynski
4e2b6c2a30
Merge pull request #5212 from matrix-org/t3chguy/fix/15172 
Also hide bug reporting prompts from the Error Boundaries
 2020-09-16 15:59:07 +01:00
J. Ryan Stinnett
7a5b0a964f Adjust main encryption toast to reference Secure Backup 
This adjusts the main toast to focus on Secure Backup as suggested in designs.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
26b465f1fd Remove room recovery reminder 
The Secure Backup toast replaces this with better UX.

Part of https://github.com/vector-im/element-web/issues/13895
 2020-09-16 15:03:06 +01:00