Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7611f07b09
								
									
								
							
								
							
						 | 
						
							
							
								
								chore: address PR 184 reviews
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								Ryan Miller
							
						 | 
						
							
							
							
							
								
							
								79f3f35977
								
							
								
							
						 | 
						
							
							
								
								feat: update strings usages and library
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								64d4712902
								
							
								
							
						 | 
						
							
							
								
								feat: updated shield icon and default colors
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								dfd4631f40
								
							
								
							
						 | 
						
							
							
								
								feat: updated styled components and typings
							
							
							
							
							
							
							
							cleaned up some extra SessionTheme declarations 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								Ryan Miller
							
						 | 
						
							
							
							
							
								
							
								5f53b3fe8f
								
							
								
							
						 | 
						
							
							
								
								feat: replace and add changed and new localized strings
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								d43d6abbae
								
							
								
							
						 | 
						
							
							
								
								chore: replace tslint with eslint and fix linting issues
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								6d919c677d
								
							
								
							
						 | 
						
							
							
								
								fix: pr review - removed any typing from primaryColor logic
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								36d38bd2ed
								
							
								
							
						 | 
						
							
							
								
								fix: pass yarn ready
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								948a531eed
								
							
								
							
						 | 
						
							
							
								
								feat: more cleanup and added grey to COLORS
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								b777d0bcd1
								
							
								
							
						 | 
						
							
							
								
								feat: the primary color is now reset when changing themes
							
							
							
							
							
							
							
							refactored theme and primary color switching functions 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								William Grant
							
						 | 
						
							
							
							
							
								
							
								2f0e993af3
								
							
								
							
						 | 
						
							
							
								
								feat: moved constants into a constants folder
							
							
							
							
							
						 | 
						
							3 years ago |