Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								70b739d24f 
								
									
								
							
								 
							
						 
						
							
							
								
								update translation to match android - part 1  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								49b994367d 
								
							
								 
							
						 
						
							
							
								
								Remove multi device data.  
							
							 
							
							... 
							
							
							
							Force wipe secondary devices. 
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9e14615cd2 
								
							
								 
							
						 
						
							
							
								
								Remove RSS Feeds  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								d5a98b8b47 
								
							
								 
							
						 
						
							
							
								
								Remove swarm nodes from conversations  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0904e7a8ca 
								
							
								 
							
						 
						
							
							
								
								Refactor from message polling to content message handling  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								4865b72e93 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into receiver-remove-friend-request-logic  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								28fb1dd12a 
								
									
								
							
								 
							
						 
						
							
							
								
								address PR reviews  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								eb9a838af1 
								
									
								
							
								 
							
						 
						
							
							
								
								remove friends from UI logic  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								66de8d9648 
								
									
								
							
								 
							
						 
						
							
							
								
								remove plenty of the friend logic  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c8414fdce6 
								
							
								 
							
						 
						
							
							
								
								Simplify sql and data files  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								3edff1e364 
								
									
								
							
								 
							
						 
						
							
							
								
								remove old pairing authorisation when adding a new one  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								debb922521 
								
							
								 
							
						 
						
							
							
								
								Medium groups with sender keys essentials  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0e4f9b4743 
								
							
								 
							
						 
						
							
							
								
								Remove duplication  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a2b60cdd2a 
								
							
								 
							
						 
						
							
							
								
								Remove token data upon registration reset  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8f453bc12e 
								
							
								 
							
						 
						
							
							
								
								Fix unnecessary db calls  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								0221e7b8c0 
								
							
								 
							
						 
						
							
							
								
								fix linter warnings  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								3a746109ea 
								
							
								 
							
						 
						
							
							
								
								Path building for onion requests  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								78389440c0 
								
							
								 
							
						 
						
							
							
								
								Update sqlcipher to 4.2.0.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								d9bd481366 
								
							
								 
							
						 
						
							
							
								
								Make RSS feed names match iOS  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								2b53146362 
								
							
								 
							
						 
						
							
							
								
								make RSS feeds title case match  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								de4edf9252 
								
							
								 
							
						 
						
							
							
								
								CLosed groups ui initial listprops  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								9dcc851ebd 
								
							
								 
							
						 
						
							
							
								
								Updated all icon references  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
								
								
							
							
								
							
								d910633422 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #746  from msgmaxim/no-autojoin-loki-chats  
							
							 
							
							... 
							
							
							
							Disable auto-joining default loki open groups 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								cf10a19b34 
								
							
								 
							
						 
						
							
							
								
								Disable auto-joining default loki open groups  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 
						
							 
							
							
							
								
							
								033492a200 
								
							
								 
							
						 
						
							
							
								
								Sort messages by sent_at  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								2c1375e42a 
								
							
								 
							
						 
						
							
							
								
								Fix recurring memory leak in mentions  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								de0a5c7b78 
								
							
								 
							
						 
						
							
							
								
								Unique constraint and prevent some undefined bugs  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								8df692901a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							 
							
							... 
							
							
							
							* clearnet:
  set active_at to now() for public channels 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								634d274ffc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #531  from sachaaaaa/remove_all_private_conv  
							
							 
							
							... 
							
							
							
							[multi-device] Remove private convs only 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								8ce21b13fe 
								
							
								 
							
						 
						
							
							
								
								Remove only private conversation during secondary registrations steps to keep public chats in db  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								5a8ab00a96 
								
							
								 
							
						 
						
							
							
								
								Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary.  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7d7eea9547 
								
							
								 
							
						 
						
							
							
								
								set active_at to now() for public channels  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								f8e9e1d3bd 
								
							
								 
							
						 
						
							
							
								
								Remove rejected authorisation from database  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								0426d85e7a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							 
							
							... 
							
							
							
							* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix  #355  Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...
# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								d17f86679f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #495  from sachaaaaa/fix_unknown_signedkey  
							
							 
							
							... 
							
							
							
							[multi-device] Ensure the latest contact signed prekey is used 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								6de6b762e6 
								
							
								 
							
						 
						
							
							
								
								Ensure the latest contact signed prekey is used  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								d3c3184405 
								
							
								 
							
						 
						
							
							
								
								Search returns primary device when looking up secondary pub key  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								b10835ffc7 
								
							
								 
							
						 
						
							
							
								
								Share contact upon authorising secondary device  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								6f995d6a96 
								
							
								 
							
						 
						
							
							
								
								Resolve linter issues  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
								
								
							
							
								
							
								b4277532d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Update app/sql.js  
							
							 
							
							... 
							
							
							
							Co-Authored-By: Beaudan Campbell-Brown <beau@loki.network> 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								dffcf51f88 
								
							
								 
							
						 
						
							
							
								
								add defaultPublicChatServer to config  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								35b6182074 
								
							
								 
							
						 
						
							
							
								
								Clean up after account registration failure  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								6392c77952 
								
							
								 
							
						 
						
							
							
								
								Fix database helpers  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								700ed5d2a8 
								
							
								 
							
						 
						
							
							
								
								Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								716e142ac4 
								
							
								 
							
						 
						
							
							
								
								Reviews  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								37366198fc 
								
							
								 
							
						 
						
							
							
								
								Add database tables and helper functions for public server auth  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a4411007b0 
								
							
								 
							
						 
						
							
							
								
								Pairing authorisations: refactor proto, change sql table, add getters  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								895cedc801 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Brown
							
						 
						
							 
							
							
							
								
							
								3f4b94ba74 
								
							
								 
							
						 
						
							
							
								
								Transition to initialising rss feeds in schema update  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								edd800d382 
								
							
								 
							
						 
						
							
							
								
								Make linter happy  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								88c1454c18 
								
							
								 
							
						 
						
							
							
								
								Use Loki Schema for database versioning  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								d208614909 
								
							
								 
							
						 
						
							
							
								
								Multi-device part 1: make primary account generate and send authorisation to secondary  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								c9f433fbba 
								
							
								 
							
						 
						
							
							
								
								Save message id when sending/receiving to/from public server and lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								899bfc3b2b 
								
							
								 
							
						 
						
							
							
								
								Add channel id to message table and provide helper functions  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								1fc2173d9b 
								
							
								 
							
						 
						
							
							
								
								Update header template to display group names properly and update migration to only store name for public chat  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								014558d939 
								
							
								 
							
						 
						
							
							
								
								Squash and clean of old PRs, move towards sending cleartext again  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								90f788c591 
								
							
								 
							
						 
						
							
							
								
								Add the server and channel plus proper displayName  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								89980e3248 
								
							
								 
							
						 
						
							
							
								
								Better sql for selecting version  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								8225bf5847 
								
							
								 
							
						 
						
							
							
								
								Slight sql changes  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								06832e4978 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								b4cc9430be 
								
							
								 
							
						 
						
							
							
								
								Add loki schema versioning and create new public conversation  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								5887f8c14c 
								
							
								 
							
						 
						
							
							
								
								Fix password error  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								12ce0140de 
								
							
								 
							
						 
						
							
							
								
								Left pane changes.  
							
							 
							
							... 
							
							
							
							Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23
# Conflicts:
#	_locales/en/messages.json
#	background.html
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_list_item_view.js
#	js/views/conversation_list_view.js
#	js/views/conversation_search_view.js
#	js/views/inbox_view.js
#	libtextsecure/account_manager.js
#	package.json
#	stylesheets/_global.scss
#	stylesheets/_index.scss
#	stylesheets/_modules.scss
#	test/_test.js
#	test/index.html
#	test/models/conversations_test.js
#	test/views/conversation_search_view_test.js
#	ts/components/ConversationListItem.tsx
#	ts/components/MainHeader.tsx
#	ts/components/conversation/ConversationHeader.tsx
#	ts/components/conversation/ResetSessionNotification.tsx 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								48c4ed1a29 
								
							
								 
							
						 
						
							
							
								
								Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								57195017f9 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e343a04eea 
								
							
								 
							
						 
						
							
							
								
								Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	background.html
