Commit Graph

20 Commits (af28c97cfdd3f0c59d731cfbff3f10c5acee09c5)

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
9 months ago
Ryan Miller 79f3f35977 feat: update strings usages and library 9 months ago
William Grant 4f44a7a5fa feat: refactor theme state
added hooks for is light or dark theme and cleaned up any references
11 months ago
William Grant f245f6d1d9 fix: added missing & selector to all pseudo events 12 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
William Grant f64f88c013 feat: new useDisappearingMessageSettingText hook
fixed styling on panel components
2 years ago
Audric Ackermann d43d6abbae chore: replace tslint with eslint and fix linting issues 2 years ago
William Grant 4758fdc64a fix: move primary color switching into theme switching 3 years ago
William Grant b777d0bcd1 feat: the primary color is now reset when changing themes
refactored theme and primary color switching functions
3 years ago
William Grant 2f0e993af3 feat: moved constants into a constants folder 3 years ago
William Grant e14f4832aa feat: added primaryColor to the redux store 3 years ago
William Grant 7e29e18a56 feat: can now switch the primary color 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 6cd81e06f2 Merge branch 'ui-redesigns' into theming 3 years ago
Audric Ackermann 3ffc470c40 fix: address reviews comment 3 years ago
William Grant 131ee22099 Merge branch 'settings-redesign' into theming 3 years ago
Audric Ackermann 13d33d1656 fix: radio button in settings + registration page 3 years ago
William Grant 82c505895c fix: errors from merging latest settings redesign 3 years ago
Audric Ackermann 1e202fcdab feat: add theme switcher +accent color from settings
not all of the logic is linked and not all of the colors are there as this is part of theming
3 years ago