Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								a7324a8d84 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/unstable' into standardised_strings  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								e6cf7ba488 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'unstable' into fix/logs-from-ui-empty  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								01948b9088 
								
							
								 
							
						 
						
							
							
								
								feat: remove the debug window since log files are too large to render effectively  
							
							 
							
							... 
							
							
							
							lets just save to the users computer so that they can view it themselves 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								af28c97cfd 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/unstable' into standardised_strings  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								ffa276c23f 
								
							
								 
							
						 
						
							
							
								
								fix: update comment  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								c378aba960 
								
							
								 
							
						 
						
							
							
								
								fix: run setupTheme after Storage is ready  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								3ad305f451 
								
							
								 
							
						 
						
							
							
								
								feat: added copy button to debug window  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								d152ce946b 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/unstable' into standardised_strings  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								e60d8c36a0 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'unstable' into fix/ses-2426/block_contacts_height  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								935175120a 
								
							
								 
							
						 
						
							
							
								
								fix: make sure when using pxValueToNumber we pass valid numbers  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								yougotwill
							
						 
						
							 
							
							
							
								
							
								d210b5c354 
								
							
								 
							
						 
						
							
							
								
								fix: adjust contacts list to match design  
							
							 
							
							... 
							
							
							
							no borders and smaller breaks 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								4b0b813362 
								
							
								 
							
						 
						
							
							
								
								fix: blocked list overflow by setting parent width correctly  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								Ryan Miller
							
						 
						
							 
							
							
							
								
							
								79f3f35977 
								
							
								 
							
						 
						
							
							
								
								feat: update strings usages and library  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								5e3742e281 
								
							
								 
							
						 
						
							
							
								
								fix: resolve colors in convertIconToImageURL for qr code  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								64d4712902 
								
							
								 
							
						 
						
							
							
								
								feat: updated shield icon and default colors  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								4f44a7a5fa 
								
							
								 
							
						 
						
							
							
								
								feat: refactor theme state  
							
							 
							
							... 
							
							
							
							added hooks for is light or dark theme and cleaned up any references 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								69f4fd2892 
								
							
								 
							
						 
						
							
							
								
								feat: added heading component  
							
							 
							
							... 
							
							
							
							improved join community suggested rooms stylings 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								6039d9f526 
								
							
								 
							
						 
						
							
							
								
								feat: fixed update group name error and session recording light animations  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								681f488874 
								
							
								 
							
						 
						
							
							
								
								feat: added --font-size-xl  
							
							 
							
							
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								bc5615e880 
								
							
								 
							
						 
						
							
							
								
								feat: test for correct background color order is done  
							
							 
							
							... 
							
							
							
							use libsodium for hash so we can unit test, remove crypto stub 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								9dce5c1fd9 
								
							
								 
							
						 
						
							
							
								
								fix: repair global styling after styled upgrade improved match system setting  
							
							 
							
							... 
							
							
							
							set each value on root instead of declaring one global css string. Use setThemeValues in all cases 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								dfd4631f40 
								
							
								 
							
						 
						
							
							
								
								feat: updated styled components and typings  
							
							 
							
							... 
							
							
							
							cleaned up some extra SessionTheme declarations 
							
						 
						
							1 year ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								0d3c058137 
								
							
								 
							
						 
						
							
							
								
								feat: new sessionqrcode component  
							
							 
							
							... 
							
							
							
							updated account id and recovery password qr codes with logos 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								2e664bfa09 
								
							
								 
							
						 
						
							
							
								
								fix: right panel transition is now smoother  
							
							 
							
							... 
							
							
							
							transition duration is now set via a function for integration testing  purposes 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								208d9cc0eb 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'unstable' into feat/ses-50/onboarding  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								5cda16d845 
								
							
								 
							
						 
						
							
							
								
								fix: renamed button modal-confirm to ghost  
							
							 
							
							... 
							
							
							
							moved SessionButton defaults into component 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								b887850388 
								
							
								 
							
						 
						
							
							
								
								chore: disable animations when running in integrationTests  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								85c247eaf0 
								
							
								 
							
						 
						
							
							
								
								fix: focustrap when no buttons are mounted right away  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Miller
							
						 
						
							 
							
							
							
								
							
								5f53b3fe8f 
								
							
								 
							
						 
						
							
							
								
								feat: replace and add changed and new localized strings  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								57ed811d65 
								
							
								 
							
						 
						
							
							
								
								fix: classic light button should go to black on hover  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								b0e3b0bd67 
								
							
								 
							
						 
						
							
							
								
								feat: styled start conversation button  
							
							 
							
							
							
						 
						
							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
							
						 
						
							 
							
							
							
								
							
								131c114b24 
								
							
								 
							
						 
						
							
							
								
								feat: improved TermsOfServicePrivacyDialog styling  
							
							 
							
							... 
							
							
							
							added new modal confirm buttons, only tested in classic dark for onboarding 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								4de779f947 
								
							
								 
							
						 
						
							
							
								
								fix: change frame duration to string  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								4e7b2ccf95 
								
							
								 
							
						 
						
							
							
								
								feat: fade in error colors  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								a098638bc0 
								
							
								 
							
						 
						
							
							
								
								refactor: remove unnecessary react imports  
							
							 
							
							... 
							
							
							
							you don't need it from react 17 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								ab62285989 
								
							
								 
							
						 
						
							
							
								
								fix: improved content alignment in message info  
							
							 
							
							... 
							
							
							
							increased attachment preview size to alignment with other content 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								aea4fd7ad9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'userconfig_disappearingmessage' into feature/ses-558/more-message-information  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								36c297f368 
								
							
								 
							
						 
						
							
							
								
								chore: wrap text of dialog desc when more than 90c long  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								a203ea79cd 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'oxen/unstable' into userconfig_disappearingmessage  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								4cbc452f26 
								
							
								 
							
						 
						
							
							
								
								fix: avatar style for incoming messages in groups  
							
							 
							
							... 
							
							
							
							had to refactor a fair bit, but well... 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Kee Jefferys
							
						 
						
							 
							
							
							
								
							
								7f30ed561b 
								
							
								 
							
						 
						
							
							
								
								fix: update usage of undefined  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Kee Jefferys
							
						 
						
							 
							
							
							
								
							
								358e95621d 
								
							
								 
							
						 
						
							
							
								
								fix: refactor and move various functions  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								f64f88c013 
								
							
								 
							
						 
						
							
							
								
								feat: new useDisappearingMessageSettingText hook  
							
							 
							
							... 
							
							
							
							fixed styling on panel components 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								Kee Jefferys
							
						 
						
							 
							
							
							
								
							
								2fe29ca30e 
								
							
								 
							
						 
						
							
							
								
								feat: implement setting to follow system theme  
							
							 
							
							... 
							
							
							
							feat: check theme congruence on startup and on native theme update
fix: make toggle and startup following work
fix: should return here, but this breaks things 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								3bf3bf73b1 
								
							
								 
							
						 
						
							
							
								
								feat: updated MessageContent with nested components  
							
							 
							
							
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								d7e296841e 
								
							
								 
							
						 
						
							
							
								
								fix: remove alignment from ExpirableReadableMessage  
							
							 
							
							... 
							
							
							
							improved alignment of timer by moving into the MessageContentWithStatus 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								de2a15a691 
								
							
								 
							
						 
						
							
							
								
								fix: dont load container if there are no reactions  
							
							 
							
							... 
							
							
							
							now message elements are the correct height from what we see visually 
							
						 
						
							2 years ago  
						
					 
				
					
						
							
							
								 
								William Grant
							
						 
						
							 
							
							
							
								
							
								43276b069e 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'unstable' into userconfig_disappearingmessage  
							
							 
							
							
							
						 
						
							2 years ago