#	config/default.json
#	js/background.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/modules/data.js
#	js/signal_protocol_store.js
#	js/views/conversation_search_view.js
#	libtextsecure/message_receiver.js
#	libtextsecure/sendmessage.js
#	main.js
#	package.json
#	preload.js
#	test/index.html
#	ts/components/Avatar.tsx
#	ts/components/conversation/ConversationHeader.md
#	ts/components/conversation/ConversationHeader.tsx 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								3522513590 
								
							
								 
							
						 
						
							
							
								
								Use TEXT over STRING  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								faf1b4b66b 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								796181e00c 
								
							
								 
							
						 
						
							
							
								
								Add database functions for storing, retrieving and cleaning last hash for snodes  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								ca5132f712 
								
							
								 
							
						 
						
							
							
								
								Present 'database error' dialog in more situations  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								d317b020f0 
								
							
								 
							
						 
						
							
							
								
								Close the database if the password is incorrect, fixes windows crash  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								5165eb3bd4 
								
							
								 
							
						 
						
							
							
								
								On database error: show popup, allow user to delete and relaunch  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								5b54c9554e 
								
							
								 
							
						 
						
							
							
								
								Remove groups table, conversation is single source of truth  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								041fe4be05 
								
							
								 
							
						 
						
							
							
								
								Remove JSON column and Backbone Model for unprocessed  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								9c540ab977 
								
							
								 
							
						 
						
							
							
								
								Add cache support to Signal Protocol Store  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								462fa712bc 
								
							
								 
							
						 
						
							
							
								
								Show members: Pull conversation from group table  
							
							 
							
							
							
						 
						
							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  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								80fa4f866e 
								
							
								 
							
						 
						
							
							
								
								Stale comment from review  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								38ff70e2ec 
								
							
								 
							
						 
						
							
							
								
								Fixed some little redundant stuff in the message and snode api  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								07076c27ae 
								
							
								 
							
						 
						
							
							
								
								Moved friend status to window, added start of p2p api stuff  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ac59e1249f 
								
							
								 
							
						 
						
							
							
								
								Added db resetting.  
							
							 
							
							... 
							
							
							
							Use built in signal warning view. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e08a63d078 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								24553e29e7 
								
							
								 
							
						 
						
							
							
								
								Made swarm requests ACTUALLY not wait for them all to finish and stop saving swarmNodes as DB column  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								92c2a0f996 
								
							
								 
							
						 
						
							
							
								
								Data infrastructure work  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								e4babdaef0 
								
							
								 
							
						 
						
							
							
								
								Updates to backup infrastructure  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								a1255dd31e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #77  from Mikunj/password-protection  
							
							 
							
							... 
							
							
							
							Password protection 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								e1aba93aea 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.18.1 changes.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 
						
							 
							
							
								
								
							
							
								
							
								1303603db9 
								
									
								
							
								 
							
						 
						
							
							
								
								Apply suggestions from code review  
							
							 
							
							... 
							
							
							
							Co-Authored-By: Mikunj <Mikunj@users.noreply.github.com> 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9e995bde6c 
								
							
								 
							
						 
						
							
							
								
								Review fixes.  
							
							 
							
							... 
							
							
							
							Updated tests. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f53bec38a5 
								
							
								 
							
						 
						
							
							
								
								Added password inputs on registration screen.  
							
							 
							
							... 
							
							
							
							Fix case where db is deleted but password hash still remains which causes user to never register.
Allow password to have symbols and other characters.
Added more tests.
Moved passHash from config into the sqlite db.
We can do this because we assume if sql failed to initialise then the key provided was wrong and thus we can show the user the password page. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								051e4dd22c 
								
							
								 
							
						 
						
							
							
								
								XAnother big refactor to tie conversation UI logic to the friendRequestStatus variable  
							
							 
							
							
							
						 
						
							7 years ago