Mikunj
							
						 | 
						
							
							
							
							
								
							
								0b63fbeae4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into clearnet
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6438698442
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1052 from loki-project/revert-1050-clearnet
							
							
							
							
							
							
							
							Revert "Clearnet --> Master for v1.0.6" 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								fead4fffef
								
									
								
							
								
							
						 | 
						
							
							
								
								Revert "Clearnet --> Master for v1.0.6"
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								24a3e05154
								
									
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "Clean up unused dependencies.""
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8216b7c079
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1051 from loki-project/revert-1033-package-cleanup
							
							
							
							
							
							
							
							Revert "Clean up unused dependencies." 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								cc89693bba
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1050 from loki-project/clearnet
							
							
							
							
							
							
							
							Clearnet --> Master for v1.0.6 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								973859647e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1049 from vincentbavitz/clearnet
							
							
							
							
							
							
							
							Upgrade to v1.0.6 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								82fdd6570d
								
							
								
							
						 | 
						
							
							
								
								update package.json to v1.0.6
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								476c53f96a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1048 from Bilb/test-fix-line-ending
							
							
							
							
							
							
							
							run lint ci task only on linux os 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5ff7476359
								
									
								
							
								
							
						 | 
						
							
							
								
								Revert "Clean up unused dependencies."
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6d591d956d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1033 from Mikunj/package-cleanup
							
							
							
							
							
							
							
							Clean up unused dependencies. 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								0c935b66f2
								
							
								
							
						 | 
						
							
							
								
								deleting messages init
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								83ac64a0e7
								
									
								
							
								
							
						 | 
						
							
							
								
								run lint ci task only on linux and macos
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c13b10ed64
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1047 from Bilb/test-fix-line-ending
							
							
							
							
							
							
							
							ignore .md file prettier 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								edb85e3426
								
									
								
							
								
							
						 | 
						
							
							
								
								ignore .md file prettier
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								36712e6ffc
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1046 from Bilb/test-fix-line-ending
							
							
							
							
							
							
							
							Test fix line ending 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								75511a7666
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into patchopensnapps
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								996d7c9844
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1044 from neuroscr/fix-int-tests
							
							
							
							
							
							
							
							Integration tests: Support slower computers/network 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								8dd94eb172
								
									
								
							
								
							
						 | 
						
							
							
								
								add back bug_report.md fixing lint
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7081c20e85
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1039 from Bilb/disable-disappearing-message-set-before-friend
							
							
							
							
							
							
							
							Disable disappearing message before friend request accepted 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								406f5deedd
								
									
								
							
								
							
						 | 
						
							
							
								
								remove bug_report.md to update line endings
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								796a37189a
								
									
								
							
								
							
						 | 
						
							
							
								
								Disable disappearing message before friend request accepted
							
							
							
							
							
							
							
							Hide nickname option fron menu in ConversationHeader for now 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9041c2ad06
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1036 from Bilb/fix-password-login-crash
							
							
							
							
							
							
							
							Close the password window once mainwindow is focused 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								90d2bbb338
								
							
								
							
						 | 
						
							
							
								
								refactor refreshRandomPool into small functions, exception clean up
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								0bffccb441
								
							
								
							
						 | 
						
							
							
								
								setValueWrapper refactor, add group prefix for easier grepping, DRY
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								3d93c05929
								
							
								
							
						 | 
						
							
							
								
								setValueWrapper refactor, fix process killing on macOs, remove unneeded resolves
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								f5f9614680
								
							
								
							
						 | 
						
							
							
								
								I looked up how to xpath byId, thought I'd include it
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								1e863e5a8a
								
							
								
							
						 | 
						
							
							
								
								bump int test timeout from 5s to 10s, add test-integration-parts which is more reliable
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2e3ebc0c8a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1043 from neuroscr/fix-int-tests
							
							
							
							
							
							
							
							make closed group create button clickable (via minimum height), onBlur calls onChange 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								0a2e2e50d5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into integration-test-vince
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								bbba903864
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into integration-test-vince
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
								
								
							
							
								
							
								804b4e54ac
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1041 from msgmaxim/lns
							
							
							
							
							
							
							
							API implementation for LNS 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								1556181906
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/loki-messenger into fix-int-tests
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								86ab440bb8
								
							
								
							
						 | 
						
							
							
								
								make minimum window height, so integration tests can clicked on closed group button
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9718c42c11
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1038 from Bilb/fix-integration-test
							
							
							
							
							
							
							
							fix integration tests 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								0a682db24a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' of https://github.com/loki-project/session-desktop into integration-test-vince
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								34a1fdbfec
								
							
								
							
						 | 
						
							
							
								
								add onBlur incase onChange doesn't fire
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								e78426de99
								
							
								
							
						 | 
						
							
							
								
								just in case onChange isnt triggered
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								932ea23ceb
								
							
								
							
						 | 
						
							
							
								
								API implementation for LNS
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								1279c22d6b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fix-integration-test' of https://github.com/Bilb/loki-messenger into clearnet
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								dd67a6b7d6
								
							
								
							
						 | 
						
							
							
								
								Fontsize adjust
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								acdb62f4f0
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1037 from neuroscr/patchopensnapps
							
							
							
							
							
							
							
							Fix tokens for File Server/Open Groups And other important snode comm fixes 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9dbfac3c55
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1035 from vincentbavitz/password-whitespace
							
							
							
							
							
							
							
							Password Whitespace Elimation 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								f76b12b814
								
							
								
							
						 | 
						
							
							
								
								Split typescript upgrade to new pr
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								5eec031803
								
							
								
							
						 | 
						
							
							
								
								Revert fancy code
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								c5ffcf1c3b
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into package-cleanup
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								32b9f2b5a9
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #1029 from Mikunj/theme-setting
							
							
							
							
							
							
							
							Fix theme setting not being sent back to main.js 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								915ea1e283
								
							
								
							
						 | 
						
							
							
								
								fix quotes
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4d29218997
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into fonts-open
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								9ade8cbb1e
								
							
								
							
						 | 
						
							
							
								
								using undefined instead of false
							
							
							
							
							
						 | 
						
							6 years ago |