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  
				
					
						
							
							
								 
						
							
							
								df515cacb6 
								
							
								 
							
						 
						
							
							
								
								feat: improved zoom slider behaviour and styling  
							
							... 
							
							
							
							updated rc-slider, fixes issue where zoom happens before you release the mouse 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								5f53b3fe8f 
								
							
								 
							
						 
						
							
							
								
								feat: replace and add changed and new localized strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a098638bc0 
								
							
								 
							
						 
						
							
							
								
								refactor: remove unnecessary react imports  
							
							... 
							
							
							
							you don't need it from react 17 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								ab946e69b1 
								
							
								 
							
						 
						
							
							
								
								fix: finish updating dependencies  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d43d6abbae 
								
							
								 
							
						 
						
							
							
								
								chore: replace tslint with eslint and fix linting issues  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								13bf0e073d 
								
							
								 
							
						 
						
							
							
								
								feat: update design of the Notification Settings screen  
							
							... 
							
							
							
							the preview button is not linked yet 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								ebf3198818 
								
							
								 
							
						 
						
							
							
								
								Remove dash typo for zoom settings.  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								28c7445dce 
								
									
								
							
								 
							
						 
						
							
							
								
								refactor most of the components to outside of their Session folder ( #2072 )  
							
							... 
							
							
							
							* refactor most of the components to outside of their Session folder
* finish moving overlay and memberListItem to react hook
* fix bug with kicked member len >2 not being displayed
also sort admins first in UpdateGroupMembers dialog
* fix admin leaving text of groupNotification
* add a useFocusMount hook to focus input fields on mount
* make click avatar convo item open only user dialog
* cleanup config default.json
* make sure to use convoController to build sync message
* disable showing pubkey on opengroups
* add a pause on audio playback
Fixes  #2079  
							
						 
						
							4 years ago