Commit Graph

21 Commits (4d61d8dc726075e79ff8af930760b64515f31a88)

Author SHA1 Message Date
Audric Ackermann 143759ff92
fix: we want the sorting order to be jumpy for groups
apparently
5 months ago
Audric Ackermann 7611f07b09
chore: address PR 184 reviews 8 months ago
Audric Ackermann 8e129e28c7 feat: add block/unblock modal 8 months ago
Audric Ackermann d152ce946b Merge remote-tracking branch 'upstream/unstable' into standardised_strings 9 months ago
yougotwill e60d8c36a0 Merge branch 'unstable' into fix/ses-2426/block_contacts_height 9 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
9 months ago
Audric Ackermann 4b0b813362 fix: blocked list overflow by setting parent width correctly 9 months ago
William Grant 5a68985f4a fix: blocked list layout and list rendering overflow 9 months ago
yougotwill a2310439db fix: blocked list is now accessible on smaller screens
prevent name overflow
9 months ago
Ryan Miller 5f53b3fe8f feat: replace and add changed and new localized strings 1 year ago
William Grant a098638bc0 refactor: remove unnecessary react imports
you don't need it from react 17
1 year ago
Audric Ackermann d43d6abbae chore: replace tslint with eslint and fix linting issues 2 years ago
Audric Ackermann 55a2767fce feat: do not approve a convo before sending the first message
but still sync it's state through the createdAt with libsession util
2 years ago
Audric Ackermann faeb95fefd feat: add block/decline logic to msg request & wrapper 2 years ago
William Grant 59f82a165b feat: finished styling convesation category
including block list, added quick link to github release
3 years ago
William Grant a54fb65d0b Merge branch 'theming' into theming_left_pane 3 years ago
William Grant 5ab28bb60e refactor: rename SessionButton2 to SessionButton and remove old version 3 years ago
William Grant 87b66794ed feat: updated all session buttons to use new button
small style fixes and sass cleanup
3 years ago
Audric Ackermann c6e3116b06 fix integration tests 3 years ago
Audric Ackermann 3ffc470c40 fix: address reviews comment 3 years ago
Audric Ackermann f137cad2a0 feat: add the BlockedList component in Settings 3 years ago