Beaudan
							
						 
						
							 
							
							
							
								
							
								5d823de6f9 
								
							
								 
							
						 
						
							
							
								
								Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								1a810f4e4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #186  from Mikunj/local-preview  
							
							 
							
							... 
							
							
							
							Added local link previews 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								d30e950bf9 
								
							
								 
							
						 
						
							
							
								
								Changed hashing algorithm.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a989a1a818 
								
							
								 
							
						 
						
							
							
								
								Save previews locally.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								a81bf9f50e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #183  from sachaaaaa/match_preKeyId_friend_request_accept  
							
							 
							
							... 
							
							
							
							Ensure a session is always initiated using the prekey assigned to the… 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								fdc51e88dd 
								
							
								 
							
						 
						
							
							
								
								only verify the prekey id when there is no current session active  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a1e4b740f2 
								
							
								 
							
						 
						
							
							
								
								Fixed up settings view.  
							
							 
							
							... 
							
							
							
							Fix review issues. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7564e270f8 
								
							
								 
							
						 
						
							
							
								
								Lint and code cleanup  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								725a41a8d7 
								
							
								 
							
						 
						
							
							
								
								Added link preview setting.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								2755ff06d8 
								
							
								 
							
						 
						
							
							
								
								remove messages from cache before throwing if the prekey id could not be verified  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								27c6062351 
								
							
								 
							
						 
						
							
							
								
								Fix incoming messages not showing previews.  
							
							 
							
							... 
							
							
							
							Linting. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ae695fe32f 
								
							
								 
							
						 
						
							
							
								
								Remove sending attachments.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8f8e25bb3e 
								
							
								 
							
						 
						
							
							
								
								Added local link preview  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7186f28019 
								
							
								 
							
						 
						
							
							
								
								Ensure a session is always initiated using the prekey assigned to the contact  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								0417f0ffad 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #182  from sachaaaaa/disable_dragndro  
							
							 
							
							... 
							
							
							
							Disable drag n drop temporarily 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								f900a08eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #177  from sachaaaaa/merge_1_21_0  
							
							 
							
							... 
							
							
							
							Merge Signal 1.21.0 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								72b7f82522 
								
							
								 
							
						 
						
							
							
								
								Disable pasting files  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								46533fae0d 
								
							
								 
							
						 
						
							
							
								
								disable drag n drop temporarily  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								4332a18fcb 
								
							
								 
							
						 
						
							
							
								
								ran yarn lint  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								6b7db5d085 
								
							
								 
							
						 
						
							
							
								
								Comment out auto-updater which was making test-loki-view fail  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								c968eb8daf 
								
							
								 
							
						 
						
							
							
								
								revert background colour in main.js (+1 squashed commit)  
							
							 
							
							... 
							
							
							
							Squashed commits:
[9ec61f5f] revert background colour 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								9ae85a3408 
								
							
								 
							
						 
						
							
							
								
								Add missing argument when calling sendMessage in sendEmptyMessage  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								31e5013207 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #175  from BeaudanBrown/p2p-tests  
							
							 
							
							... 
							
							
							
							P2p tests 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								25a3129e37 
								
							
								 
							
						 
						
							
							
								
								Reworked p2p tests to be sensible and use the built in timeout/done system instead of hacky promise thing  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								cde7bbf3c3 
								
							
								 
							
						 
						
							
							
								
								Removed forceP2p as argument for the pingContact event and enforced it on the other side  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								02d6920ade 
								
							
								 
							
						 
						
							
							
								
								Tests for loki_p2p_api, added yarn command to generate coverage html, instantiating loki_p2p_api in the test preload  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								c5eb067206 
								
							
								 
							
						 
						
							
							
								
								v1.21.0  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								dee604ad11 
								
							
								 
							
						 
						
							
							
								
								Merge tag 'v1.21.0-beta.4'  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								6599c9a704 
								
							
								 
							
						 
						
							
							
								
								v1.21.0-beta.4  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1a11c53a79 
								
							
								 
							
						 
						
							
							
								
								Dark Theme: Preserve blue background on app loading screen  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								8654d80973 
								
							
								 
							
						 
						
							
							
								
								Localization updates  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1d6f1cbcca 
								
							
								 
							
						 
						
							
							
								
								Fix width of audio player when window is very narrow  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								0d7480bd92 
								
							
								 
							
						 
						
							
							
								
								A number of small fixes for Link Previews  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Vanja Cosic
							
						 
						
							 
							
							
							
								
							
								b26f6231d8 
								
							
								 
							
						 
						
							
							
								
								Get rid of the white flash when the app starts up ( #3083 )  
							
							 
							
							... 
							
							
							
							* Prevent FOUC on startup, use Signal Blue instead
Instead of flashing a white background on startup, the app will show a blue background while everything is loading.
* Make sure tests are rendered on white background
* Use `icon_250.png` as the loading image
* Remove hardcoded 'Loading...' text from template 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								432c336048 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #171  from Mikunj/online-indicator-fix  
							
							 
							
							... 
							
							
							
							Added online indicator to conversation header. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								1519406c65 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #169  from Mikunj/queue-message-send-update  
							
							 
							
							... 
							
							
							
							Minor code update 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								7c4eb826d0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #168  from BeaudanBrown/disconnected-fix  
							
							 
							
							... 
							
							
							
							Fixing the disconnected buffer coming up too much 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e3c0f2147a 
								
							
								 
							
						 
						
							
							
								
								Fixed variable name.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								926362f88a 
								
							
								 
							
						 
						
							
							
								
								Rename queue_manager to job_queue  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1d40bc3af9 
								
							
								 
							
						 
						
							
							
								
								Changed queueMessageSend to use JobQueue.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								8462864373 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #167  from BeaudanBrown/p2p-fixes  
							
							 
							
							... 
							
							
							
							P2p logic fixes 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								cd79d5aca5 
								
							
								 
							
						 
						
							
							
								
								Fixed and simplified some logic for the handling of loki address messages  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								b1cd0e2a65 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #164  from BeaudanBrown/message-filtering  
							
							 
							
							... 
							
							
							
							Message filtering 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								b2e95932f1 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								fac8e72861 
								
							
								 
							
						 
						
							
							
								
								Added queue manager to properly fix the race condition bug and reset the changes I made in other commit  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								b2f456031f 
								
							
								 
							
						 
						
							
							
								
								Forgot to lint  
							
							 
							
							
							
						 
						
							7 years ago