Commit graph

1405 commits

Author SHA1 Message Date
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
Šimon Brandner
8eb0707bba
Merge branch 'develop' into feature-surround-with
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 07:56:44 +01:00
Šimon Brandner
b330dd55a0
Hide surround with behind a setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 07:53:09 +01:00