Commit graph

298 commits

Author SHA1 Message Date
Michael Telatynski
517b594edc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1
 Conflicts:
	src/components/structures/RightPanel.js
2020-09-08 18:04:24 +01:00
Michael Telatynski
12a6bc8231 update copy 2020-09-08 18:00:21 +01:00
Michael Telatynski
596060c506 fix alignments and iterate PR 2020-09-08 17:57:08 +01:00
Michael Telatynski
27a65fff2b null-guard roomId in RightPanel and pass Room to UserView 2020-09-08 17:34:32 +01:00
Michael Telatynski
b982bf87b5 delint 2020-09-08 16:33:55 +01:00
Michael Telatynski
8d14d26e2b do the todos 2020-09-08 16:27:09 +01:00
Michael Telatynski
4a4a8cd611 styling and fix i button behaviour 2020-09-08 15:43:40 +01:00
Michael Telatynski
ef0843d4ad Iterate to match design 2020-09-08 15:43:40 +01:00
Michael Telatynski
98b59fb217 Consolidate all the work thus far 2020-09-08 15:43:38 +01:00
Michael Telatynski
31cca5e0f2 Create new right panel cards 2020-09-08 15:42:31 +01:00
Michael Telatynski
f28c396b1e Fix HeaderButtons handler bindings 2020-09-04 12:14:43 +01:00
Michael Telatynski
280690cf3c use useIsEncrypted hook in UserInfo 2020-09-03 15:07:10 +01:00
Michael Telatynski
ad9be61477 Move HeaderButtons to an abstract class 2020-09-03 15:05:24 +01:00
Michael Telatynski
9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01: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
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
Michael Telatynski
25499fc687
Merge pull request #5045 from matrix-org/t3chguy/fix/10818
Mass redact ignore room creation events
2020-08-03 13:52:21 +01:00
Swapnil Raj
1b4b594f92 Change public to protected for onAction 2020-07-30 16:13:13 +05:30
Swapnil Raj
d0e2695114 Add access specifier to class methods 2020-07-30 15:58:07 +05:30
Swapnil Raj
fbc341a2f5 Clean up types properly 2020-07-30 11:51:10 +05:30
Swapnil Raj
9aa128a6e8 Revert "Cleanup types"
This reverts commit 97cef335e8.
2020-07-30 11:45:49 +05:30
Swapnil Raj
97cef335e8 Cleanup types 2020-07-30 11:27:53 +05:30
Swapnil Raj
b8e51076a8 Fix private functions for RoomHeaderButtons 2020-07-29 23:58:32 +05:30
Swapnil Raj
aa160095fa Cleanup 2020-07-29 17:26:51 +05:30
Swapnil Raj
bf450ad075 Fix the type for SetRightPanelPhasePayload
Fix uses of it as well
2020-07-29 16:59:29 +05:30
Jorik Schellekens
9cd232617d Unify composer and room header icons 2020-07-28 13:19:11 +01:00
Michael Telatynski
253d4abb49 Mass redact ignore room creation events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 21:30:49 +01:00
Swapnil Raj
5ea7be5d53 Cleanup comments 2020-07-22 21:17:58 +05:30
Swapnil Raj
8ae11ce886 Fix shadow-variable errors in EncryptionPanel 2020-07-22 15:14:50 +05:30
Swapnil Raj
0f0b4035b7 Fix shadow variable errors 2020-07-22 15:14:50 +05:30
Swapnil Raj
5ddae04fb0 lint 2020-07-22 15:14:50 +05:30
Swapnil Raj
8fac7a8167 Convert VerificationPanel to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
3e64ec11c0 lint 2020-07-22 15:14:50 +05:30
Swapnil Raj
36974c4231 Convert EncryptionPanel to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
dac19cffce Convert EncryptionInfo to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
a4959f43d2 Convert GroupHeaderButtons to TS
Fix typo in SetRightPanelPhasePayload
2020-07-22 15:14:50 +05:30
Swapnil Raj
887d507772 Fix key to match SetRightPanelPhasePayload's key
member -> members
2020-07-22 15:14:50 +05:30
Swapnil Raj
23e4b67a69 Convert HeaderButton to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
2c8b5b49ed lint 2020-07-22 15:14:50 +05:30
Swapnil Raj
1d3635e1c8 Replaced string actions with their corresponding types 2020-07-22 15:14:50 +05:30
Swapnil Raj
344185a375 Translate right panel stuff to ts
Add actions for right panel
2020-07-22 15:14:50 +05:30
Michael Telatynski
7529bb8bc0 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 19:25:37 +01:00
Michael Telatynski
a402f7e38f Add tooltips to top right buttons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 18:16:21 +01:00
Michael Telatynski
3305ca26f0 fix
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 12:07:54 +01:00
Michael Telatynski
5c8d12ab25 Null guard no e2ee for UserInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 10:49:57 +01:00
J. Ryan Stinnett
9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
Michael Telatynski
63ad7640bf User Info default power levels for ban/kick/redact to 50 as per spec 2020-06-14 01:35:24 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
2020-06-03 10:51:17 +01:00