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  
				
					
						
							
							
								 
						
							
							
								7f2660e615 
								
							
								 
							
						 
						
							
							
								
								fix: return to qr view on profile modal when exiting the lightbox  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								64d5ccd869 
								
							
								 
							
						 
						
							
							
								
								fix: review feedback  
							
							... 
							
							
							
							unneeded promise object returned 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								9a4356a6b7 
								
							
								 
							
						 
						
							
							
								
								fix: review feedback - lightbox defaults  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								490e4957f4 
								
							
								 
							
						 
						
							
							
								
								feat: click on qr codes now opens the lightbox  
							
							... 
							
							
							
							lightbox now supports saving data blobs 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								009795eb3b 
								
							
								 
							
						 
						
							
							
								
								feat: migrated lightbox to modal state  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								bbd3770937 
								
							
								 
							
						 
						
							
							
								
								feat: remove strings no longer supported by the localization project  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								b81d5a3d7a 
								
							
								 
							
						 
						
							
							
								
								refactor: clean up remaining global React import calls  
							
							... 
							
							
							
							import specific types from react package 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								a098638bc0 
								
							
								 
							
						 
						
							
							
								
								refactor: remove unnecessary react imports  
							
							... 
							
							
							
							you don't need it from react 17 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								8ec6fb9fd7 
								
							
								 
							
						 
						
							
							
								
								feat: added new save icon  
							
							... 
							
							
							
							updated DataExtractNotification and Lightbox download icons 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								5285d4240a 
								
							
								 
							
						 
						
							
							
								
								fix: resolved missing selected conversation hooks imports  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								41af1e7865 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'unstable' into userconfig_disappearingmessage  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d43d6abbae 
								
							
								 
							
						 
						
							
							
								
								chore: replace tslint with eslint and fix linting issues  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								1d9279c79c 
								
							
								 
							
						 
						
							
							
								
								chore: merge conversation selectors into a single file  
							
							... 
							
							
							
							as the circular dependency was causing a createSelector called with
undefined issue on startup without user loggedin 
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								0e286142f1 
								
							
								 
							
						 
						
							
							
								
								chore: add a redux settings slice, currently outdated banner inc  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								0050352470 
								
							
								 
							
						 
						
							
							
								
								chore: move selected convo selectors to another file  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								c4e17d0825 
								
							
								 
							
						 
						
							
							
								
								fix: add mgmt of members in user groups wrapper  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								de7d0f2bdb 
								
							
								 
							
						 
						
							
							
								
								feat: themed lightbox  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								b3885bf9d9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into theming  
							
							... 
							
							
							
							Link previews are broken for now 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								27e19f3afa 
								
							
								 
							
						 
						
							
							
								
								feat: updated SessionIconButton to support themes  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								db951a4128 
								
							
								 
							
						 
						
							
							
								
								refactor: finished converting sass colors in _session_slider.scss  
							
							... 
							
							
							
							consolidated transparent and gray colors, success color should be dropped to text color in future 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								242d51ca8d 
								
									
								
							
								 
							
						 
						
							
							
								
								Id blinding + onionv4 + new endpoints for sogs and fileserver ( #2347 )  
							
							... 
							
							
							
							* Added Onionv4 support to file server, sogs and pn server
* Added blinded message support
* Updated endpoints for sogs and file server to remove legacy ones 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								247cb7c065 
								
							
								 
							
						 
						
							
							
								
								cleanup dependencies  
							
							
							
						 
						
							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