mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 14:41:59 +03:00
Code Issues Projects Releases Packages Wiki Activity
35276 commits 219 branches 562 tags 474 MiB
Commit graph

645 commits

Author SHA1 Message Date
Germain Souquet
8f1ea84eb6 Broadcast language change to ElectroPlatform 2021-04-23 17:11:45 +01:00
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
0e92251f70 Fix simple lint errors 2021-04-23 16:28:55 +01:00
J. Ryan Stinnett
31a28b1a9e Update extensions for some files with types 
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
 2021-04-23 16:05:30 +01:00
Sam A. Horvath-Hunt
14b8b0f8da
Render ignored users setting regardless of if there are any 
Signed-off-by: Sam A. Horvath-Hunt <hello@samhh.com>
 2021-04-13 21:45:09 +01:00
Travis Ralston
073c05543c Give server ACLs a name in 'roles & permissions' tab 
The default power levels event includes them, so this helps avoid them showing up as "Send m.room.server_acl events".
 2021-04-08 19:20:08 -06:00
Travis Ralston
28d12016b7 Convert to using EventType enum 2021-04-08 19:18:30 -06:00
Robin Townsend
2477258249 Merge branch 'develop' into show-invite-reasons 2021-03-31 16:13:29 -04:00
Robin Townsend
f0333b5b1c Show invite reasons 
Displays the reason for invitation in the invitation dialog, requiring a
click to reveal the message.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-03-31 15:46:09 -04:00
Germain
096d4102b8
Merge pull request #5793 from matrix-org/gsouquet-warn-before-exit 
Add user settings for warn before exit
 2021-03-29 12:11:55 +01:00
Germain Souquet
25a47b463e Add user settings for warn before exit 2021-03-25 14:14:38 +00:00
Marek Matys
b5bc6251cf fix password change popup message 
Fixed bad error message when providing bad old password during password change.

Signed-off-by: Marek Matys <themarcq@gmail.com>
 2021-03-25 14:26:00 +01:00
Travis Ralston
6ce0c17455
Merge pull request #5774 from matrix-org/travis/js-sdk-imports 
Convert a bunch more js-sdk imports to absolute paths
 2021-03-19 07:23:45 -06:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths 
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
 2021-03-18 20:50:34 -06:00
David Baker
84b6027d41 Log error when failing to list usermedia devices 
So we can debug why this might be failing
 2021-03-18 16:41:22 +00:00
Šimon Brandner
0e293bca91
Reorganize preferences 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-10 15:34:45 +01:00
Travis Ralston
41576954fd Batch of views getting replaceableComponent decorators 2021-03-08 20:23:54 -07:00
Aaron Raimist
ff788ca3da Merge branch 'develop' into warn-on-access-token-reveal 2021-03-04 13:33:01 -06:00
Travis Ralston
c7d4dfa4f5
Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting 
Add a scroll to bottom on message sent setting
 2021-03-02 17:41:15 -07:00
Šimon Brandner
6fcb4c7cd2
Fix quote 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-02 07:37:00 +01:00
Šimon Brandner
1387c9f94d
Display scrollToBottomOnMessageSent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 18:37:25 +01:00
Šimon Brandner
5a6e393fa2
Removed spell-check-languages 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 20:13:55 +01:00
Šimon Brandner
1ba512af2a
Use getSpellCheckLanguages() instead of a setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 20:12:48 +01:00
Šimon Brandner
305d64cda8
Removed log 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 20:09:39 +01:00
Šimon Brandner
2ebc1252cb
Removed unnecessary functions 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 19:54:54 +01:00
Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Šimon Brandner
65ef4f2f22
Removed the commented out code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-15 16:05:14 +01:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
J. Ryan Stinnett
15a4032be0
Merge pull request #5530 from aaronraimist/option-hide-stickers 
Add option to hide the stickers button in the composer
 2021-02-04 17:01:23 +00:00
