Mikunj
							
						 
						
							 
							
							
							
								
							
								8808100796 
								
							
								 
							
						 
						
							
							
								
								Merge signal-1.24.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								c8ea2e9463 
								
							
								 
							
						 
						
							
							
								
								Download and install updates without the help of electron-updater  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9b71e8119e 
								
							
								 
							
						 
						
							
							
								
								Added error catching.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8c9b1a7a7a 
								
							
								 
							
						 
						
							
							
								
								Added loki server.  
							
							 
							
							... 
							
							
							
							Added test. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								04b45f6aa1 
								
							
								 
							
						 
						
							
							
								
								Decrypt friend-request messages (the ones using fallback encryption). Moved logic into a new file libloki-protocol.js and concat loki code into js/libloki.js  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
								
								
							
							
								
							
								ecb126e74c 
								
									
								
							
								 
							
						 
						
							
							
								
								Custom linter to check code quality ( #2753 )  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								02fbea96c0 
								
							
								 
							
						 
						
							
							
								
								Move base64 conversions off of the main thread  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								69f11c4a7b 
								
							
								 
							
						 
						
							
							
								
								Include _locales/en/messages.json in prettier formatting  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								43a44793c5 
								
							
								 
							
						 
						
							
							
								
								Remove jshint - move everything over to eslint  
							
							 
							
							... 
							
							
							
							Also removed all hints of previous linters 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								cfe0bd0e79 
								
							
								 
							
						 
						
							
							
								
								Move to npm for several dependencies  
							
							 
							
							... 
							
							
							
							mustache
jQuery
underscore
backbone
mocha
chai
intl-tel-input 
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1fd487be3f 
								
							
								 
							
						 
						
							
							
								
								Refactor to remove duplicated code, lint/prettier fixes  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Daniel Gasienica
							
						 
						
							 
							
							
							
								
							
								cb09da0f63 
								
							
								 
							
						 
						
							
							
								
								Run all build steps in CI  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Daniel Gasienica
							
						 
						
							 
							
							
							
								
							
								f88ebdf8b7 
								
							
								 
							
						 
						
							
							
								
								Compile protocol buffers as part of `yarn grunt dev`  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Daniel Gasienica
							
						 
						
							 
							
							
							
								
							
								2d95745d56 
								
							
								 
							
						 
						
							
							
								
								Add `yarn build-protobuf` command  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Daniel Gasienica
							
						 
						
							 
							
							
							
								
							
								8ef5d87d6b 
								
							
								 
							
						 
						
							
							
								
								Prettier: Update ignore list  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								97b0f1787b 
								
							
								 
							
						 
						
							
							
								
								prettier: exclude blanket_mocha.js for libtextsecure tests  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								a0ed993b42 
								
							
								 
							
						 
						
							
							
								
								Now we've got everything prettified!  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								754d65ae2e 
								
							
								 
							
						 
						
							
							
								
								Let's make it all pretty, shall we?  
							
							 
							
							... 
							
							
							
							We missed a couple directories with previous attempts to turn this on
globally: app/ and libtextsecure/
Not to mention files in places we didn't expect: ts files that weren't
in the ts directory!
This turns prettier on for every file we care about (js, ts, tsx, md)
everywhere in the project but for a few key parts. 
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Daniel Gasienica
							
						 
						
							 
							
							
							
								
							
								7fff279aae 
								
							
								 
							
						 
						
							
							
								
								Prettier: Ignore JSON and CSS  
							
							 
							
							
							
						 
						
							8 years ago  
						
					 
				
					
						
							
							
								 
								Daniel Gasienica
							
						 
						
							 
							
							
							
								
							
								b4dee3f30b 
								
							
								 
							
						 
						
							
							
								
								Prettier: Ignore generated files  
							
							 
							
							
							
						 
						
							8 years ago