Michael Telatynski
fbbba75f81
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
2020-09-25 14:31:44 +01:00
Michael Telatynski
44bc8fc67e
Initial Modal Widget work tweaks MSC2790
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 14:08:27 +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
a2860e698a
Clean up other unlinted lint issues
2020-09-24 08:26:59 -06:00
Michael Telatynski
1fb4d22233
Merge pull request #5241 from matrix-org/t3chguy/fix/14724
...
Validation improve pattern for derived data
2020-09-23 17:03:32 +01: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
3e0cbd7bfe
Appease the linters
2020-09-21 21:09:46 -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
Travis Ralston
342f1d5b43
Extremely bad support for "temporary widgets"
2020-09-21 14:36:24 -06:00
Michael Telatynski
c1d9d96702
Merge pull request #5234 from matrix-org/t3chguy/fix/15192
...
Only show User Info verify button if the other user has e2ee devices
2020-09-21 17:09:29 +01:00
Michael Telatynski
ed0e188b4f
Validation improve pattern for derived data
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-21 14:35:35 +01:00
Michael Telatynski
42cdf4b7c9
fix undefined devices case
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-21 13:57:33 +01:00
Travis Ralston
07f46fa3ec
Merge pull request #5238 from matrix-org/travis/uifeat/paranoia
...
Add a UI feature to disable advanced encryption options
2020-09-18 15:06:20 -06:00
Michael Telatynski
02f58edd74
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182
2020-09-18 19:30:42 +01: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
5630f35715
Add a UI feature to disable advanced encryption options
2020-09-18 11:33:02 -06:00
Michael Telatynski
6f7d6f27f1
move the check
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 18:15:05 +01:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720
...
Adjust layout and formatting of notifications / files cards
2020-09-18 11:11:35 -06:00
Travis Ralston
189233447b
Merge branch 'develop' into t3chguy/fix/15182
2020-09-18 11:06:32 -06:00
Michael Telatynski
84f0a610a9
Merge pull request #5232 from matrix-org/t3chguy/fix/15229
...
Fix Search Results Tile undefined variable access regression
2020-09-18 18:03:08 +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
Michael Telatynski
adcb75facb
Only show User Info verify button if the other user has e2ee devices
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 14:34:51 +01:00
Michael Telatynski
5a6ab95f84
Merge pull request #5215 from matrix-org/t3chguy/fix/15179
...
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-18 12:34:38 +01:00
Michael Telatynski
de1d9e0e09
Fix Search Results Tile undefined variable access regression
2020-09-18 12:15:56 +01:00
Michael Telatynski
9dbc1dbc85
Hide Advanced Appearance Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 11:34:35 +01:00
Michael Telatynski
687a2e56b2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179
...
Conflicts:
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-18 11:29:38 +01:00
Michael Telatynski
598c982f02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-18 11:14:36 +01: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
Travis Ralston
14a7b83988
Don't show a bottom border ahead of the date separator
2020-09-17 10:40:48 -06:00
Travis Ralston
24d0950b7e
Adjust layout and formatting of notifications / file cards
...
This follows some polish time with a designer.
The placeholder text on the two panels was tracking up/down when the width was changed. This is fixed by adjusting some of the flexbox properties to center it more safely.
We also spent some time making the notifications panel more legible while we wait for the overhaul to land.
2020-09-17 09:23:06 -06:00
Michael Telatynski
c904b4f416
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 14:10:51 +01:00
Michael Telatynski
c1cf8db78f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181
...
Conflicts:
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
src/i18n/strings/en_EN.json
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:55:11 +01:00
Michael Telatynski
ae44a6d1fa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
Michael Telatynski
1e9e0dee87
Merge pull request #5227 from matrix-org/t3chguy/fix/15188
...
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 13:40:06 +01:00
Michael Telatynski
5bf6697e48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00
Michael Telatynski
eda2dee63f
UI Feature Flag: 3PIDs
2020-09-17 13:25:18 +01:00
Michael Telatynski
4213a557f2
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175
...
Conflicts:
src/settings/Settings.ts
src/settings/UIFeature.ts
2020-09-17 11:58:26 +01:00
Michael Telatynski
d340dd58d1
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 11:55:10 +01:00
Travis Ralston
c3a3754432
Appease the linter
2020-09-16 17:27:45 -06: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
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
93323febcb
undo change
2020-09-16 16:10:24 +01:00
Michael Telatynski
c11abb74e0
UI Feature Flag: Share dialog QR code and social icons
2020-09-16 16:06:17 +01:00
Michael Telatynski
4d15a44d61
Merge pull request #5220 from matrix-org/t3chguy/fix/15202
...
Clean up UserInfo to not show a blank Power Selector for users not in room
2020-09-16 16:04:15 +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
Michael Telatynski
06c4abd65e
Clean up UserInfo to not show a blank Power Selector for users not in room
2020-09-16 15:23:08 +01:00