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  
				
					
						
							
							
								 
						
							
							
								24455fc8b7 
								
							
								 
							
						 
						
							
							
								
								Updated TTL to use slider.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								235dbb2176 
								
							
								 
							
						 
						
							
							
								
								Added display of message ttl in settings.  
							
							... 
							
							
							
							Fixed setting message ttl. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								87113b6cc1 
								
							
								 
							
						 
						
							
							
								
								Added message ttl setting storage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								61c4447ab0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #126  from Mikunj/friend-request-notification  
							
							... 
							
							
							
							Fix notification display after friend request is accepted. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d1f4fcb4f 
								
							
								 
							
						 
						
							
							
								
								Moved loki_protocol_store.js into libloki/storage.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a12ed61cc1 
								
							
								 
							
						 
						
							
							
								
								Fix notification display after friend request is accepted.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								070d18b514 
								
							
								 
							
						 
						
							
							
								
								Updated function calls.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5eb0bc51a4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #119  from sachaaaaa/pow-metrics  
							
							... 
							
							
							
							PoW statistical measurements 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c01bea913 
								
							
								 
							
						 
						
							
							
								
								variables name consistency and remove superfluous initialisation  
							
							
							
						 
						
							7 years ago