mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 19:51:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
25153 commits 219 branches 562 tags 474 MiB
Commit graph

774 commits

Author SHA1 Message Date
Jorik Schellekens
2fe7c37566 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change 2020-06-08 13:37:05 +01:00
Jorik Schellekens
bba6767608 Update displayed min and max 2020-06-04 18:00:22 +01:00
Jorik Schellekens
2ec47ecc74 Use different setting flag print expected values 2020-06-04 17:50:56 +01:00
Michael Telatynski
993a545cd2 Profile settings should never show a disambiguated display name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-04 09:50:19 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing 
Remove feature_cross_signing
 2020-06-03 10:42:13 +01:00
Michael Telatynski
702bbe3bcd Add e2ee-default:false notice to Setting>Security 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:09:14 +01:00
Jorik Schellekens
85faa8ac23
Merge pull request #4677 from JorikSchellekens/joriks/fix-dark-theme-selection 
Use arrow functions instead of binding `this`
 2020-06-01 18:12:05 +01:00
Jorik Schellekens
7db95b614a Revert to arrow functions to bind this 2020-06-01 18:01:12 +01:00
Jorik Schellekens
69747b6114 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab 2020-06-01 14:32:31 +01:00
Michael Telatynski
9431393bda Allow deferring of Update Toast until the next morning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 19:59:47 +01:00
Michael Telatynski
efd0da44a1 Give contextual feedback for manual update check instead of banner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 18:24:45 +01:00
Travis Ralston
ea064afca4 Fix/document a number of UIA oddities 
Edition 2 of https://github.com/matrix-org/matrix-react-sdk/pull/3211
Fixes https://github.com/vector-im/riot-web/issues/13837
 2020-05-29 08:23:59 -06:00
Jorik Schellekens
66c0d53f3e Create and use stylised checkboxes 2020-05-28 22:33:00 +01:00
Michael Telatynski
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2 
Migrate Banners to Toasts
 2020-05-28 18:21:28 +01:00
Jorik Schellekens
9034889414 Reorder interfaces 2020-05-28 14:43:01 +01:00
Jorik Schellekens
81922231ed Move Appearance tab to ts 2020-05-28 13:55:07 +01:00
Michael Telatynski
cc68f53fc2 tidy up and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:47:01 +01:00
Michael Telatynski
2b432b0d82 Remove feature_cross_signing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:28:25 +01:00
Michael Telatynski
c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
Jorik Schellekens
076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts 
Move Field to Typescript
 2020-05-26 16:13:03 +01:00
Michael Telatynski
707e22ad09
Merge pull request #4402 from matrix-org/t3chguy/alias 
Replace `alias` with `address` in copy for consistency
 2020-05-26 09:36:58 +01:00
Jorik Schellekens
63f78b0808 Move tooltip to ts 2020-05-25 13:40:05 +01:00
Michael Telatynski
08fadb092c Remove redundant component 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 21:43:15 +01:00
Jorik Schellekens
50a44405f0 CONSTANT_CASING 2020-05-20 15:17:47 +01:00
Jorik Schellekens
82b76192ae Fixes, lints and i18n 2020-05-20 14:44:56 +01:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
55e72dd5bf Remove min and max font setting 2020-05-20 13:45:54 +01:00
Travis Ralston
798e7a1f86 Merge branch 'develop' into travis/dispatcher-types 2020-05-15 09:56:02 -06:00
Travis Ralston
cae28b48d6 Remove debugging that causes email addresses to load forever 
This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557
 2020-05-14 09:43:34 -06:00
Bruno Windels
4a8e642400
Merge pull request #4581 from matrix-org/bwindels/remove-asym-4s 
Remove UI for upgrading 4S to symmetric encryption
 2020-05-14 08:10:39 +00:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory 
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
 2020-05-13 21:07:50 -06:00
Jorik Schellekens
fc6e5227ac FIx roomsublist heights. 
- also fiddles the font size numbers
 2020-05-13 22:24:22 +01:00
Jorik Schellekens
20ec900405 Set font range 2020-05-13 15:36:53 +01:00
Jorik Schellekens
fea219915f fix code regeression 2020-05-13 15:26:11 +01:00
Bruno Windels
8a1b381635 remove UI for upgrading 4S to sym enc 2020-05-12 14:29:11 +02:00
Travis Ralston
58a5b7f154
Merge pull request #4556 from matrix-org/travis/fix-reset 
Ensure key backup gets dealt with correctly during secret storage reset
 2020-05-11 14:30:12 -06:00
Jorik Schellekens
33a5b5142d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-07 18:01:20 +01:00
Travis Ralston
2aa7a6087c
Merge pull request #4547 from matrix-org/travis/fix-user-panel 
Don't try to reload profile information when closing the user panel
 2020-05-07 10:21:17 -06:00
Travis Ralston
9ae812c346 Add a loading state for email addresses/phone numbers in settings 
Fixes https://github.com/vector-im/riot-web/issues/13432
 2020-05-06 15:17:55 -06:00
Travis Ralston
e5da81b6ba Ensure key backup gets dealt with correctly during secret storage reset 
Fixes https://github.com/vector-im/riot-web/issues/13562

We only initialize a new key backup if the user requested one. If they've requested new keys but have not asked for keys to be backed up, we simply delete the now-invalid backup.

This also adds some logging to identify in rageshakes when someone resets their cross-signing, and when their key backup is being deleted.
 2020-05-06 14:42:03 -06:00
Jorik Schellekens
bab7d5f461 Some lints 2020-05-06 17:25:54 +01:00
Travis Ralston
9a14417a03 Don't try to reload profile information when closing the user panel 
Fixes https://github.com/vector-im/riot-web/issues/13479

This looks to have been caused by something to do with the app load order, though where is a mystery. The view change seems to fire for the same page type despite a dispatch that says to change the view type.

Instead of debugging it too much further, we'll just patch around it.

This commit also makes the settings link use a more safe approach to viewing the user info - not going through the dispatcher means we are at the mercy of browser behaviour when we already have a loop which deals with this.
 2020-05-04 15:41:26 -06:00
Jorik Schellekens
f7b3662e0b Fully appease prop types 2020-04-29 10:32:05 +01:00
Jorik Schellekens
2acb1663eb Appease the prop types 2020-04-29 01:01:56 +01:00
Michael Telatynski
32c512dbfe Fix internal link styling in Security Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-28 17:49:10 +01:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Jorik Schellekens
57d880ca5e Use correct name and indentation 2020-04-28 14:24:44 +01:00
Jorik Schellekens
c268b98ded
Use faster lookup method 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-04-28 14:17:50 +01:00
David Baker
5d4aa03c8e Lint 2020-04-27 14:43:17 +01:00