b48bfef58d 
								
							
								 
							
						 
						
							
							
								
								fix: toast strings are stripped as we don't render html there  
							
							
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								39d8ad11e5 
								
							
								 
							
						 
						
							
							
								
								fix: a whole bunch of circular depdencies  
							
							... 
							
							
							
							for various convo duck, convo interactions, convo model and opengroup types 
							
						 
						
							1 year ago  
				
					
						
							
							
								 
						
							
							
								5f53b3fe8f 
								
							
								 
							
						 
						
							
							
								
								feat: replace and add changed and new localized strings  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								d43d6abbae 
								
							
								 
							
						 
						
							
							
								
								chore: replace tslint with eslint and fix linting issues  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3eb629e33e 
								
							
								 
							
						 
						
							
							
								
								fix: cleanup convo selectors to hope to improve performances  
							
							
							
						 
						
							2 years ago  
				
					
						
							
							
								 
						
							
							
								3ff7281b6a 
								
							
								 
							
						 
						
							
							
								
								chore: remove isGroup from the redux stored entry  
							
							... 
							
							
							
							as it is always = !isPrivate 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f3975b545a 
								
							
								 
							
						 
						
							
							
								
								feat: use priority for hidden and pinned conversation  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								1c50aacc34 
								
							
								 
							
						 
						
							
							
								
								chore: remove groupModerators sogs from the db, store in redux only  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								bf2456df8e 
								
							
								 
							
						 
						
							
							
								
								chore: do not store mentionedUs and unreadCount as attribute in convo  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								f5efb52fea 
								
							
								 
							
						 
						
							
							
								
								feat: remove closedgroupv3 uneeded stuff for now  
							
							... 
							
							
							
							also move the room stuff which can be kept in memory into another redux
slice 
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								3c58f9c1e4 
								
							
								 
							
						 
						
							
							
								
								feat: add a hidden flag for convos and use it with the contactswrapper  
							
							
							
						 
						
							3 years ago  
				
					
						
							
							
								 
						
							
							
								6f4b70e650 
								
							
								 
							
						 
						
							
							
								
								fix: allow non admin mods to delete message for deletion  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								e32f20d8bc 
								
							
								 
							
						 
						
							
							
								
								PR changes  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								b17312c13c 
								
									
								
							
								 
							
						 
						
							
							
								
								Cleanup redux store ( #1925 )  
							
							... 
							
							
							
							* do not consider expire timer update unread messages #1881 
* cleanup conversation props in redux to only have what cannot be derived
* fix app not starting without the await on convo creation
* cleanup props of message model 
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								9e37985d03 
								
							
								 
							
						 
						
							
							
								
								enable no-unused local and imports and fix tslint  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								4f5072ee65 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into perf-improv  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								adab2b4506 
								
							
								 
							
						 
						
							
							
								
								add Notifications in conversations context menu  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								5b0b165ba9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into perf-improv  
							
							
							
						 
						
							4 years ago  
				
					
						
							
							
								 
						
							
							
								c3bf2a4e96 
								
							
								 
							
						 
						
							
							
								
								fixes and tests  
							
							
							
						 
						
							4 years ago