ffcdaa55e5
Merge branch 't3chguy/fix/15182' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182
2020-09-18 19:34:59 +01:00
02f58edd74
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182
2020-09-18 19:30:42 +01:00
8e9ff05762
Update src/settings/SettingsStore.ts
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-09-18 19:14:24 +01:00
cf7b4dd311
Add isEnabled comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 19:09:45 +01:00
2492041ee4
Merge pull request #5236 from matrix-org/t3chguy/fix/15237
...
Rename apps back to widgets
2020-09-18 19:04:34 +01:00
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
189233447b
Merge branch 'develop' into t3chguy/fix/15182
2020-09-18 11:06:32 -06:00
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
4d34e40680
Merge pull request #5233 from matrix-org/t3chguy/fix/15231
...
Fix Cmd/Ctrl+Shift+U for File Upload
2020-09-18 18:02:58 +01:00
949b8d9afe
Rename apps back to widgets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 16:35:42 +01:00
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
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
d267092b19
Make the upload_file dispatch synchronous to make Firefox happy about it
2020-09-18 12:33:25 +01:00
780aea1a36
Mac sends lowercase event.key even when holding Shift unlike Windows
2020-09-18 12:32:33 +01:00
de1d9e0e09
Fix Search Results Tile undefined variable access regression
2020-09-18 12:15:56 +01:00
ee4a5b2208
Merge pull request #5228 from matrix-org/t3chguy/15187
...
UI Feature Flag: 3PIDs
2020-09-18 11:34:52 +01:00
9dbc1dbc85
Hide Advanced Appearance Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 11:34:35 +01:00
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
1a965b1cb7
UIF 3PID implies UIF Identity Server
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 11:15:48 +01:00
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
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
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
f5f48cbc21
Fix indentation
2020-09-17 10:44:58 -06:00
4657a34bbb
Document some of the magic values
2020-09-17 10:44:18 -06:00
14a7b83988
Don't show a bottom border ahead of the date separator
2020-09-17 10:40:48 -06:00
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
d59a1fbd80
Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps
...
Tidy devDeps, all the webpack stuff lives in the layer above
2020-09-17 15:06:16 +01:00
c6d76f2b55
Merge pull request #5214 from matrix-org/t3chguy/fix/15178
...
UI Feature Flag: Hide flair
2020-09-17 14:43:36 +01:00
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
53ee5d82c7
Merge pull request #5218 from matrix-org/t3chguy/fix/15181
...
UI Feature Flag: Identity server
2020-09-17 14:07:56 +01:00
25171347a0
i18n
2020-09-17 13:57:47 +01:00
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
5f324b19f0
Merge pull request #5221 from matrix-org/t3chguy/fix/15180
...
UI Feature Flag: Share dialog QR code and social icons
2020-09-17 13:51:19 +01:00
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
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
1ca20dffc8
Merge pull request #5204 from matrix-org/t3chguy/fix/15164
...
Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT
2020-09-17 13:34:07 +01:00
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
eda2dee63f
UI Feature Flag: 3PIDs
2020-09-17 13:25:18 +01:00
148a57c58e
Merge pull request #5217 from matrix-org/t3chguy/fix/15175
...
UI Feature Flag: Disable VoIP
2020-09-17 12:09:09 +01:00
f52b267bd3
i18n
2020-09-17 12:07:17 +01:00
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
d340dd58d1
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 11:55:10 +01:00
2ad08c8394
Merge pull request #5224 from matrix-org/travis/ft-sep1620/05-directory
...
Fix setState() usage in the constructor of RoomDirectory
2020-09-16 15:47:32 -06:00
815a1559ff
Fix setState() usage in the constructor of RoomDirectory
...
React doesn't like it when we setState() in the constructor
2020-09-16 15:05:14 -06:00
b5000b236f
Fix lint error
2020-09-16 17:12:51 +01:00
a18d0271c3
Adjust tests for Secure Backup toast
2020-09-16 16:51:10 +01:00
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
aeb30c08ca
Merge pull request #5213 from matrix-org/t3chguy/fix/15174
...
UI Feature Flag: Disable feedback button
2020-09-16 16:34:12 +01:00
9be04f8a67
i18n
2020-09-16 16:10:43 +01:00
93323febcb
undo change
2020-09-16 16:10:24 +01:00
Michael Telatynski