b83ae11cb3 
								
							
								 
							
						 
						
							
							
								
								Single member groups: Make all group-related sends a noop  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c76d537482 
								
							
								 
							
						 
						
							
							
								
								Note to Self: On just expire timer update, set TIMER_UPDATE flag  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6656a89092 
								
							
								 
							
						 
						
							
							
								
								Cleaned up a lot of the logs, stop them from printing more than once etc  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0b0dfbce9d 
								
							
								 
							
						 
						
							
							
								
								Don't return error for groups with no members but yourself  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e4f18f9daa 
								
							
								 
							
						 
						
							
							
								
								libsignal-protocol: Protect against null thrown Errors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5a23dbb687 
								
							
								 
							
						 
						
							
							
								
								Review comments and add local server listener before starting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c20a31dd4 
								
							
								 
							
						 
						
							
							
								
								Review suggestions  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eaea7d9b7d 
								
							
								 
							
						 
						
							
							
								
								Catch errors when starting local server and retry every 30 seconds  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								403df0806b 
								
							
								 
							
						 
						
							
							
								
								Update the production json to just use the defaults in preparation for having other people try the messenger. Also cleaned up a little log that was incorrect  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3fb6ab295f 
								
							
								 
							
						 
						
							
							
								
								Debug log optimizations and improvements  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								77ae717b9b 
								
							
								 
							
						 
						
							
							
								
								Clean up shutdown handling - stop processing incoming messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								af40ceda6c 
								
							
								 
							
						 
						
							
							
								
								Note to Self timer fixes for bugs reported by beta users  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7c4ba5446c 
								
							
								 
							
						 
						
							
							
								
								Throw error if incoming attachment has mismatched attachment size  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dc67aaf9cc 
								
							
								 
							
						 
						
							
							
								
								Roll back change to ping more often again, ping our offline contacts every 2 mins to check if they have come back online  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								29bca71d5a 
								
							
								 
							
						 
						
							
							
								
								Try ping contacts that send us storage server messages in the last 2 mins  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d6a210efaa 
								
							
								 
							
						 
						
							
							
								
								Reworked the update p2p details to be more robust and stopped some redundant pings from happening  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b00a0cb699 
								
							
								 
							
						 
						
							
							
								
								Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2fd746821a 
								
							
								 
							
						 
						
							
							
								
								Added function for getting your loki IP and bind the local server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6febbf83da 
								
							
								 
							
						 
						
							
							
								
								reset line endings in libsignal-protocol  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2c3847affe 
								
							
								 
							
						 
						
							
							
								
								MessageReceiver: Don't wait for cache update to move forward  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								291e8d80cb 
								
							
								 
							
						 
						
							
							
								
								Fix asm.js errors in emscripten-generated functions  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5b54c9554e 
								
							
								 
							
						 
						
							
							
								
								Remove groups table, conversation is single source of truth  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b69eea543c 
								
							
								 
							
						 
						
							
							
								
								MessageReceiver: Don't wait for app logic to start next decrypt  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								041fe4be05 
								
							
								 
							
						 
						
							
							
								
								Remove JSON column and Backbone Model for unprocessed  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								021e807180 
								
							
								 
							
						 
						
							
							
								
								MessageReceiver: Log errors with proper message id  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								68fe552156 
								
							
								 
							
						 
						
							
							
								
								Merge commit '5c8558e293989094693f918a63b672301f1aeb55' into merge_1_21_1  
							
							... 
							
							
							
							* commit '5c8558e293989094693f918a63b672301f1aeb55':
  v1.21.1
  v1.21.1-beta.1
  Fix: Navigation to message via quote click didn't always work
  mainWindow.close - be ready for null mainWindow
  Ensure that Curve.async points to worker after startWorker call
  Protect against unhandled promises when calling checkForUpdates
  Reenable send when link preview is missing an image