Šimon Brandner
972c947049
More generic layout setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 10:35:35 +01:00
Šimon Brandner
0c09158f2a
Comment out unused code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-22 08:41:39 +01:00
Šimon Brandner
da09362f99
Added option to hide line numbers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 13:08:55 +01:00
Šimon Brandner
7f727be4f6
Added expand code block option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:44:32 +01:00
Šimon Brandner
e7384f829a
Made search shortcut optional 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-17 16:44:29 +01:00
Aaron Raimist
b8334bfd4a
Add option to hide the stickers button in the composer 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-02 15:31:54 -06:00
Travis Ralston
27df6ae6e1 Remove impossible labs feature: sending hidden read receipts 
This claims it requires a compatible homeserver, but that does not exist and hasn't for years. Let's just remove the option to stop giving people false hope.

Once notifications are decoupled from read receipts, this sort of thing should be more possible.
 2020-12-09 18:36:48 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
Šimon Brandner
19d9ea3477 Merge branch 'develop' into feature-multi-language-spell-check 2020-12-03 12:06:43 +01:00
Šimon Brandner
fa19adcfe0 Simplifie 2020-12-03 11:50:08 +01:00
Šimon Brandner
bab541a652 Hide spell-check settings if not using Electron 2020-12-02 20:14:58 +01:00
Šimon Brandner
db5bc0cb7a Fix formatting 2020-12-01 20:36:25 +01:00
Šimon Brandner
3c2bb6e4f6 Cleanup 2020-12-01 20:17:24 +01:00
Šimon Brandner
b207a877eb Change label 2020-12-01 16:59:02 +01:00
anonym
b1b0e93d5e
Update i18n for Appearance User Settings 
The variable has to be added to the i18n files as well (I don't know how to do that)
 2020-11-30 21:33:52 +01:00
Šimon Brandner
ead00dcded Set spell-check languages without reloading 2020-11-29 14:46:09 +01:00
Šimon Brandner
8f40cd39fd Added styling 2020-11-29 12:29:05 +01:00
Šimon Brandner
f0bbed0c44 Allow default value 2020-11-29 12:17:07 +01:00
Šimon Brandner
5e4f9907cf Added persistance 2020-11-28 19:39:09 +01:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
Šimon Brandner
2f988bc97f Added UI 2020-11-26 13:51:03 +01:00
Clemens Zeidler
1346416d20 Merge branch 'develop' into ctrl-enter-send 2020-11-19 19:40:38 +13:00
Michael Telatynski
f80ee391bc
Merge pull request #5370 from matrix-org/t3chguy/countly 
Fix CountlyAnalytics NPE on MatrixClientPeg
 2020-10-30 14:28:48 +00:00
Michael Telatynski
171b3ede76 improve comments 2020-10-30 14:27:14 +00:00
Michael Telatynski
b6532f9b80
Merge pull request #5369 from matrix-org/t3chguy/countly 
fix CountlyAnalytics canEnable on wrong target
 2020-10-30 13:47:35 +00:00
Michael Telatynski
3f11259fa8 fix CountlyAnalytics canEnable on wrong target 2020-10-30 13:42:35 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly 
Initial Countly work
 2020-10-30 13:07:58 +00:00
Michael Telatynski
b01055f962 Tidy up and fix some edge cases 2020-10-30 10:26:15 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Travis Ralston
a501d698aa Add a UI Feature flag for room history settings 2020-10-28 09:00:36 -06:00
Resynth
e33f4ba9c0 Warn on Access Token reveal 
Signed-off-by: Resynth <resynth1943@tutanota.com>
 2020-10-25 22:04:39 +00:00
Steffen Kolmer
607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02:00
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02: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
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
5630f35715 Add a UI feature to disable advanced encryption options 2020-09-18 11:33:02 -06:00
Travis Ralston
189233447b Merge branch 'develop' into t3chguy/fix/15182 2020-09-18 11:06:32 -06: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
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
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
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
d340dd58d1 UI Feature Flag: Registration, Password Reset, Deactivate 2020-09-17 11:55:10 +01: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
J. Ryan Stinnett
7bd5e3fa31 Move security-related dialogs to a common directory 2020-09-16 15:03:06 +01:00
Michael Telatynski
d3c84e25f5 UI Feature Flag: Identity server 2020-09-16 14:45:34 +01:00
Michael Telatynski
2bea8457e9 UI Feature Flag: Communities 2020-09-16 12:56:40 +01:00
Michael Telatynski
7a448be1dc UI Feature Flag: Disable advanced options and tidy up some copy 2020-09-16 12:14:33 +01:00
Michael Telatynski
f4f94e31d1 UI Feature Flag: Disable integrations entry UI 2020-09-16 11:38:50 +01:00
Michael Telatynski
9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Michael Telatynski
d990986407 Also hide Privacy heading in settings and fix React Key warning 2020-09-16 10:37:15 +01:00
Michael Telatynski
771ab82598 Hide Analytics sections if piwik config is not provided 2020-09-16 10:29:21 +01:00
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172 
If no bug_report_endpoint_url, hide rageshaking from the App
 2020-09-15 16:23:48 +01:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base 
Introduce a concept of UI features, using it for URL previews at first
 2020-09-15 08:53:48 -06:00
Michael Telatynski
6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Travis Ralston
f4f30a3274 Introduce a concept of UI features, using it for URL previews at first 
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
 2020-09-14 22:28:02 -06:00
Travis Ralston
b177843e45 Remove defunct "always show encryption icons" setting 
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
 2020-09-14 22:03:54 -06:00
Michael Telatynski
e32cb175cb Fix Bridges tab crashing when the room does not have bridges 2020-09-14 15:44:00 +01:00
Clemens Zeidler
db61d343f5 Add option to send/edit a message with Ctrl + Enter / Command + Enter 
When editing multi-line text this option helps to prevent accidentally
sending a message too early. With this option, Enter just inserts a new
line.

For example, composing programming code in a dev chat becomes much
easier when Enter just inserts a new line instead of sending the
message.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2020-09-09 19:27:11 +12:00
J. Ryan Stinnett
46bc6b1d14 Rename key backup to secure backup 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
da6cc5c2e9 Tweak Security settings section headers 
This brings us slightly closer to the version Design is working from in terms of
section naming.

Prep for https://github.com/vector-im/element-web/issues/13895
 2020-09-03 15:41:17 +01:00
Michael Telatynski
9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01:00
nurjinn jafar
1123545cfa Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 
 Conflicts:
	src/SlashCommands.tsx
	src/i18n/strings/de_DE.json
 2020-08-25 11:52:48 +02:00
David Baker
0690c02e0c
Merge pull request #5131 from matrix-org/dbkr/clarify_media_device_id 
Add clarifying comment in media device selection
 2020-08-20 09:26:27 +01:00
David Baker
d1bca2838f Add clarifying comment in media device selection 
Hopefully explain the confusing mismatch.
 2020-08-19 19:07:12 +01:00
nurjinn jafar
4394a20f87 setting added to User Settings -> Preferences -> Timeline as an opt out for users with german translation 2020-08-18 09:56:38 +02:00
Travis Ralston
4f851542ac Implement force state for features like in the proposal 2020-08-17 13:51:41 -06:00
Travis Ralston
eda4e24926 Update LabsUserSettings for new feature behaviour 2020-08-17 13:19:15 -06:00
Travis Ralston
96087d61f6 Convert feature setting usages to regular settings 2020-08-17 13:12:18 -06:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
Michael Telatynski
5c0d332e9d Convert Bridge Settings Tab to Typescript 2020-08-08 11:38:57 +01:00
Michael Telatynski
f784500b1c Fix Bridge Settings Tab 2020-08-08 11:28:44 +01:00
Jorik Schellekens
b871d7e849 Fix room security radios 2020-08-05 13:53:19 +01:00
Jorik Schellekens
271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
J. Ryan Stinnett
ce226ab534 Replace Riot with Element in docs and comments 
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
 2020-08-03 18:33:36 +01:00
Travis Ralston
1f7f40736b Fix imports for SettingLevel to point at new file 2020-07-28 11:53:43 -06:00
Jorik Schellekens
f64ef65f97 Use StyledRadioGroup 2020-07-28 17:13:58 +01:00
Jorik Schellekens
447ef63950 Replace old checkboxes 2020-07-27 16:36:31 +01:00
Michael Telatynski
fe0c660fac Put low priority xor toggle back in the room list context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:50:20 +01:00
Travis Ralston
2b15ba21dd Rename RoomListStore file 2020-07-17 15:11:34 -06:00
Travis Ralston
1810711380 Dismantle usage of the proxy store class 2020-07-17 14:25:09 -06:00
Travis Ralston
c29da883db Convert room list log setting to a real setting 
To debug https://github.com/vector-im/riot-web/issues/14554 and https://github.com/vector-im/riot-web/issues/14508
 2020-07-16 14:43:43 -06:00
David Baker
7ab1416787
Merge pull request #4986 from matrix-org/dbkr/update_help_link 
Update help link
 2020-07-15 16:30:03 +01:00
David Baker
7d5f40876e Update help link 2020-07-15 14:31:15 +01:00
David Baker
6e35cd1d0c Update cover photo link 2020-07-15 14:22:58 +01:00
Travis Ralston
cc22be4f1d Update attribution 2020-07-14 15:51:34 -06:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
Jorik Schellekens
3eac852ad0 Change font slider values 2020-07-14 21:27:01 +01:00
Travis Ralston
3a8b3e26ac Fix appearance tab saying the wrong theme is selected 
Fixes https://github.com/vector-im/riot-web/issues/14275
 2020-07-14 11:53:10 -06:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
Bruno Windels
4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Jorik Schellekens
59e153e024
Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-13 16:15:52 +01:00
J. Ryan Stinnett
9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
Travis Ralston
75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06:00
Jorik Schellekens
1033eda7fb Move irc layout option to advanced 2020-07-09 15:54:44 +01:00
Jorik Schellekens
9dd28a9ce0 semi 2020-07-08 17:02:26 +01:00
Jorik Schellekens
4ae64aff9a lint line length 2020-07-08 16:14:04 +01:00
Jorik Schellekens
b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +01:00
Travis Ralston
a59a8b76a9 Update TODO comments to point to new issue 2020-07-07 14:51:43 -06:00
Jorik Schellekens
1e0ff01d50 De labs font-scaling 2020-07-06 15:43:49 +01:00
Michael Telatynski
ae5ab4c394
Merge pull request #4893 from matrix-org/t3chguy/room-list/101 
Radio button outline fixes including for new room list context menu
 2020-07-03 20:35:17 +01:00
Michael Telatynski
c8bb6f5904 Improve radio outlines for message layout to be more consistent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-03 19:48:22 +01:00
Michael Telatynski
5a542281ed Make Styled Radio Button outlines default-off 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-03 19:27:45 +01:00
J. Ryan Stinnett
04142a8723 Remove duplicate compact settings, handle device level updates 
This removes the duplicate setting for compact layout from the appearance tab,
and leaves the "advanced" one, matching the intention from Design.

This also adds the relevant handling to ensure the device-level setting triggers
an update immediately when changed.

Fixes https://github.com/vector-im/riot-web/issues/14304
 2020-07-03 12:06:00 +01:00
Travis Ralston
0868af650a Appease the linter 2020-06-30 19:37:00 -06:00
Travis Ralston
d402808101 Disable use of account-level ordering options in new room list 
Fixes https://github.com/vector-im/riot-web/issues/14069

We can't drop them completely for compatibility with the old room list.
 2020-06-30 19:31:59 -06:00
Michael Telatynski
cf3c914382 Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-26 15:35:36 +01:00
Michael Telatynski
46058a17f8 Fix Room Custom Sounds regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 14:18:38 +01:00
Michael Telatynski
85c5bb3bc3
Merge pull request #4835 from matrix-org/t3chguy/notifications0 
More small tweaks in preparation for Notifications rework
 2020-06-25 23:34:28 +01:00
Michael Telatynski
ed634a2bde Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 16:35:40 +01:00
Jorik Schellekens
a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced 
Move compact modern layout checkbox to 'advanced'
 2020-06-25 14:38:18 +01:00
Michael Telatynski
edd09f66d1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-25 08:45:32 +01:00
Michael Telatynski
dc099efb19 make Notifier getSoundForRoom synchronous 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 08:43:35 +01:00
Jorik Schellekens
0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
Jorik Schellekens
d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens
3d7427ccca Fix semicolons 2020-06-22 11:39:11 +01:00