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
							
						 | 
						
							
							
							
							
								
							
								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 | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								176b7c9c72
								
									
								
							
								
							
						 | 
						
							
							
								
								Build instructions
							
							
							
							
							
							
							
							Reference them to the proper place 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f1dbafc7ef
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #85 from BeaudanBrown/development
							
							
							
							
							
							
							
							Allow spaces in password 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								415d0858e8
								
							
								
							
						 | 
						
							
							
								
								Allow spaces in password
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a1255dd31e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #77 from Mikunj/password-protection
							
							
							
							
							
							
							
							Password protection 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								cd54661378
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #84 from sachaaaaa/fix_loki_test
							
							
							
							
							
							
							
							fix loki test 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								8b32583b79
								
							
								
							
						 | 
						
							
							
								
								fix loki test
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								18cbd99df8
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #83 from Mikunj/signal/1.18.1
							
							
							
							
							
							
							
							Merge signal 1.18.1 changes 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								e1aba93aea
								
							
								
							
						 | 
						
							
							
								
								Merge signal 1.18.1 changes.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								bcc81e41e4
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #81 from Mikunj/ui/unread-icon
							
							
							
							
							
							
							
							Added unread indicator in conversation section. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1303603db9
								
									
								
							
								
							
						 | 
						
							
							
								
								Apply suggestions from code review
							
							
							
							
							
							
							
							Co-Authored-By: Mikunj <Mikunj@users.noreply.github.com> 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4a2c618803
								
									
								
							
								
							
						 | 
						
							
							
								
								Update js/views/inbox_view.js
							
							
							
							
							
							
							
							Co-Authored-By: Mikunj <Mikunj@users.noreply.github.com> 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f77da7c218
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #78 from BeaudanBrown/loki-tests
							
							
							
							
							
							
							
							Loki tests 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								f6ab6495ae
								
							
								
							
						 | 
						
							
							
								
								Updated the nonce trials variables to be constants for production and development
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								a0584a68c9
								
							
								
							
						 | 
						
							
							
								
								Review suggested test case
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								5084d8cfec
								
							
								
							
						 | 
						
							
							
								
								Update libloki/test/libloki-protocol_test.js
							
							
							
							
							
							
							
							Co-Authored-By: BeaudanBrown <beau@loki.network> 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								1bc1213705
								
							
								
							
						 | 
						
							
							
								
								Update libloki/test/libloki-protocol_test.js
							
							
							
							
							
							
							
							Co-Authored-By: BeaudanBrown <beau@loki.network> 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								7782c58d14
								
							
								
							
						 | 
						
							
							
								
								Slight refactor of PoW file to make easier to test plus some tests for the PoW functionality
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								11883cb989
								
							
								
							
						 | 
						
							
							
								
								Cleaner separation of loki tests
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								be878f00a4
								
							
								
							
						 | 
						
							
							
								
								Updated names of some test functions. Added yarn commands to view output of different tests. Added a test and updated existing test to use more efficient asserts
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								a676459229
								
							
								
							
						 | 
						
							
							
								
								Added test for returning the correct prekeybundle after creating a contact, updated the in memory store to reflect how sasha updated the actual store a while ago
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								c93aff7ebe
								
							
								
							
						 | 
						
							
							
								
								Setup grunt/yarn etc for loki tests plus wrote first 2 simple libloki-protocol tests
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								94d3ae7b5d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #82 from Mikunj/fix/friend-status
							
							
							
							
							
							
							
							Bug fixes 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								2715e79268
								
							
								
							
						 | 
						
							
							
								
								Fix conversation status not being reset upon conversation messages deletion.
							
							
							
							
							
							
							
							Fix incoming friend request not replacing old friend requests.
Fixed incorrect function name. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								0cfabb5ffa
								
							
								
							
						 | 
						
							
							
								
								Added unread indicator in conversations sections.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								7d0d244e7c
								
							
								
							
						 | 
						
							
							
								
								Added localised error messages.
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								9e995bde6c
								
							
								
							
						 | 
						
							
							
								
								Review fixes.
							
							
							
							
							
							
							
							Updated tests. 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
								
								
							
							
								
							
								0dc55e11aa
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #79 from sachaaaaa/fix_production_build
							
							
							
							
							
							
							
							Fixes to get production build working 
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								sachaaaaa
							
						 | 
						
							
							
							
							
								
							
								d8f4d1f313
								
							
								
							
						 | 
						
							
							
								
								Fixes to get production build working
							
							
							
							
							
						 | 
						
							7 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								0b87f13699
								
							
								
							
						 | 
						
							
							
								
								Added password dialog view.
							
							
							
							
							
						 | 
						
							7 years ago |