Commit Graph

16 Commits (unstable)

Author SHA1 Message Date
Audric Ackermann b6d5dd20fa
fix: spacing in modal for emoji clear all 7 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
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 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 53059135ee fix: tsc does not overwrite workers compiled content 1 year ago
William Grant 3250a2819f feat: moved spinners into new loading folder
converted session-loader sass to styled components
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
William Grant 8fae1f979b feat: themed confirm and react modals 3 years ago
William Grant e5bfda37af feat: primary color switching now persists
fixed isDarkMode, will need to confirm when we add ocean themes
3 years ago
William Grant edefa21a2b feat: we can now toggle to the classic dark theme
fixed ocean dark colors and updating theme setting logic
3 years ago
William Grant 5ab28bb60e refactor: rename SessionButton2 to SessionButton and remove old version 3 years ago
William Grant 1bb5c9752e feat: updated all modal buttons 3 years ago
Will G 267f49ff1e
Emoji Reacts (#2320)
Add support for emoji reacts in conversations

Resolves #2375 and #1577
3 years ago