Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f9ce6fd840
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'integration-test-logs-rebased' of github.com:Bilb/loki-messenger into integration-test-logs-rebased
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								52d5ce83ed
								
									
								
							
								
							
						 | 
						
							
							
								
								fix sending sync message need to morph set to array
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								ecf83dc4a3
								
							
								
							
						 | 
						
							
							
								
								Fix minor styling in settings
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								47c3bf1449
								
									
								
							
								
							
						 | 
						
							
							
								
								fix makeOnionRequest out of bound index
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								014b475af7
								
									
								
							
								
							
						 | 
						
							
							
								
								lint
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1b39992e4a
								
									
								
							
								
							
						 | 
						
							
							
								
								enable senderKey during integration test
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								21702d117a
								
									
								
							
								
							
						 | 
						
							
							
								
								exclude our local device from synced contact
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								70990a60ba
								
									
								
							
								
							
						 | 
						
							
							
								
								fix open groups and link device test
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								73e15250d7
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into integration-test-logs-rebased
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								d48063dc82
								
									
								
							
								
							
						 | 
						
							
							
								
								lint
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a656e3ba3f
								
									
								
							
								
							
						 | 
						
							
							
								
								add env variable to enable message_logs
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9b9cf87072
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1155 from Mikunj/increase-hops
							
							
							
							
							
							
							
							Increase onion request hops to 3 
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								182635e267
								
									
								
							
								
							
						 | 
						
							
							
								
								trigger sync with primary when we are friend with their secondary
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								4985fbae65
								
							
								
							
						 | 
						
							
							
								
								Increase onion request hops to 3
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a8a4c4995a
								
									
								
							
								
							
						 | 
						
							
							
								
								handle double AFR in conversation onAccept
							
							
							
							
							
						 | 
						
							5 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2d26479177
								
									
								
							
								
							
						 | 
						
							
							
								
								lint
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e9e5a1508d
								
									
								
							
								
							
						 | 
						
							
							
								
								exclude secondary FR from FR results
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3c9bf34648
								
									
								
							
								
							
						 | 
						
							
							
								
								use conversation and conversationOrigin instead sendingConversation in message.js
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								93581874b8
								
									
								
							
								
							
						 | 
						
							
							
								
								trigger afr to all users devices if needed on contactSync\
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8c3e601198
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1144 from loki-project/neuroscr-pubkeys-dont-matter
							
							
							
							
							
							
							
							Pubkeys don't matter if proxy/onion are off 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								b749afb761
								
							
								
							
						 | 
						
							
							
								
								Pubkeys don't matter if proxy/onion are off
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a857406728
								
									
								
							
								
							
						 | 
						
							
							
								
								rename respondToAll.. FR to updateAll...Messages at is does not send any messages
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
								
								
							
							
								
							
								46275995e0
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1134 from msgmaxim/group_tests
							
							
							
							
							
							
							
							Medium groups: Part 2 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								2fdca61257
								
							
								
							
						 | 
						
							
							
								
								Lint
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								13c41f83fe
								
							
								
							
						 | 
						
							
							
								
								Address more review comments
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								ab2aa7669f
								
							
								
							
						 | 
						
							
							
								
								Add sender key feature flag
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								ec3c03dbd4
								
							
								
							
						 | 
						
							
							
								
								Address review comments
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								abde96bc1e
								
							
								
							
						 | 
						
							
							
								
								Fix medium group updates
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								fcadcd780e
								
							
								
							
						 | 
						
							
							
								
								More integration tests for medium groups
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								2a0130ff04
								
							
								
							
						 | 
						
							
							
								
								Multidevice support for medium groups
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								3561ac49c0
								
							
								
							
						 | 
						
							
							
								
								UI and some integrations tests for sender keys
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								3a1f071177
								
							
								
							
						 | 
						
							
							
								
								Medium group messages show correct sender
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								8512c2307b
								
							
								
							
						 | 
						
							
							
								
								Linting
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								df44e5afca
								
							
								
							
						 | 
						
							
							
								
								Fix FR logic
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								53f26d588a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1122 from vincentbavitz/contacts-sorting
							
							
							
							
							
							
							
							Reorganise Contacts Panel 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								de2654b914
								
							
								
							
						 | 
						
							
							
								
								rm multi1 from scripts
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								fe7b22dbc3
								
							
								
							
						 | 
						
							
							
								
								Groups not friends
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c0677d3a2d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1109 from vincentbavitz/linked-devs-fixes
							
							
							
							
							
							
							
							Mark Failed Message Send to Slave as Error & Retry 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								50d111f538
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into linked-devs-fixes
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								23c57a8a11
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1091 from vincentbavitz/lns-map
							
							
							
							
							
							
							
							LNS Mapping Rewrite 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								07e7afeb31
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into lns-map
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								13f2890a38
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1138 from vincentbavitz/fr-fixes
							
							
							
							
							
							
							
							[WIP] Multidevice FR Fixes 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								adb96fe4ce
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into fr-fixes
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e70c9062f5
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1142 from Mikunj/height-fix
							
							
							
							
							
							
							
							Update minimum height to 600px 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2cd07285d9
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into integration-test-logs-rebased
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								13a783bd4a
								
									
								
							
								
							
						 | 
						
							
							
								
								fix multi device fr
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								deddc01495
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into height-fix
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								129cb4454a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1146 from loki-project/neuroscr-load-expire-after
							
							
							
							
							
							
							
							tests: move expires after libtextsecure 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2e2c08461a
								
									
								
							
								
							
						 | 
						
							
							
								
								move expires after libtextsecure
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								03757ba2ca
								
									
								
							
								
							
						 | 
						
							
							
								
								lint
							
							
							
							
							
						 | 
						
							6 years ago |