# Conflicts:
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a810f4e4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #186  from Mikunj/local-preview  
							
							... 
							
							
							
							Added local link previews 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2ce86af093 
								
							
								 
							
						 
						
							
							
								
								Ensure that Curve.async points to worker after startWorker call  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fdc51e88dd 
								
							
								 
							
						 
						
							
							
								
								only verify the prekey id when there is no current session active  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a1e4b740f2 
								
							
								 
							
						 
						
							
							
								
								Fixed up settings view.  
							
							... 
							
							
							
							Fix review issues. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2755ff06d8 
								
							
								 
							
						 
						
							
							
								
								remove messages from cache before throwing if the prekey id could not be verified  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae695fe32f 
								
							
								 
							
						 
						
							
							
								
								Remove sending attachments.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3eb0646c0 
								
							
								 
							
						 
						
							
							
								
								Reenable send when link preview is missing an image  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7186f28019 
								
							
								 
							
						 
						
							
							
								
								Ensure a session is always initiated using the prekey assigned to the contact  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a0f67c22da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'textsecure/master' into merge_1_21_0  
							
							... 
							
							
							
							* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083 )
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0c104e5a53 
								
							
								 
							
						 
						
							
							
								
								Small fix for the disconnected banner coming up when it shouldn't, just default to thinking we are connected and mock the onEmpty event. Will only get set to not connected if requests fail  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cd79d5aca5 
								
							
								 
							
						 
						
							
							
								
								Fixed and simplified some logic for the handling of loki address messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b2e95932f1 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fac8e72861 
								
							
								 
							
						 
						
							
							
								
								Added queue manager to properly fix the race condition bug and reset the changes I made in other commit  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b2f456031f 
								
							
								 
							
						 
						
							
							
								
								Forgot to lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cc3f98b20a 
								
							
								 
							
						 
						
							
							
								
								Move the incoming hash filtering logic into sql.js to prevent data races  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a40a3d164f 
								
							
								 
							
						 
						
							
							
								
								Lots of logic for establishing a p2p connection, managing when the other user is online vs offline etc. Will always try to use P2P messaging when it can and fall back to storage server otherwise  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								efe95a70bc 
								
							
								 
							
						 
						
							
							
								
								Fix review issues.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3c07d99a89 
								
							
								 
							
						 
						
							
							
								
								Fix variable names.  
							
							... 
							
							
							
							Fix module export to be more consistent. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2bae6b5eed 
								
							
								 
							
						 
						
							
							
								
								Removed online broadcast message type, changed ttl logic a little, add p2p address and port to the window object when recieve message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								07076c27ae 
								
							
								 
							
						 
						
							
							
								
								Moved friend status to window, added start of p2p api stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b417edfc9b 
								
							
								 
							
						 
						
							
							
								
								Added new protos for online broadcast messages, added db hits for getting friends, local server now instantiated on the window, now sending online broadcast messages when the local server starts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8b5106433f 
								
							
								 
							
						 
						
							
							
								
								Update libtextsecure/errors.js  
							
							... 
							
							
							
							Co-Authored-By: BeaudanBrown <beau@loki.network> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c83661ce3f 
								
							
								 
							
						 
						
							
							
								
								Added DNS resolution error for when lokinet isn't working, now keeping track of the nodes that have been queried and not trying them again  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								561d60cfd5 
								
							
								 
							
						 
						
							
							
								
								Sending messages now in a while loop like retrieving messages, added a failureCount and only delete node urls if they fail 3 times  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								91ef39e482 
								
							
								 
							
						 
						
							
							
								
								Ensure that blocked messages are dropped even after sealed sender  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f968a5db3d 
								
							
								 
							
						 
						
							
							
								
								Ensure encrypting device name does not die on empty device name ( #3066 )  
							
							... 
							
							
							
							Ran into this on the Contributors guidelines setting up the development env.
registerSingleDevice does not pass a deviceName, so it fail every time. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dcfc97713b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #150  from sachaaaaa/display_nickname_on_friend_accept  
							
							... 
							
							
							
							Send profile along with friend request accept message 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fe63a9af8c 
								
							
								 
							
						 
						
							
							
								
								always remove message from cache and return early when message.body is null  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c853239a00 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #152  from sachaaaaa/fix_friendrequest_notification_when_sessionreset  
							
							... 
							
							
							
							Suppress friend request notification for session reset 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b226feaac7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #148  from Mikunj/signal-1.20  
							
							... 
							
							
							
							Signal 1.20 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								adfb4ab371 
								
							
								 
							
						 
						
							
							
								
								work with session reset  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b080828065 
								
							
								 
							
						 
						
							
							
								
								Fix bug where a friend request notification is shown when a session reset is received  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1238cbc4e6 
								
							
								 
							
						 
						
							
							
								
								Send profile along with friend request accept message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b71e8119e 
								
							
								 
							
						 
						
							
							
								
								Added error catching.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f21d1f65e6 
								
							
								 
							
						 
						
							
							
								
								Let OS select random open port.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c9b1a7a7a 
								
							
								 
							
						 
						
							
							
								
								Added loki server.  
							
							... 
							
							
							
							Added test. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e08a63d078 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7b1799c418 
								
							
								 
							
						 
						
							
							
								
								Big ol' hunk o' chunk. Now using random.snode to populate swarm lists, now making multiple requests from said lists and they are processed as they complete rather than waiting for all to resolve  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aab2a57b48 
								
							
								 
							
						 
						
							
							
								
								Some style and interaction fine-tuning  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								43e5d16020 
								
							
								 
							
						 
						
							
							
								
								Support for web socket communication with no signaling key  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								00755072ee 
								
							
								 
							
						 
						
							
							
								
								Include caption, width and height for outgoing attachments  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f1650443f 
								
							
								 
							
						 
						
							
							
								
								Set custom TTL in outgoing message.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								070d18b514 
								
							
								 
							
						 
						
							
							
								
								Updated function calls.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								985b1d6aa6 
								
							
								 
							
						 
						
							
							
								
								New staged attachments UI, multiple image attachments per message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								47f834cf5c 
								
							
								 
							
						 
						
							
							
								
								Encrypt device name on account create, on first launch if needed  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a0b814bf7c 
								
							
								 
							
						 
						
							
							
								
								limit max message length to 2000 characters.  
							
							... 
							
							
							
							Set task time limit to 3 minutes. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bcb259919 
								
							
								 
							
						 
						
							
							
								
								Added PoW error.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								0491ceacf1 
								
							
								 
							
						 
						
							
							
								
								Added seed dialog.  
							
							... 
							
							
							
							Fixed issue where incorrect language was used to generate seed. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3851bf351f 
								
							
								 
							
						 
						
							
							
								
								Throttle typing events, fix profile logging, fix group typing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7782c58d14 
								
							
								 
							
						 
						
							
							
								
								Slight refactor of PoW file to make easier to test plus some tests for the PoW functionality  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								c93aff7ebe 
								
							
								 
							
						 
						
							
							
								
								Setup grunt/yarn etc for loki tests plus wrote first 2 simple libloki-protocol tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								05c18d42db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #66  from sachaaaaa/session_reset  
							
							... 
							
							
							
							Handle session reset, Loki style 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1e3886cca8 
								
							
								 
							
						 
						
							
							
								
								More consistent naming of key storage functions, moved some loki messenger only functions into new file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								91f018da57 
								
							
								 
							
						 
						
							
							
								
								remove unused var  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f2e1b9b8de 
								
							
								 
							
						 
						
							
							
								
								more missing awaits  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								933d7730db 
								
							
								 
							
						 
						
							
							
								
								Remove superfluous commented out line  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								62c802445b 
								
							
								 
							
						 
						
							
							
								
								Allow generating mnemonic for different languages.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								85298012e4 
								
							
								 
							
						 
						
							
							
								
								Added generation of seed in registration.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								28fc5793a7 
								
							
								 
							
						 
						
							
							
								
								More explicit function names, shifted friend request sent logic to more sensible place  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								91a8a82e39 
								
							
								 
							
						 
						
							
							
								
								More PR suggestions, now recover from early exit before friend request is sent  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2de01d0343 
								
							
								 
							
						 
						
							
							
								
								Back to multiple pending states, fix some notification bugs and friend requests should now work for all cases besides message sending interruption  
							
							
							
						 
						
							7 years ago