You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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
..
config	chore: replace tslint with eslint and fix linting issues	2 years ago
migration	fix: ran formatter	9 months ago
sql_calls	feat: add block msg requests from sogs	2 years ago
attachment_channel.ts	fix: finish updating dependencies	2 years ago
config.ts	chore: replace tslint with eslint and fix linting issues	2 years ago
database_utility.ts	fix: a whole bunch of circular depdencies	9 months ago
encrypt_attachment_buffer.ts	chore: replace tslint with eslint and fix linting issues	2 years ago
getRootPath.ts	fixup build appImage sqlite3 module not found	3 years ago
global_errors.ts	fix: add LocalizerKeys type to getMessage and remove updateLocale function	1 year ago
latest_desktop_release.ts	refactor main_node.js to TS	3 years ago
locale.ts	feat: create strict typing for localization	1 year ago
logging.ts	chore: rename fetch functions	12 months ago
logs.ts	move worker_interface and logs and i18n to TS	3 years ago
menu.ts	Merge branch 'unstable' into standardised_strings_merge	8 months ago
permissions.ts	chore: replace tslint with eslint and fix linting issues	2 years ago
protocol_filter.ts	chore: replace tslint with eslint and fix linting issues	2 years ago
sodiumNode.ts	fix libsodium call from webworker	3 years ago
spell_check.ts	feat: replace and add changed and new localized strings	1 year ago
sql.ts	Merge branch 'unstable' into standardised_strings_merge	8 months ago
sqlInstance.ts	chore: update node version, electron and deps	2 years ago
sql_channel.ts	fix: make sure we only try to delete data once	1 year ago
storage_item.ts	chore: add a redux settings slice, currently outdated banner inc	2 years ago
tray_icon.ts	Merge branch 'unstable' into standardised_strings_merge	8 months ago
window_state.ts	refactor main_node.js to TS	3 years ago