81de5f9a76 
								
							
								 
							
						 
						
							
							
								
								Introduce CTRL-E shortcut for archiving a conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								74cb808763 
								
							
								 
							
						 
						
							
							
								
								New MessageController as the single place for in-memory messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae8b3899ad 
								
							
								 
							
						 
						
							
							
								
								Changed registration to be a 2 step process.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								274949b247 
								
							
								 
							
						 
						
							
							
								
								Enable long message send as an attachment  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d8fbe95ff 
								
							
								 
							
						 
						
							
							
								
								Retry send: Always remove all errors and recalculate recipients  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0c69d725c3 
								
							
								 
							
						 
						
							
							
								
								Ensure that we have all conversations in redux store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								338f4e3682 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #255  from BeaudanBrown/better-logs  
							
							... 
							
							
							
							Improve sending/retrieving/swarm logs 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b232d6289a 
								
							
								 
							
						 
						
							
							
								
								Update react-contextmenu to avoid event handler issues un unload  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3b140d9b51 
								
							
								 
							
						 
						
							
							
								
								Update react-contextmenu to avoid event handler issues un unload  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7cfd3870d5 
								
							
								 
							
						 
						
							
							
								
								Escape XML delimiters for notifications on linux  
							
							... 
							
							
							
							Thanks to @whitequark for pointing out an inconsistency in the way that
some Linux desktop environments were displaying markup in notifications. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c4d90df07 
								
							
								 
							
						 
						
							
							
								
								Send long text as an attachment instead of inline  
							
							... 
							
							
							
							Remove Android length warning
Handle incoming long message attachments
Show long download pending status in message bubble
Fix the width of the smallest spinner
Remove Android length warning from HTML templates 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0e5f405b53 
								
							
								 
							
						 
						
							
							
								
								Remove unnecessary 'tag' from Notification construction  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ce2d5d169f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #253  from BeaudanBrown/extend-right-click  
							
							... 
							
							
							
							Extend right click functionality 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								32fa5cccde 
								
							
								 
							
						 
						
							
							
								
								Send sync sent messages properly in 1-member group  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c76d537482 
								
							
								 
							
						 
						
							
							
								
								Note to Self: On just expire timer update, set TIMER_UPDATE flag  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0b6849c96a 
								
							
								 
							
						 
						
							
							
								
								Review comment plus added a todo  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								bf904ddd12 
								
							
								 
							
						 
						
							
							
								
								On attachment save include date, include album index  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								768007a269 
								
							
								 
							
						 
						
							
							
								
								Message Detail: Ensure that quotes are not clickable  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								782516186f 
								
							
								 
							
						 
						
							
							
								
								Move expiring message cleanup after ConversationController.load()  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d72f89d776 
								
							
								 
							
						 
						
							
							
								
								Render only visible conversations in left pane  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e68367fe0d 
								
							
								 
							
						 
						
							
							
								
								Remove reference to nonexistent view  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								009c58749b 
								
							
								 
							
						 
						
							
							
								
								Don't continue to log if socket is returning unknown status  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								812f895e12 
								
							
								 
							
						 
						
							
							
								
								Bring lastMessage and lastMessageStatus back to conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dcd16775c3 
								
							
								 
							
						 
						
							
							
								
								Note to Self: set expirationStartTimestamp before sending sync  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eb7ad48951 
								
							
								 
							
						 
						
							
							
								
								Only put nbsp before last token in msg body if token is <12 chars  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ba501a6df6 
								
							
								 
							
						 
						
							
							
								
								Fix ASM warnings in MP3 library  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fbda313d09 
								
							
								 
							
						 
						
							
							
								
								Add job details to attachment download log warning  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae161c6cf6 
								
							
								 
							
						 
						
							
							
								
								Update to Electron 4.x  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								667b2e63f1 
								
							
								 
							
						 
						
							
							
								
								Ensure image lightbox is aware of its underlying message changes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae2db9f09a 
								
							
								 
							
						 
						
							
							
								
								Improve handling for URLs composed of mixed character sets  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbdde07062 
								
							
								 
							
						 
						
							
							
								
								Allow conversation symbol to generate while swarm nodes are being retrieved  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9717267b00 
								
							
								 
							
						 
						
							
							
								
								Review  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14367620d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d0d57ea8c7 
								
							
								 
							
						 
						
							
							
								
								Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5c29c6cb1d 
								
							
								 
							
						 
						
							
							
								
								Search view now works with deleting contacts as well  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								df93c97b48 
								
							
								 
							
						 
						
							
							
								
								Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dca2462f6c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #248  from sachaaaaa/friend_request_expiry  
							
							... 
							
							
							
							Add requestExpired state to Friend Request state machine 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								77fb5b4a71 
								
							
								 
							
						 
						
							
							
								
								Missing closing parenthesis  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								353302ca16 
								
									
								
							
								 
							
						 
						
							
							
								
								Use Array.includes instead of Array.indexOf  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e953ae7be2 
								
							
								 
							
						 
						
							
							
								
								use correct function respondToAllFriendRequests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								62889bbdd4 
								
							
								 
							
						 
						
							
							
								
								Add requestExpired state to Friend Request state machine  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								926c9ce3ca 
								
							
								 
							
						 
						
							
							
								
								Fix multiple friend request timers instantiated  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8e3542b511 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #213  from sachaaaaa/channel_encryption  
							
							... 
							
							
							
							Hook up channel encryption 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4714cafa6f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #238  from sachaaaaa/commit_hash_about  
							
							... 
							
							
							
							Show commit hash in About window for beta builds 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								37f0fced29 
								
							
								 
							
						 
						
							
							
								
								Show commit hash in About window for beta builds  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f906cbfd50 
								
							
								 
							
						 
						
							
							
								
								Added enter to log in  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								28b548525e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #233  from BeaudanBrown/handle-local-server-fail  
							
							... 
							
							
							
							Retry p2p server if failed to start 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5030ad4021 
								
							
								 
							
						 
						
							
							
								
								Made the slider label populate as well, plus removed redundant window function  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c20a31dd4 
								
							
								 
							
						 
						
							
							
								
								Review suggestions  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								53b0574a1f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into channel_encryption  
							
							... 
							
							
							
							* development:
  Manually set the dns servers for windows
  Refactor local_loki_server
  Refactor rpc calls to its own function.
