Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f4af41e07f
								
									
								
							
								
							
						 | 
						
							
							
								
								remove wrapSend() and prepareForSend() from conversation
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								da4c9e47a1
								
							
								
							
						 | 
						
							
							
								
								Bump to version 2.0.0
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f2668571c2
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1252 from Bilb/drop-auto-fr-messages
							
							
							
							
							
							
							
							drop auto fr messages 'Please Accept... ' 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b04a64da8c
								
									
								
							
								
							
						 | 
						
							
							
								
								mark secondary devices as secondary from the right primary key
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5a3892c52b
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1255 from Mikunj/remove-rss-feed
							
							
							
							
							
							
							
							Remove RSS Feeds 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								9e14615cd2
								
							
								
							
						 | 
						
							
							
								
								Remove RSS Feeds
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6f812e8a71
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1254 from neuroscr/fileonion
							
							
							
							
							
							
							
							better detect when token is no longer valid (helps whitelist servers) 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								1cf90d9585
								
							
								
							
						 | 
						
							
							
								
								better detect when token is no longer valid (helps whitelist servers)
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								54b7d9a21b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into refactor-ts-react
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								9ec99da9f9
								
							
								
							
						 | 
						
							
							
								
								SessionRecording-cleanup
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9a5c73af3c
								
									
								
							
								
							
						 | 
						
							
							
								
								do not update loki display name is given string is '' onContactSync
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ba7241b2cb
								
									
								
							
								
							
						 | 
						
							
							
								
								contactSync: mark conversation as secondary when they are
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3775a9ef05
								
									
								
							
								
							
						 | 
						
							
							
								
								drop empty synced message (or autoFR)
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9df0a79fb9
								
									
								
							
								
							
						 | 
						
							
							
								
								remove blockedNumber.js
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e6e179b45b
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into drop-auto-fr-messages
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5ec3a5b3f7
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1253 from Bilb/fix-expire-timer
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								0c8e34a78e
								
									
								
							
								
							
						 | 
						
							
							
								
								remove envelope from cache if sentMessage is empty
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								17cae3937d
								
									
								
							
								
							
						 | 
						
							
							
								
								drop synced message with the autoFR content
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ac4a608b4b
								
									
								
							
								
							
						 | 
						
							
							
								
								send an expireTimer message when member added and expireTimer is set
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								598d6d1010
								
									
								
							
								
							
						 | 
						
							
							
								
								drop auto fr messages 'Please Accept... '
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b34470c215
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1250 from Bilb/sync-blocked-numbers
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c7b5fdf02d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1246 from Bilb/accept-group-ids-from-mobile
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								20a286d288
								
									
								
							
								
							
						 | 
						
							
							
								
								add comments about temporary fix with mobile group pubkeys regex
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a121dd6694
								
									
								
							
								
							
						 | 
						
							
							
								
								show block/unblock option for closed group on contextmenu
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								90f3dc3724
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1248 from Mikunj/fix-comment
							
							
							
							
							
							
							
							Fix up comments in proto file 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								fc5af07363
								
									
								
							
								
							
						 | 
						
							
							
								
								update UI when user blocks a group
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								fec8620ff9
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1240 from vincentbavitz/ui-polish
							
							
							
							
							
							
							
							UI Polish & TTL Update 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1b35f132e3
								
									
								
							
								
							
						 | 
						
							
							
								
								fix test
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								45cdbcbb2f
								
									
								
							
								
							
						 | 
						
							
							
								
								handle sync of blocked contact/groups as sync events
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								66697bc235
								
									
								
							
								
							
						 | 
						
							
							
								
								remove unused addBlockedGroup function since we moved to controller
							
							
							
							
							
							
							
							for blocked group 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8d544a9d87
								
									
								
							
								
							
						 | 
						
							
							
								
								make redux store update on block/unblock
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								055856d9ac
								
							
								
							
						 | 
						
							
							
								
								note-for-reenabling-sessionsettings
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								ea78445bb5
								
							
								
							
						 | 
						
							
							
								
								Fixup comments in proto file
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5d86fa569b
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1247 from vincentbavitz/rm-outgoing-message
							
							
							
							
							
							
							
							Rm outgoing_message Again 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								790a365ede
								
							
								
							
						 | 
						
							
							
								
								review-fixes
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								2d4e9455c2
								
							
								
							
						 | 
						
							
							
								
								asd
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								9bfccd408f
								
							
								
							
						 | 
						
							
							
								
								rm-outgoing-message
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								a67e67d13c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into ui-polish
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								95c5a881e1
								
							
								
							
						 | 
						
							
							
								
								rebuild-ui
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								edc34649a4
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1241 from Bilb/fix-our-profile-picture-change
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4e56ad2419
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1244 from Bilb/fix-sending-errors-handling
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1a27fc43f9
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1245 from Bilb/fix-timestam-unlink-message
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f491158b3f
								
									
								
							
								
							
						 | 
						
							
							
								
								add the group id from mobile as valid pubkey key
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								4b517ffd92
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into ui-polish
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2a3d0331f3
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1242 from vincentbavitz/ts-constants
							
							
							
							
							
							
							
							Partially Move Constants to TypeScript 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								7345e8d4ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ts-constants' into ui-polish
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								48e4862c8c
								
									
								
							
								
							
						 | 
						
							
							
								
								be sure ourConversation is set in retrySend()
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								9d6a24d802
								
							
								
							
						 | 
						
							
							
								
								rm-uipolishmergre
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								07096e5b09
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ts-constants' into ui-polish
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								d4a0e245ea
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'ts-constants' into ui-polish
							
							
							
							
							
						 | 
						
							5 years ago |