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 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Ryan Miller
							
						 | 
						
							
							
							
							
								
							
								e2952322ba
								
							
								
							
						 | 
						
							
							
								
								feat: add custom tags for i18n
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Ryan Miller
							
						 | 
						
							
							
							
							
								
							
								79f3f35977
								
							
								
							
						 | 
						
							
							
								
								feat: update strings usages and library
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yougotwill
							
						 | 
						
							
							
							
							
								
							
								2ebfb15068
								
							
								
							
						 | 
						
							
							
								
								feat: updated turkish translations
							
							
							
							
							
							
							
							See https://github.com/oxen-io/session-desktop/pull/3122 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								55f5cf5c9b
								
							
								
							
						 | 
						
							
							
								
								feat: added quit modal
							
							
							
							
							
							
							
							when going back during critical onboarding steps it's better to restart the app entirely 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								59e6074429
								
							
								
							
						 | 
						
							
							
								
								fix: since the pass hash is in the items table we can call it from storage
							
							
							
							
							
							
							
							added storage function getPasswordHash and use everywhere, warn user to restart the app 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								0a56653f19
								
							
								
							
						 | 
						
							
							
								
								feat: sorted messages.json keys
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								cc92d172f7
								
							
								
							
						 | 
						
							
							
								
								feat: update invite a friend iniital string
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								a159616514
								
							
								
							
						 | 
						
							
							
								
								feat: added filters to convo and contact query
							
							
							
							
							
							
							
							search screen only shows contacts and not convos 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								9bf7126f02
								
							
								
							
						 | 
						
							
							
								
								fix: replace setAccountPasswordTitle with lockApp string
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								452b1b8539
								
							
								
							
						 | 
						
							
							
								
								fix: use localised strings for qr password toggle button
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								51a0fa3b1e
								
							
								
							
						 | 
						
							
							
								
								fix: removed SeedModal code
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								fb3a87a5f5
								
							
								
							
						 | 
						
							
							
								
								feat: added new hide recovery password modal
							
							
							
							
							
							
							
							when we turn on the setting we prevent any recovery phrase ui from loading and return null 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								862b8343e7
								
							
								
							
						 | 
						
							
							
								
								feat: added hide password permenantly ui
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								2738510cf1
								
							
								
							
						 | 
						
							
							
								
								fix: updated messageRequestPendingDescription copy with full stop
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								d346f28942
								
							
								
							
						 | 
						
							
							
								
								feat: extracted password to new modal
							
							
							
							
							
							
							
							added shiny hook to password protect anywhere 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								b6d5c24af4
								
							
								
							
						 | 
						
							
							
								
								feat: added updated group icon
							
							
							
							
							
							
							
							add the ability to set custom icon sizes for some buttons 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								d6ad37ec38
								
							
								
							
						 | 
						
							
							
								
								feat: show description text when making a message request
							
							
							
							
							
							
							
							disabled conversation header functionality 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								aac90ccd96
								
							
								
							
						 | 
						
							
							
								
								feat: finished invite a friend overlay
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								dd7f13ed1f
								
							
								
							
						 | 
						
							
							
								
								feat: invite a friend screen is mostly done
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								551ee4221b
								
							
								
							
						 | 
						
							
							
								
								fix: cleaned up unused localised strings
							
							
							
							
							
							
							
							since we swapped some toast messages for input messages 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								093da15ba3
								
							
								
							
						 | 
						
							
							
								
								feat: updated style for choose action overlay
							
							
							
							
							
							
							
							created new ActionRow component 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								edb9a24863
								
							
								
							
						 | 
						
							
							
								
								feat: new message description and added zendesk link
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								20766c4aba
								
							
								
							
						 | 
						
							
							
								
								feat: added conversation id to debugmessageinfo
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								2f2c214cf5
								
							
								
							
						 | 
						
							
							
								
								feat: added some localised strings the create convo screens
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								64bd7b8e5e
								
							
								
							
						 | 
						
							
							
								
								fix: restore copyOpenGroupURL key
							
							
							
							
							
							
							
							it is still used 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								30118c3426
								
							
								
							
						 | 
						
							
							
								
								feat: added monospace textarea support to sessioninput
							
							
							
							
							
							
							
							this will replace the sessionideditable eventually still needs error handling etc 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								e96519445d
								
							
								
							
						 | 
						
							
							
								
								feat: removed overlayheader
							
							
							
							
							
							
							
							moved some parts into the leftpanesectionheader 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								b5781b0f12
								
							
								
							
						 | 
						
							
							
								
								feat: replace invalidAccountId with accountIdErrorInvalid
							
							
							
							
							
							
							
							as based in google docs flagged sheet 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								db42811033
								
							
								
							
						 | 
						
							
							
								
								feat: password to lock app
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								825c617794
								
							
								
							
						 | 
						
							
							
								
								feat: continue your session and link device to I have an account
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								68f8d12aa5
								
							
								
							
						 | 
						
							
							
								
								feat: recovery phrase to recovery password
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								9a756a8c9b
								
							
								
							
						 | 
						
							
							
								
								feat: session id to account id
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								57e002fcc9
								
							
								
							
						 | 
						
							
							
								
								feat: sort messages json keys to make merging with strings project easier in future
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								b87c265404
								
							
								
							
						 | 
						
							
							
								
								feat: fixed alignment of loading screen and updated enter new display name copy
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								7cabdba00e
								
							
								
							
						 | 
						
							
							
								
								feat: added error messages to recovery password input
							
							
							
							
							
							
							
							fixed remaining styling, improved errors for mnemonic code 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								ef0f3ba434
								
							
								
							
						 | 
						
							
							
								
								feat: updated restore account screen with new design
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								4b976259bf
								
							
								
							
						 | 
						
							
							
								
								feat: updated recovery password bannner
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								ed92122c3d
								
							
								
							
						 | 
						
							
							
								
								feat: finished styling success screen
							
							
							
							
							
							
							
							need to test logic a bit more to make sure that I am happy 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								547ab9b1b2
								
							
								
							
						 | 
						
							
							
								
								feat: start working on account create success screen
							
							
							
							
							
							
							
							on conversations view 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								8aac036bca
								
							
								
							
						 | 
						
							
							
								
								feat: updated display name
							
							
							
							
							
							
							
							show error when display name is too long 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								4e2101a9e5
								
							
								
							
						 | 
						
							
							
								
								feat: setup UI and state for account create display name step
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								f6a6b11f7b
								
							
								
							
						 | 
						
							
							
								
								feat: updated onboarding header
							
							
							
							
							
							
							
							added external link buttons, removed accentText and added new svgs 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								9be21ce879
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'unstable' into feat/ses-897/steps-create-account
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								b10873c64a
								
							
								
							
						 | 
						
							
							
								
								feat: updated tos and privacy policy on registration link
							
							
							
							
							
							
							
							intial run at legal links modal 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Miller
							
						 | 
						
							
							
							
							
								
							
								45eae6e956
								
							
								
							
						 | 
						
							
							
								
								fix: add withAcceleratorPrefix function to remove accelerator prefixes from locale strings
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								86d9150b45
								
							
								
							
						 | 
						
							
							
								
								fix: text in msg ctx menu disappearing timer
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								75d51d09e2
								
							
								
							
						 | 
						
							
							
								
								feat: added SessionProgressBar
							
							
							
							
							
							
							
							added copy for onboarding account loading 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								33ddf51ba6
								
							
								
							
						 | 
						
							
							
								
								fix: add some debugging messageinfo (not released)
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								571d593c38
								
							
								
							
						 | 
						
							
							
								
								fix: fix small ui issues after merge of multiple PRs
							
							
							
							
							
						 | 
						
							2 years ago |