# Conflicts:
#	js/modules/loki_message_api.js 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								55e0ff1a88 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #208  from Mikunj/message-api-refactor  
							
							... 
							
							
							
							Refactor rpc call to its own function. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad5efc9ba3 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aa722590fa 
								
							
								 
							
						 
						
							
							
								
								use channel encryption with storage server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								72d00e0922 
								
							
								 
							
						 
						
							
							
								
								Manually set the dns servers for windows  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4a037387e9 
								
							
								 
							
						 
						
							
							
								
								Refactor rpc calls to its own function.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c0a6ba25bc 
								
							
								 
							
						 
						
							
							
								
								Update p2p messages to follow the same endpoint format as storage server. Clean up message_api a lil bit and updated tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								08dee14802 
								
							
								 
							
						 
						
							
							
								
								Review comment  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3917ab940e 
								
							
								 
							
						 
						
							
							
								
								web_api: Fix caching of https.agent objects between requests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								41ea9ee15b 
								
							
								 
							
						 
						
							
							
								
								Ensure that we show error'd recipients in message details screen  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad53423e0a 
								
							
								 
							
						 
						
							
							
								
								Queue quote reference handling per convo in handleDataMessage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5165eb3bd4 
								
							
								 
							
						 
						
							
							
								
								On database error: show popup, allow user to delete and relaunch  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3fb6ab295f 
								
							
								 
							
						 
						
							
							
								
								Debug log optimizations and improvements  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9afea3ae2b 
								
							
								 
							
						 
						
							
							
								
								View All Media: Listen for updates to conversation, re-render  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d4eacda649 
								
							
								 
							
						 
						
							
							
								
								Disable import/export outside of test mode; not currently used  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								0516e69ff7 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								25ded46e2c 
								
							
								 
							
						 
						
							
							
								
								Fixed some bugs removing nodes after the first failure instead of waiting for the failure count and also reduced the number of errors logged and made some warnings  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b00a0cb699 
								
							
								 
							
						 
						
							
							
								
								Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1c4d9b40bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #199  from sachaaaaa/new_message_api  
							
							... 
							
							
							
							Use new message json rpc API 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d3f23db049 
								
							
								 
							
						 
						
							
							
								
								serialise objects to json before node-fetch  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8eac72b60c 
								
							
								 
							
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ed1d06d9ce 
								
							
								 
							
						 
						
							
							
								
								use 'params' as per json_rpc  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4bb10044ea 
								
							
								 
							
						 
						
							
							
								
								Clear timers after friend request complete and don't do timer related things if we are already friends  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								159dc711e1 
								
							
								 
							
						 
						
							
							
								
								use new message json rpc API  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2fd746821a 
								
							
								 
							
						 
						
							
							
								
								Added function for getting your loki IP and bind the local server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6426a5eb9b 
								
							
								 
							
						 
						
							
							
								
								Added ability to look up our .loki address and now send that with our LokiAddress messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1b9959aca3 
								
							
								 
							
						 
						
							
							
								
								Ensure outgoing attachment size always matches resized image  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								28f96fe893 
								
							
								 
							
						 
						
							
							
								
								Ensure that we capture sender even if thrown error is falsey  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								041fe4be05 
								
							
								 
							
						 
						
							
							
								
								Remove JSON column and Backbone Model for unprocessed  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c540ab977 
								
							
								 
							
						 
						
							
							
								
								Add cache support to Signal Protocol Store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								858c7e629f 
								
							
								 
							
						 
						
							
							
								
								Fine-tune linkification technique for link previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								462fa712bc 
								
							
								 
							
						 
						
							
							
								
								Show members: Pull conversation from group table  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								12739ac82d 
								
							
								 
							
						 
						
							
							
								
								Ensure we don't add empty attachments to quote  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2d9e6a7ac8 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2311bd1328 
								
							
								 
							
						 
						
							
							
								
								Fix bug with swarm node reference, now we should only refresh swarm nodes when they fail  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5d823de6f9 
								
							
								 
							
						 
						
							
							
								
								Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d30e950bf9 
								
							
								 
							
						 
						
							
							
								
								Changed hashing algorithm.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a989a1a818 
								
							
								 
							
						 
						
							
							
								
								Save previews locally.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a7df91dbc 
								
							
								 
							
						 
						
							
							
								
								Fix: Navigation to message via quote click didn't always work  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a1e4b740f2 
								
							
								 
							
						 
						
							
							
								
								Fixed up settings view.  
							
							... 
							
							
							
							Fix review issues. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7564e270f8 
								
							
								 
							
						 
						
							
							
								
								Lint and code cleanup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								725a41a8d7 
								
							
								 
							
						 
						
							
							
								
								Added link preview setting.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								27c6062351 
								
							
								 
							
						 
						
							
							
								
								Fix incoming messages not showing previews.  
							
							... 
							
							
							
							Linting. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae695fe32f 
								
							
								 
							
						 
						
							
							
								
								Remove sending attachments.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f8e25bb3e 
								
							
								 
							
						 
						
							
							
								
								Added local link preview  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0417f0ffad 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #182  from sachaaaaa/disable_dragndro  
							
							... 
							
							
							
							Disable drag n drop temporarily 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f900a08eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #177  from sachaaaaa/merge_1_21_0  
							
							... 
							
							
							
							Merge Signal 1.21.0 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								72b7f82522 
								
							
								 
							
						 
						
							
							
								
								Disable pasting files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								46533fae0d 
								
							
								 
							
						 
						
							
							
								
								disable drag n drop temporarily  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4332a18fcb 
								
							
								 
							
						 
						
							
							
								
								ran yarn lint  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								cde7bbf3c3 
								
							
								 
							
						 
						
							
							
								
								Removed forceP2p as argument for the pingContact event and enforced it on the other side  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								69ebf017ff 
								
							
								 
							
						 
						
							
							
								
								Reworked loki_p2p_api to not use the window object, which means it needs to be instantiated after the storage is ready so that your pubkey can be passed in to the constructor. This makes it more modular and allows for easier testing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0d7480bd92 
								
							
								 
							
						 
						
							
							
								
								A number of small fixes for Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								432c336048 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #171  from Mikunj/online-indicator-fix  
							
							... 
							
							
							
							Added online indicator to conversation header. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1519406c65 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #169  from Mikunj/queue-message-send-update  
							
							... 
							
							
							
							Minor code update 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e3c0f2147a 
								
							
								 
							
						 
						
							
							
								
								Fixed variable name.  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								926362f88a 
								
							
								 
							
						 
						
							
							
								
								Rename queue_manager to job_queue  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d40bc3af9 
								
							
								 
							
						 
						
							
							
								
								Changed queueMessageSend to use JobQueue.  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								25383458b1 
								
							
								 
							
						 
						
							
							
								
								Fixed bug with our swarm nodes being removed from memory after a successful request because of returning a reference  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cc3f98b20a 
								
							
								 
							
						 
						
							
							
								
								Move the incoming hash filtering logic into sql.js to prevent data races  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5f49c5aafd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #165  from Mikunj/online-indicator  
							
							... 
							
							
							
							Online indicator 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								174f8747b6 
								
							
								 
							
						 
						
							
							
								
								Review fixes.  
							
							... 
							
							
							
							Revert promises back to old style. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								576617e18e 
								
							
								 
							
						 
						
							
							
								
								call class method using "this" in loki_snode_api  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4518e95619 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8526c6dd92 
								
							
								 
							
						 
						
							
							
								
								Fix up possible database write issue.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f4e9bc655a 
								
							
								 
							
						 
						
							
							
								
								Hooked up LokiP2pAPI with online stuff.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b382de6da 
								
							
								 
							
						 
						
							
							
								
								Added online indicator.  
							
							... 
							
							
							
							Disable selection in contacts. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1ce63add68 
								
							
								 
							
						 
						
							
							
								
								Simplified the addContactP2pDetails logic cause it was silly  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								ddbbb1a6f0 
								
							
								 
							
						 
						
							
							
								
								Refactor fetch.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ba7fb20b8 
								
							
								 
							
						 
						
							
							
								
								Fixed UI blocking when creating conversation, more review comments  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e735b3ca41 
								
							
								 
							
						 
						
							
							
								
								Review comments, moved swarmNodes database stuff to just be in data.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4207d2d26b 
								
							
								 
							
						 
						
							
							
								
								Removed accidental commented out line  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ff96a0250 
								
							
								 
							
						 
						
							
							
								
								Fixed tests and moved friend request status enum to new friends file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								38ff70e2ec 
								
							
								 
							
						 
						
							
							
								
								Fixed some little redundant stuff in the message and snode api  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d002d76d9f 
								
							
								 
							
						 
						
							
							
								
								Fix unneccesary logic and copy paste trash  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								8f165da43d 
								
							
								 
							
						 
						
							
							
								
								Fix sending loop that cycles indefinitely when offline  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f2acde219a 
								
							
								 
							
						 
						
							
							
								
								Review suggestion  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f6d167eda1 
								
							
								 
							
						 
						
							
							
								
								Split logic for getting swarm nodes from db, getting from lokinet and saving to db. Now tracking successfulRequests when making queries on top of the completedNodes list  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1533fcc807 
								
							
								 
							
						 
						
							
							
								
								Fail over to all numbers in retry if errors don't have numbers  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								92c071e083 
								
							
								 
							
						 
						
							
							
								
								Use the proper method for pulling attachments off disk for retry  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c936859d09 
								
							
								 
							
						 
						
							
							
								
								Fix rendering bug with verified state in updateVerified()  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ece4e1fd8 
								
							
								 
							
						 
						
							
							
								
								Review comments  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dde63a552f 
								
							
								 
							
						 
						
							
							
								
								Fix bug with replayable errors, fix bug with set representation of swarmNodes not being handled properly  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								374b9db493 
								
							
								 
							
						 
						
							
							
								
								Ensure that dialog pops up when permissions denied for voice note  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0eb4760349 
								
							
								 
							
						 
						
							
							
								
								Show contact name on 'send anyway' dialog instead of $name$  
							
							... 
							
							
							
							Partial fix for #1914  
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ac59e1249f 
								
							
								 
							
						 
						
							
							
								
								Added db resetting.  
							
							... 
							
							
							
							Use built in signal warning view. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e544cd4c88 
								
							
								 
							
						 
						
							
							
								
								Added confirmation dialog.  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								adfb4ab371 
								
							
								 
							
						 
						
							
							
								
								work with session reset  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0ba25ff8d5 
								
							
								 
							
						 
						
							
							
								
								Multiple images can now be selected in file chooser and drag/drop  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e08a63d078 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f92e8485f8 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							... 
							
							
							
							Added gitattributes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1e4b562922 
								
							
								 
							
						 
						
							
							
								
								Multiple images can now be selected in file chooser and drag/drop  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								badaf40ca8 
								
							
								 
							
						 
						
							
							
								
								bit of readability and catching error (but just silencing for now)  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bdbdf15469 
								
							
								 
							
						 
						
							
							
								
								Added timeouts for requests so they don't for ages. Changed swarmNodes to be a set to work property with merge, now removing contact swarmNodes if they timeout  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								24553e29e7 
								
							
								 
							
						 
						
							
							
								
								Made swarm requests ACTUALLY not wait for them all to finish and stop saving swarmNodes as DB column  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								f09f0f5721 
								
							
								 
							
						 
						
							
							
								
								Moved replenishSwarm into libloki-protocol and attached to the window  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								37ba762312 
								
							
								 
							
						 
						
							
							
								
								First stuff for contacting specific nodes for each contact. Hard coded to hit the same bootstrap node for now plus doesn't handle unreachable nodes/errors well yet  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ea1d007b4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #136  from Mikunj/tests  
							
							... 
							
							
							
							Tests 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c1dfd400f5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #131  from Mikunj/ttl-setting  
							
							... 
							
							
							
							Added TTL to settings. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1b681bdc98 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #137  from Mikunj/fix/friend-display  
							
							... 
							
							
							
							Fix contact display 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f527e2a2ff 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/notifications.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1f10a73e4f 
								
							
								 
							
						 
						
							
							
								
								Updated strings.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b8aa60b95d 
								
							
								 
							
						 
						
							
							
								
								Added loki icon.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								feb8af476a 
								
							
								 
							
						 
						
							
							
								
								Refactored BlockedNumberController.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								74bbdb88a5 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								16a821645f 
								
							
								 
							
						 
						
							
							
								
								Preserve scroll position on toggle emoji panel, add attachment  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0de54e125c 
								
							
								 
							
						 
						
							
							
								
								Improve caption editor usability, new 'add attachment' affordance  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ac1a6d197a 
								
							
								 
							
						 
						
							
							
								
								Enable sending multiple images in one message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e69999a790 
								
							
								 
							
						 
						
							
							
								
								Fix condition order.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7341471ce7 
								
							
								 
							
						 
						
							
							
								
								Fix up notification.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								78c5962ff0 
								
							
								 
							
						 
						
							
							
								
								Fixed contact not being added after friend request is accepted.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7db7a3ad44 
								
							
								 
							
						 
						
							
							
								
								Preserve scroll position when adding/removing staged quote  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7aad9417c7 
								
							
								 
							
						 
						
							
							
								
								Added blocked number controller tests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								faeb319c58 
								
							
								 
							
						 
						
							
							
								
								Added profile model test.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b08c10a547 
								
							
								 
							
						 
						
							
							
								
								FileInputView: Event on attachment change to hide/show microphone  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								43e5d16020 
								
							
								 
							
						 
						
							
							
								
								Support for web socket communication with no signaling key  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								924c51d5c7 
								
							
								 
							
						 
						
							
							
								
								Removed min and max clamping in code.  
							
							... 
							
							
							
							This should be done UI and Server side instead. 
							
						 
						
							7 years ago