|  Audric Ackermann | 144ae41529 | add type for ConversationController, remove showStartConversation and cleanup scss | 5 years ago | 
				
					
						|  Audric Ackermann | 1a379d2466 | add theme logic to switch between dark/light theme based on redux store | 5 years ago | 
				
					
						|  Audric Ackermann | 4d991d3992 | Merge branch 'clearnet' into react-refactor | 5 years ago | 
				
					
						|  Audric Ackermann | f57c85dc0d | hide pubkey when not needed on conversationHeader and listItem | 5 years ago | 
				
					
						|  Audric Ackermann | 66dcfdfe6e | show message when no blocked contact in settings | 5 years ago | 
				
					
						|  Audric Ackermann | 0e75510e5b | remove ttl unused settings and all translated key | 5 years ago | 
				
					
						|  Audric Ackermann | 094cd0ae47 | Merge pull request #1306 from Bilb/make-cheap-translations | 5 years ago | 
				
					
						|  Audric Ackermann | 0b6c915f8f | update translation to match android - part 2 | 5 years ago | 
				
					
						|  Konstantin Ullrich | 5b7c58c0d4 | Refresh after unblocking a SessionID without model | 5 years ago | 
				
					
						|  Audric Ackermann | 38c099cdf0 | rename seed to recovery phrase | 5 years ago | 
				
					
						|  Konstantin Ullrich | 2f35d9d2a6 | lint fix | 5 years ago | 
				
					
						|  Konstantin Ullrich | 86f8fe54ae | Check for model in blocked settings | 5 years ago | 
				
					
						|  Audric Ackermann | 4fbbbc26a4 | make blockled list number updates on unblock | 5 years ago | 
				
					
						|  Audric Ackermann | d108630f22 | add a toastUtils file and replace all pushToast calls in ts files | 5 years ago | 
				
					
						|  Audric Ackermann | 08433aa676 | Merge pull request #1297 from konstantinullrich/feature/blocked-list-in-settings | 5 years ago | 
				
					
						|  Audric Ackermann | c90e696da3 | fix types for $ conflicting between jQuery and webdriverIO | 5 years ago | 
				
					
						|  Konstantin Ullrich | 8bc7528e85 | Merge branch 'clearnet' into feature/blocked-list-in-settings | 5 years ago | 
				
					
						|  Audric Ackermann | 3945c6b208 | Merge remote-tracking branch 'upstream/clearnet' into react-refactor | 5 years ago | 
				
					
						|  Audric Ackermann | 58dd064e93 | Merge remote-tracking branch 'upstream/clearnet' into fix-integration-tests | 5 years ago | 
				
					
						|  Konstantin Ullrich | 380d533da8 | fix lint | 5 years ago | 
				
					
						|  Konstantin Ullrich | b430848c53 | Get only blocked SessionIDs even if conv is gone | 5 years ago | 
				
					
						|  Konstantin Ullrich | fde6723584 | Fix Lint problem | 5 years ago | 
				
					
						|  Audric Ackermann | 3e56eb6133 | add beta german translation copy pasted from android | 5 years ago | 
				
					
						|  Mikunj | b75b02c5a2 | Hide multi device UI if flag is not set | 5 years ago | 
				
					
						|  Audric Ackermann | 933eb73aa1 | Merge remote-tracking branch 'upstream/clearnet' into fix-integration-tests | 5 years ago | 
				
					
						|  Konstantin Ullrich | e800e5509b | Placeholder for no DisplayName-Contacts in blocked | 5 years ago | 
				
					
						|  Konstantin Ullrich | 7de0a0ae65 | Add Subscreen for blocked Users | 5 years ago | 
				
					
						|  Audric Ackermann | fec0ead1de | fix link device test and lint | 5 years ago | 
				
					
						|  Audric Ackermann | 592c31dfc0 | fix tslint issues with spectron includes | 5 years ago | 
				
					
						|  Audric Ackermann | a853d27b28 | disable multi device link and show warnings placeholder | 5 years ago | 
				
					
						|  Vincent | 54b7d9a21b | Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react | 5 years ago | 
				
					
						|  Vincent | 055856d9ac | note-for-reenabling-sessionsettings | 5 years ago | 
				
					
						|  Vincent | 95c5a881e1 | rebuild-ui | 5 years ago | 
				
					
						|  Vincent | 9d6a24d802 | rm-uipolishmergre | 5 years ago | 
				
					
						|  Vincent | 1a150f96c4 | merged w ts-constants | 5 years ago | 
				
					
						|  Vincent | c020eddef6 | constants-to-ts | 5 years ago | 
				
					
						|  Vincent | f8cd997b13 | constants-to-ts | 5 years ago | 
				
					
						|  Vincent | fd746a475a | ui polished and ttl constants | 5 years ago | 
				
					
						|  Vincent | 83528f4b8d | Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react | 5 years ago | 
				
					
						|  Mikunj | 2ed8aeaf30 | Lint | 5 years ago | 
				
					
						|  Mikunj | ae44f0da0f | Remove old multi device functions | 5 years ago | 
				
					
						|  Audric Ackermann | fa853538d0 | LINT after prettier upgrade | 6 years ago | 
				
					
						|  Audric Ackermann | cd143d8758 | remove useless code and make sha commit selectable | 6 years ago | 
				
					
						|  Vincent | f2ce52a3d5 | Timer notifications rework | 6 years ago | 
				
					
						|  Vincent | 6cda163b27 | upgrade typescript | 6 years ago | 
				
					
						|  Audric Ackermann | e48c7c2f3d | fix lint | 6 years ago | 
				
					
						|  Audric Ackermann | 8f01d1dbb7 | enable by default spell-check | 6 years ago | 
				
					
						|  Audric Ackermann | fa2a17c09b | adress review | 6 years ago | 
				
					
						|  Audric Ackermann | c81fca5d90 | disnle link option on secondary device | 6 years ago | 
				
					
						|  Vincent | d8a12aab0f | conv tinkering | 6 years ago |