From bea2930ce3345bf023acdd2b75f00fe37dbe708f Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 2 Mar 2020 16:37:02 -0800 Subject: [PATCH 1/4] try some additional linux formats --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c5a4d1a00..b71b14c3f 100644 --- a/package.json +++ b/package.json @@ -244,7 +244,10 @@ "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries", "target": [ "deb", - "AppImage" + "rpm", + "snap", + "AppImage", + "tar.xz" ], "icon": "build/icons/png" }, From 9b030cfed31cffc3e2b4ded8ccd4427a4d8fc9ca Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Mar 2020 18:08:49 -0800 Subject: [PATCH 2/4] Revert "try some additional linux formats" This reverts commit bea2930ce3345bf023acdd2b75f00fe37dbe708f. --- package.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index b71b14c3f..c5a4d1a00 100644 --- a/package.json +++ b/package.json @@ -244,10 +244,7 @@ "asarUnpack": "node_modules/spellchecker/vendor/hunspell_dictionaries", "target": [ "deb", - "rpm", - "snap", - "AppImage", - "tar.xz" + "AppImage" ], "icon": "build/icons/png" }, From 1792e2d952b01a493af098da4d4fbcdc03b9ae47 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Mar 2020 18:39:51 -0800 Subject: [PATCH 3/4] add editGroupNameOrPicture to gear --- js/views/conversation_view.js | 4 ++++ ts/components/conversation/ConversationHeader.tsx | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js index 9f28d86c7..7a5762e2a 100644 --- a/js/views/conversation_view.js +++ b/js/views/conversation_view.js @@ -252,6 +252,10 @@ window.Whisper.events.trigger('inviteFriends', this.model); }, + onUpdateGroupName: () => { + window.Whisper.events.trigger('updateGroupName', this.model); + }, + onAddModerators: () => { window.Whisper.events.trigger('addModerators', this.model); }, diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 5f90e7920..7120b5a19 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -92,6 +92,7 @@ interface Props { onRemoveModerators: () => void; onInviteFriends: () => void; onAvatarClick?: (userPubKey: string) => void; + onUpdateGroupName: () => void; i18n: LocalizerType; } @@ -292,6 +293,7 @@ export class ConversationHeader extends React.Component { onAddModerators, onRemoveModerators, onInviteFriends, + onUpdateGroupName, } = this.props; const isPrivateGroup = isGroup && !isPublic && !isRss; @@ -313,6 +315,9 @@ export class ConversationHeader extends React.Component { {i18n('removeModerators')} ) : null} + {amMod ? ( + {i18n('editGroupNameOrPicture')} + ) : null} {isPrivateGroup ? ( {i18n('leaveGroup')} ) : null} From a53fcee1bd0f9564f4caad8643baac8a96c14ba5 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Tue, 3 Mar 2020 18:42:42 -0800 Subject: [PATCH 4/4] lint --- ts/components/conversation/ConversationHeader.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx index 7120b5a19..3b3d33bbb 100644 --- a/ts/components/conversation/ConversationHeader.tsx +++ b/ts/components/conversation/ConversationHeader.tsx @@ -316,7 +316,9 @@ export class ConversationHeader extends React.Component { ) : null} {amMod ? ( - {i18n('editGroupNameOrPicture')} + + {i18n('editGroupNameOrPicture')} + ) : null} {isPrivateGroup ? ( {i18n('leaveGroup')}