Commit Graph

19 Commits (3f272244d2e431260a53a9f8100f8ca11801d80b)

Author SHA1 Message Date
Ryan Miller 3f272244d2 fix: use I18n component in subtleNotifications 8 months ago
Ryan Miller 005efc8952 Merge branch 'unstable' into standardised_strings_merge
# Conflicts:
#	.gitignore
#	_locales/en/messages.json
#	ts/components/DebugLogView.tsx
#	ts/components/SessionWrapperModal.tsx
#	ts/components/basic/SessionHTMLRenderer.tsx
#	ts/components/basic/SessionRadio.tsx
#	ts/components/buttons/MenuButton.tsx
#	ts/components/conversation/SessionConversation.tsx
#	ts/components/conversation/SubtleNotification.tsx
#	ts/components/conversation/TimerNotification.tsx
#	ts/components/conversation/composition/CompositionBox.tsx
#	ts/components/conversation/message/message-content/MessageText.tsx
#	ts/components/conversation/message/message-item/InteractionNotification.tsx
#	ts/components/conversation/message/reactions/ReactionPopup.tsx
#	ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
#	ts/components/conversation/right-panel/overlay/disappearing-messages/DisappearingModes.tsx
#	ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
#	ts/components/dialog/BanOrUnbanUserDialog.tsx
#	ts/components/dialog/DeleteAccountModal.tsx
#	ts/components/dialog/EditProfileDialog.tsx
#	ts/components/dialog/ModeratorsAddDialog.tsx
#	ts/components/dialog/OnionStatusPathDialog.tsx
#	ts/components/dialog/ReactListModal.tsx
#	ts/components/dialog/SessionSeedModal.tsx
#	ts/components/dialog/SessionSetPasswordDialog.tsx
#	ts/components/dialog/UserDetailsDialog.tsx
#	ts/components/leftpane/LeftPaneSectionHeader.tsx
#	ts/components/leftpane/LeftPaneSettingSection.tsx
#	ts/components/leftpane/conversation-list-item/InteractionItem.tsx
#	ts/components/leftpane/overlay/OverlayClosedGroup.tsx
#	ts/components/leftpane/overlay/OverlayCommunity.tsx
#	ts/components/leftpane/overlay/OverlayMessage.tsx
#	ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx
#	ts/components/leftpane/overlay/choose-action/ContactsListWithBreaks.tsx
#	ts/components/leftpane/overlay/choose-action/OverlayChooseAction.tsx
#	ts/components/menu/Menu.tsx
#	ts/components/registration/RegistrationStages.tsx
#	ts/components/registration/RegistrationUserDetails.tsx
#	ts/components/registration/SignInTab.tsx
#	ts/components/registration/SignUpTab.tsx
#	ts/components/settings/SessionSettings.tsx
#	ts/components/settings/SessionSettingsHeader.tsx
#	ts/components/settings/ZoomingSessionSlider.tsx
#	ts/components/settings/section/CategoryAppearance.tsx
#	ts/components/settings/section/CategoryHelp.tsx
#	ts/components/settings/section/CategoryPermissions.tsx
#	ts/components/settings/section/CategoryPrivacy.tsx
#	ts/hooks/useParamSelector.ts
#	ts/mains/main_renderer.tsx
#	ts/models/message.ts
#	ts/node/menu.ts
#	ts/node/tray_icon.ts
#	ts/session/constants.ts
#	ts/session/disappearing_messages/timerOptions.ts
#	ts/session/utils/Toast.tsx
#	ts/state/selectors/search.ts
#	ts/test/session/unit/selectors/conversations_test.ts
#	ts/types/LocalizerKeys.ts
#	ts/types/Util.ts
#	ts/window.d.ts
#	yarn.lock
8 months ago
Audric Ackermann 0437390922 fix: show msg request description using libsession state and not msgs 8 months ago
yougotwill 6c291e38c4 fix: disable attachments and voice messages and warn a user when starting a new convo
even if they haven't sent a message request yet
8 months ago
Ryan Miller 79f3f35977 feat: update strings usages and library 9 months ago
William Grant d6ad37ec38 feat: show description text when making a message request
disabled conversation header functionality
11 months ago
Ryan Miller 060a905b1f feat: reword SubtitleNotification to use changed localized strings and new i18n component 1 year ago
William Grant 9a756a8c9b feat: session id to account id 1 year ago
William Grant a098638bc0 refactor: remove unnecessary react imports
you don't need it from react 17
1 year ago
William Grant aad55025ba fix: more comment cleanup 2 years ago
William Grant 43276b069e Merge branch 'unstable' into userconfig_disappearingmessage 2 years ago
Audric Ackermann 84deed19f9 feat: add block msg requests from sogs 2 years ago
William Grant 5285d4240a fix: resolved missing selected conversation hooks imports 2 years ago
Audric Ackermann 1d9279c79c chore: merge conversation selectors into a single file
as the circular dependency was causing a createSelector called with
undefined issue on startup without user loggedin
2 years ago
Audric Ackermann 4637f4609a Merge remote-tracking branch 'yougotwill/disappearing_messages' into userconfig_disappearingmessage 2 years ago
Audric Ackermann 739693024b test: fix create group integration test 2 years ago
Audric Ackermann ce186517a3 chore: lint code 2 years ago
Audric Ackermann faeb95fefd feat: add block/decline logic to msg request & wrapper 2 years ago
Audric Ackermann ef6d9f1d51 feat: add empty states for each types of convo 2 years ago