PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
33266 commits 1 branch 0 tags 338 MiB
Commit graph

1083 commits

Author SHA1 Message Date
Travis Ralston
e38d27f64e
Merge pull request #5915 from aaronraimist/initialisation 
Typo: initilisation -> initialisation
 2021-05-13 20:15:08 -06:00
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
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