Commit Graph

32 Commits (d152ce946b0c774f0bff3f6d6f59f90e81bc4958)

Author SHA1 Message Date
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
10 months ago
Ryan Miller 79f3f35977 feat: update strings usages and library 10 months ago
William Grant 3b17e08ea6 fix: more review feedback part 2 11 months ago
William Grant 20766c4aba feat: added conversation id to debugmessageinfo 1 year ago
Ryan Miller 5f53b3fe8f feat: replace and add changed and new localized strings 1 year ago
William Grant 97cd21a77e Merge branch 'unstable' into feat/ses-899/user_profile_poll 1 year ago
Audric Ackermann ca069a1e36 Merge remote-tracking branch 'oxen/unstable' into fix-resize-images-thumbnail 1 year ago
Audric Ackermann 095a9d33e5 fix: canDisplayImage needs check to be done on the thumbnail 1 year ago
Audric Ackermann cef59be005 fix: ellipsis on name rather than pubkey
also cleaned up our contexts a little bit
1 year ago
William Grant dcdea00748 fix: dont show message avatar in message info panels
also show admin crown
1 year ago
William Grant a098638bc0 refactor: remove unnecessary react imports
you don't need it from react 17
1 year ago
Audric Ackermann fe60c69f27
Merge pull request #3022 from Bilb/fix-expiration-read-another-device
Fix expiration read another device
1 year ago
Audric Ackermann 81c1263bfd chore: address PR reviews 1 year ago
Audric Ackermann 33ddf51ba6 fix: add some debugging messageinfo (not released) 1 year ago
William Grant 78da584c02 fix: right panel settings media should not have a scroll bar
combined containers for messageInfoOverlay
1 year ago
Audric Ackermann 032e7640e2 chore: address pr reviews 1 year ago
Audric Ackermann 037d87349f fix: close messageInfo when message not in redux store 1 year ago
Audric Ackermann 5f0888d144 fix: make sure all dialog "cancel" cancel the dialog 1 year ago
Audric Ackermann 571d593c38 fix: fix small ui issues after merge of multiple PRs 1 year ago
William Grant 2db67b2e00 feat: right panel container style is now a styled component 1 year ago
William Grant 3c5f0bf018 fix: only close panel when we confirm delete
rtl text support in panelbutton and panelradiobutton
1 year ago
William Grant 5dd62f7dd7 feat: started adding options to session confirm modal
for delete button in more message info
1 year ago
William Grant e76eee5329 fix: make sure to save the attachment that is visible in the carousel 1 year ago
William Grant 4727b7ee55 fix: use space font for pubkey 1 year ago
William Grant ab62285989 fix: improved content alignment in message info
increased attachment preview size to alignment with other content
1 year ago
William Grant 87db68fac8 fix: carousel dot menu alignement
carousel button padding
1 year ago
William Grant 129e76179b fix: header alignment in right panel 1 year ago
William Grant aea4fd7ad9 Merge branch 'userconfig_disappearingmessage' into feature/ses-558/more-message-information 1 year ago
William Grant 461a23337f fix: alignment message correctly in detail view 2 years ago
William Grant 55337ebd4d feat: improved dotmenu 2 years ago
William Grant 1f52b9620b feat: wip work 2 years ago
William Grant c9a8ea2b81 feat: removed MessageDetails and added MessageInfo
added other components
2 years ago