1140 commits

Author	SHA1	Message	Date
Michael Telatynski	90538c95aa	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-05-06 08:05:14 +01:00
Aaron Raimist	9aa711b7b7	Merge branch 'develop' into initialisation	2021-05-06 00:09:48 -05:00
J. Ryan Stinnett	4bc5990071	Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal ... Warn on access token reveal	2021-05-05 16:32:12 +01:00
Aaron Raimist	35c1e54521	lint ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-04-30 21:55:00 -05:00
Aaron Raimist	626a4ccc34	Make warning bold, close copied tooltip on escape ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-04-30 21:45:37 -05:00
Šimon Brandner	70c8c64772	Rename to Keyboard shortcuts ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-30 11:03:55 +02:00
Šimon Brandner	2c7139fb4d	Merge timeline section into one ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-30 11:03:22 +02:00
Šimon Brandner	192c0c4941	Fix method name ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-30 11:01:34 +02:00
Šimon Brandner	e2bee396bb	Merge branch 'develop' into reorganize-preferences	2021-04-30 10:55:29 +02:00
Šimon Brandner	5913203dc6	Merge branch 'develop' into fix-indent ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-29 20:08:14 +02:00
Michael Telatynski	a4f02937cb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: res/css/structures/_SpaceRoomView.scss src/components/structures/SpaceRoomView.tsx	2021-04-29 09:52:21 +01:00
Travis Ralston	3890bec8ad	Merge pull request #5860 from samhh/always-render-ignored-users ... Render ignored users setting regardless of if there are any	2021-04-28 09:51:57 -06:00
Aaron Raimist	31ff05a862	Merge branch 'develop' into warn-on-access-token-reveal	2021-04-27 19:25:38 -05:00
Aaron Raimist	6754a0b483	Switch to <details> ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-04-27 19:12:22 -05:00
Michael Telatynski	c5f653245a	Show Spaces beta card in Labs & My Communities view ... the image is temporary	2021-04-27 16:29:42 +01:00
Šimon Brandner	46bfbbadf9	Enable indent rule and fix indent ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-04-27 17:23:27 +02:00
Germain	4d5fd3ec73	Merge pull request #5913 from matrix-org/gsouquet-desktop-i18n	2021-04-27 15:48:49 +01:00
J. Ryan Stinnett	1df0a82c64	Add types to PreferencesUserSettingsTab	2021-04-27 12:00:36 +01:00
J. Ryan Stinnett	4e7240ebc9	Add types to SecurityRoomSettingsTab	2021-04-27 11:56:45 +01:00
J. Ryan Stinnett	2ebd256590	Add types to RolesRoomSettingsTab	2021-04-27 11:42:11 +01:00
J. Ryan Stinnett	26bb7c08c2	Add join rule comment	2021-04-26 16:20:16 +01:00
J. Ryan Stinnett	d497d62db3	Use enums in SecurityRoomSettingsTab	2021-04-26 16:14:21 +01:00
J. Ryan Stinnett	bf43144f6e	Add ActionPayload type	2021-04-26 15:21:49 +01:00
J. Ryan Stinnett	1b615eebc1	Fix optional props	2021-04-26 14:56:43 +01:00
J. Ryan Stinnett	a3a756fdb2	Rename history visibility type	2021-04-26 14:08:45 +01:00
J. Ryan Stinnett	69fbfdc552	Fix interface syntax	2021-04-26 14:07:45 +01:00
J. Ryan Stinnett	b8a915bb76	Tweak private / underscores for fields and methods	2021-04-26 14:02:53 +01:00
Germain Souquet	a43ad8d881	Allow for multiple locale and stabilise set language call	2021-04-26 13:55:14 +01:00
Aaron Raimist	f3c0fc96a3	Merge branch 'develop' into warn-on-access-token-reveal	2021-04-24 15:01:19 -05:00
J. Ryan Stinnett	f34489e2df	Actually fix indent lint errors	2021-04-23 18:11:54 +01:00
Aaron Raimist	bf444ce22e	Typo: initilisation -> initialisation ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-04-23 11:31:30 -05:00
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
J. Ryan Stinnett	5d027ffcf4	Merge pull request #5694 from robintown/show-invite-reasons ... Show invite reasons	2021-04-06 10:48:54 +01:00
Travis Ralston	4d72af7916	Merge pull request #5744 from panoschal/forgot-password-validation ... Require strong password in forgot password form	2021-04-05 00:46:47 -06:00
Panagiotis	901d5a86d0	Merge branch 'develop' into forgot-password-validation	2021-04-01 12:39:25 +03:00
Panagiotis	d2f40a859b	define PASSWORD_MIN_SCORE in one place and import from there	2021-04-01 12:30:49 +03:00
Germain Souquet	a4345811b0	Merge branch 'develop' into gsouquet-seshat-reset	2021-04-01 09:06:35 +01: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	5e21a86da9	Merge pull request #5817 from matrix-org/gsouquet-docs ... Change copy to point to native node modules docs in element desktop	2021-03-31 12:51:36 +01:00
J. Ryan Stinnett	58343c7699	Fix search error typo ... This fixes a typo in the recently added search error message.	2021-03-31 11:55:21 +01:00
Germain Souquet	2a4e327dbf	Change copy to point to native node modules docs in element desktop	2021-03-29 16:03:06 +01:00
Germain Souquet	b38f5c9459	Simplify event index store reset flow	2021-03-29 15:46:58 +01: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	c40f97fa25	Add reset option for corrupted event index store	2021-03-26 09:44:52 +00:00
Travis Ralston	264e24fc35	Merge pull request #5791 from thermaq/patch-1 ... Fix password change popup message	2021-03-26 00:07:50 -06: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
Germain Souquet	5104d7bed8	Improve error reporting when EventIndex fails on a supported environment	2021-03-24 11:51:39 +00:00
Travis Ralston	edcd7c4426	Merge branch 'develop' into Discovery	2021-03-22 23:04:41 -06:00
Ayush PS	f5911e6446	Fixing the minor UI issues in the email discovery	2021-03-22 00:33:09 +05:30
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	f3ca75391d	Merge remote-tracking branch 'origin/develop' into dbkr/log_getusermedia_error	2021-03-18 17:15:07 +00: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
Travis Ralston	fa5d98c319	Convert cases of getHttpUriForMxc to new media customisation	2021-03-10 12:32:18 -07:00
Travis Ralston	1ac12479ca	Convert cases of mxcUrlToHttp to new media customisation	2021-03-10 12:32:18 -07: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
Michael Telatynski	c73ad9e594	Merge pull request #5332 from Transfusion/trim_display_name ... Trim spurious whitespace of nicknames	2021-03-04 16:26:09 +00: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
J. Ryan Stinnett	a5ee029c62	Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check ... Add multi language spell check	2021-03-02 14:38:21 +00:00
Šimon Brandner	6fcb4c7cd2	Fix quote ... Co-authored-by: Travis Ralston <travpc@gmail.com>	2021-03-02 07:37:00 +01:00
Šimon Brandner	24428783f5	Remove unnecessary async ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-28 09:54:05 +01:00
Šimon Brandner	5d6bc9a886	Add second Confirm Public Encrypted Room dialog ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-28 08:29:31 +01:00
Šimon Brandner	131f499c25	Add Confirm Public Encrypted Room dialog ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-27 08:11:29 +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
J. Ryan Stinnett	9a56a2efa5	Merge pull request #5629 from PunitLodha/punit/add_email_bug_fix ... Add email only if the verification is complete	2021-02-24 11:28:57 +00: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	ed02503462	Fix one more license ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-02-18 19:41:19 +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
PunitLodha	0902936d39	Add phone number only if verification is complete	2021-02-14 18:21:39 +05:30
PunitLodha	74a6c1e8d8	Dont clear email if verification cancelled by user	2021-02-14 18:21:12 +05:30
PunitLodha	392b47e200	Add email only if the verification is complete	2021-02-09 11:39:36 +05:30
Šimon Brandner	84eba59afa	Merge branch 'develop' into improve-codeblock	2021-02-08 15:26:50 +01:00
J. Ryan Stinnett	81bd919a18	Port avatar restore to user profile settings	2021-02-05 14:11:57 +00: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
J. Ryan Stinnett	5431dc7331	Merge pull request #5548 from SimonBrandner/add-search-shortcut ... Add optional search shortcut	2021-01-28 12:33:32 +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
J. Ryan Stinnett	35bee5c5ea	Merge pull request #5522 from SimonBrandner/room-dialog-fixes ... Fixes for the general tab in the room dialog	2021-01-22 10:34:37 +00: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
J. Ryan Stinnett	e49a931588	Merge pull request #5533 from aaronraimist/security-key ... Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase	2021-01-21 17:46:02 +00: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	8a4af2f348	Merge branch 'develop' into expand-codeblock	2021-01-18 17:54:06 +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
Will Hunt	448a5ea42d	Remove replaceableComponentTs from BridgeTile	2021-01-08 18:07:48 +00:00
Aaron Raimist	4f96d5dee5	Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-01-04 19:17:17 -06:00