sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								1274beb510
								
							
								
							
						 | 
						
							
							
								
								Add consolidateLists function with unit tests
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e1fad6505e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #117 from Mikunj/QoL-fixes
							
							
							
							
							
							
							
							Minor fixes 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								cbb62f4a71
								
							
								
							
						 | 
						
							
							
								
								Added tsx files to grunt watch.
							
							
							
							
							
							
							
							Fixed minor bug in conversation view. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								81ce63c9a4
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #116 from Mikunj/fix/conversation-menu
							
							
							
							
							
							
							
							Fix menu items not triggering 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e6cdcc981c
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #115 from Mikunj/PoW-fixes
							
							
							
							
							
							
							
							Pow fixes 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								f3367465d8
								
							
								
							
						 | 
						
							
							
								
								Fix menu items not triggering after conversation is removed and then added.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								a0b814bf7c
								
							
								
							
						 | 
						
							
							
								
								limit max message length to 2000 characters.
							
							
							
							
							
							
							
							Set task time limit to 3 minutes. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								3690f4acda
								
							
								
							
						 | 
						
							
							
								
								Added timeout argument to WorkerInterface.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								6bcb259919
								
							
								
							
						 | 
						
							
							
								
								Added PoW error.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e50a199f83
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #114 from sachaaaaa/build_dir_win
							
							
							
							
							
							
							
							set build dir to /release on win to align with other platforms 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								6779bb492f
								
							
								
							
						 | 
						
							
							
								
								set build dir to /release on win to align with other platforms
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								41ec18923a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #110 from Mikunj/signal-v1.19
							
							
							
							
							
							
							
							Signal v1.19 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								27674513ba
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into signal-v1.19
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								032fecebe6
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #112 from Mikunj/copy-public-key
							
							
							
							
							
							
							
							Added option to copy conversation public key. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								a2f12ca18e
								
							
								
							
						 | 
						
							
							
								
								Added option to copy conversation public key.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								654b0dac84
								
							
								
							
						 | 
						
							
							
								
								Merge signal-master.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								d5101cdd83
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #107 from Mikunj/gitlab-fix
							
							
							
							
							
							
							
							Fix gitlab file. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								8688c5f442
								
							
								
							
						 | 
						
							
							
								
								Fix gitlab file.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								92876525cd
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #105 from sachaaaaa/gitlab_builds
							
							
							
							
							
							
							
							gitlab builds for osx and win 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								9ca8a43438
								
							
								
							
						 | 
						
							
							
								
								restore test on windows release binaries
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								c0a5f085ea
								
							
								
							
						 | 
						
							
							
								
								fix space in gruntfile.js
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								dd5c11768a
								
							
								
							
						 | 
						
							
							
								
								win & osx builds on gitlab
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								d52e2f5210
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #106 from loki-project/remove-pull-request-template
							
							
							
							
							
							
							
							Delete PULL_REQUEST_TEMPLATE.md 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								76cdf61ef9
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #104 from BeaudanBrown/pow-refactor
							
							
							
							
							
							
							
							Refactor PoW calculation to use webworkers
Fixes #100 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								716fa502b2
								
									
								
							
								
							
						 | 
						
							
							
								
								Delete PULL_REQUEST_TEMPLATE.md
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								42d3e481f0
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #103 from Mikunj/travis
							
							
							
							
							
							
							
							Added travis support for osx and windows 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								bb3ca610ff
								
							
								
							
						 | 
						
							
							
								
								Cleaned up utilWorker spawning
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								47081d4586
								
							
								
							
						 | 
						
							
							
								
								Added windows support.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								6113f13d3a
								
							
								
							
						 | 
						
							
							
								
								Rip the worker logic out of message_receiver and add the functionality for it to work with pow. Fix pow tests to work with those changes
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								37abdc6a4e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #102 from Mikunj/friend-request-retry
							
							
							
							
							
							
							
							Fixes #86 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								f86c96b068
								
							
								
							
						 | 
						
							
							
								
								Added support for osx.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								f98fe910d5
								
							
								
							
						 | 
						
							
							
								
								Fix friend request retry not working.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e62c528ed2
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #101 from Mikunj/linux-fixes
							
							
							
							
							
							
							
							Linux fixes 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								35c8f32461
								
							
								
							
						 | 
						
							
							
								
								Fixed app quitting after unlock on linux.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								a1275ab911
								
							
								
							
						 | 
						
							
							
								
								Fix css on linux.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b5589d4969
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #99 from Mikunj/travis-testing
							
							
							
							
							
							
							
							Run tests on travis on pull requests. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								6cee2522a9
								
							
								
							
						 | 
						
							
							
								
								Fix apt-get command.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								5aaf4818ad
								
							
								
							
						 | 
						
							
							
								
								Run tests on travis on pull requests.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								33e538dc80
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #97 from Mikunj/seed-viewing
							
							
							
							
							
							
							
							Allow viewing seed 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								67c7c7980a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #96 from loki-project/contributing-update
							
							
							
							
							
							
							
							Update CONTRIBUTING.md to reflect loki-messenger 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								f92cc6cbd4
								
							
								
							
						 | 
						
							
							
								
								Added menu option to view seed.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								0491ceacf1
								
							
								
							
						 | 
						
							
							
								
								Added seed dialog.
							
							
							
							
							
							
							
							Fixed issue where incorrect language was used to generate seed. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								18d6683f57
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #91 from Mikunj/minor-fixes
							
							
							
							
							
							
							
							Minor fixes for production builds. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								7e21deacc3
								
							
								
							
						 | 
						
							
							
								
								Undo css change as i'll fix that in another PR.
							
							
							
							
							
							
							
							Point production to a test server. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								3719a99554
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'development' into minor-fixes
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ebf9d28fba
								
									
								
							
								
							
						 | 
						
							
							
								
								Update CONTRIBUTING.md to reflect loki-messenger
							
							
							
							
							
							
							
							Should probably have done this a while ago lol 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e9ad614055
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #94 from sachaaaaa/remove_secretsessioncipher_test
							
							
							
							
							
							
							
							remove secretsessioncipher test 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								bce44c4ec2
								
							
								
							
						 | 
						
							
							
								
								remove secretsessioncipher test
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								17349943dc
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #88 from neuroscr/patch-1
							
							
							
							
							
							
							
							Build instructions 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								ba178b04b8
								
							
								
							
						 | 
						
							
							
								
								Minor fixes for production builds.
							
							
							
							
							
						 | 
						
							7 years ago |