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
|
9 months ago |
|
Ryan Miller
|
0e44cc9e0c
|
Merge branch 'standardised_strings' of github.com:Aerilym/session-desktop into standardised_strings
|
1 year ago |
|
Ryan Miller
|
87986914c9
|
chore: disappearing messages string changes
|
1 year ago |
William Grant
|
9be21ce879
|
Merge branch 'unstable' into feat/ses-897/steps-create-account
|
1 year ago |
Audric Ackermann
|
2a798aed92
|
fix: show timer fixed when off update
|
1 year ago |
|
William Grant
|
a098638bc0
|
refactor: remove unnecessary react imports
you don't need it from react 17
|
1 year ago |
|
William Grant
|
aad3a3aba2
|
fix: resolved missing selected conversation hooks
still need to fix more issues
|
2 years ago |
|
Audric Ackermann
|
9a7ef4d373
|
Merge branch 'unstable' into userconfig_disappearingmessage
|
2 years ago |
|
Audric Ackermann
|
594eee698b
|
Merge remote-tracking branch 'upstream/clearnet' into unstable
|
2 years ago |
|
William Grant
|
feb8f46966
|
fix: removed redundant document check from getTypeLabel
|
2 years ago |
|
William Grant
|
e90e548715
|
feat: improved quoted message not found
consolidated quote props lookup into getMessageQuoteProps, only use the db message in the quote components
|
2 years ago |
|
William Grant
|
98e4474e75
|
feat: use quoteicon component in quoteimage
make sure to load message text is it exists for all quotes
|
2 years ago |
|
William Grant
|
bdbdb477da
|
feat: pass in all props to quote component
converted quote primary text to styled components
|
2 years ago |
|
William Grant
|
bf170e6e77
|
fix: fixed QuoteText type labels
show message not found in correct context
|
2 years ago |
|
William Grant
|
3249d2ff4c
|
feat: converted quote author and text to styled components
|
2 years ago |
|
William Grant
|
1609ebfe32
|
feat: separated quote components
removed reference warning component since it is no longer needed
|
2 years ago |