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
|
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 |
|
William Grant
|
fd4e1525cb
|
Merge branch 'unstable' into feat/ses-50/onboarding
|
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
|
4774c8a669
|
fix: consolidate isDetailView into one type called hasDetailView
which we import in various components
|
1 year ago |
|
William Grant
|
9be21ce879
|
Merge branch 'unstable' into feat/ses-897/steps-create-account
|
1 year ago |
|
Ryan Miller
|
3a4ff83e86
|
fix: change reaction container to use group avatar list margin width
|
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
|
3bf3bf73b1
|
feat: updated MessageContent with nested components
|
2 years ago |
|
William Grant
|
de2a15a691
|
fix: dont load container if there are no reactions
now message elements are the correct height from what we see visually
|
2 years ago |
|
William Grant
|
aad3a3aba2
|
fix: resolved missing selected conversation hooks
still need to fix more issues
|
2 years ago |
|
Audric Ackermann
|
959c494cfb
|
Merge branch 'unstable' into userconfig_disappearingmessage
|
2 years ago |
|
William Grant
|
e232eadf91
|
fix: message spacing after fixing audio message shadow
|
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
|
3ecc89fab3
|
Merge remote-tracking branch 'upstream/master' into onboarding
|
2 years ago |
|
Audric Ackermann
|
0050352470
|
chore: move selected convo selectors to another file
|
2 years ago |
|
William Grant
|
a8b8692016
|
fix: improved reaction alignment based on avatar visibility
|
2 years ago |
tomobre
|
828f1923a0
|
fix: avatar at bottom, reacts with margin
|
2 years ago |
|
William Grant
|
5b44565b5f
|
Merge branch 'clearnet' into theming
|
3 years ago |
|
Audric Ackermann
|
51e03cf4e5
|
fix: rerender loop of react list modal
update redux related libraries
and update imports to use the RTK ones
|
3 years ago |
|
William Grant
|
8fae1f979b
|
feat: themed confirm and react modals
|
3 years ago |
|
William Grant
|
e25a0dc5b2
|
feat: styled reactions
|
3 years ago |
|
William Grant
|
831cdee0f1
|
feat: updated danger color setup
updated inbox color and added modal colors to SessionTheme
|
3 years ago |
|
William Grant
|
772fe27b2b
|
fix: compressed reactions shouldn't wrap, when expanded we show at most 10 reactions on a time
|
3 years ago |
|
William Grant
|
df73b5dd33
|
fix: improved reaction popup positioning for tooltip and box
|
3 years ago |
|
Will G
|
267f49ff1e
|
Emoji Reacts (#2320)
Add support for emoji reacts in conversations
Resolves #2375 and #1577
|
3 years ago |