649c8c9be5 
								
							
								 
							
						 
						
							
							
								
								Resolved conflicts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08cc218364 
								
							
								 
							
						 
						
							
							
								
								Fixed orderin of toasts with Maps  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24ebf6b26a 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								90cce5e9ae 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bfab163c5c 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4d7cfb90e 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9cd27abf31 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'brand-redesign' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								597c177ced 
								
							
								 
							
						 
						
							
							
								
								Syntactical sugar  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								34ce386bdb 
								
							
								 
							
						 
						
							
							
								
								Finalise uniquified toast stacking and deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d463c659c 
								
							
								 
							
						 
						
							
							
								
								Filesize toast amend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6574585938 
								
							
								 
							
						 
						
							
							
								
								make default theme to dark  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								47101c85f7 
								
							
								 
							
						 
						
							
							
								
								add signin with mnemonic to sessionRegistration page  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2cf39cc1ed 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #690  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							Add/Remove Moderators interface 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5730a88c18 
								
							
								 
							
						 
						
							
							
								
								add/remove moderator modal dialogs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								531b782669 
								
							
								 
							
						 
						
							
							
								
								click on our avatar show the edit profile dialog & fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								549e3b4516 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multidevice-publicchat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5123fa0409 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #669  from msgmaxim/restoration  
							
							... 
							
							
							
							Prompting the user to reset session on invalid ciphertext 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								449eb8536b 
								
							
								 
							
						 
						
							
							
								
								System clock ( #677 )  
							
							... 
							
							
							
							* Show toast when client clock is out of sync
* Fixed syntactical misarrangements
* Simplify getServerTime method
* Futher simplify getServerTime method
* Update js/modules/loki_app_dot_net_api.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
* Update js/modules/loki_app_dot_net_api.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
* Update loki_app_dot_net_api.js
Use cached timestamp value
* Update preload.js
Update some values to function scope
* Updated syntax
* Semifinal changes
* Improved efficiency and eliminated need for restart on clock update
* Remove await and immediately invoked function 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ca0e1f995c 
								
							
								 
							
						 
						
							
							
								
								handle public group updates differently  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3abf3b14a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #661  from sachaaaaa/encrypted_avatar  
							
							... 
							
							
							
							Encrypted profile pic 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								19786108a3 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a29f0a4120 
								
							
								 
							
						 
						
							
							
								
								encrypted pictures for public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c52a1d038 
								
							
								 
							
						 
						
							
							
								
								encrypt and decrypt images before upload and after download  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								061556bb7d 
								
							
								 
							
						 
						
							
							
								
								trigger showUserDetails on message's avatar clicks  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								81bfa90943 
								
							
								 
							
						 
						
							
							
								
								Prompting the user to reset session on invalid ciphertext  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ab0d084f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from msgmaxim/group-invites  
							
							... 
							
							
							
							Public chat invitations 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6cde9aa263 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #638  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							Public Chat - home server refactor / read public chat avatars from home server 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								89e5e919f2 
								
							
								 
							
						 
						
							
							
								
								Address more review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ea82b14e3 
								
							
								 
							
						 
						
							
							
								
								Add channel id field to invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f52080eed 
								
							
								 
							
						 
						
							
							
								
								immediately set profile name on public chat servers when you update it  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db0068b429 
								
							
								 
							
						 
						
							
							
								
								Sending and handling of special UNPAIRING_REQUEST message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8cd8c8d4f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #610  from msgmaxim/profile-pictures  
							
							... 
							
							
							
							Enable custom profile pictures 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								207e3d022f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'profile-pictures' of  https://github.com/msgmaxim/loki-messenger  into multidevice-publicchat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e1554496d2 
								
							
								 
							
						 
						
							
							
								
								convert LokiFileServerAPI to factory and use establishHomeConnection, lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a08ac9cc1 
								
							
								 
							
						 
						
							
							
								
								Use avatar specific endpoint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								40208442e6 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8850d9bcce 
								
							
								 
							
						 
						
							
							
								
								Only set when account already created  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0b41ef0983 
								
							
								 
							
						 
						
							
							
								
								Ensure primaryDevicePubKey is always defined in storage  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2e8e6480f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #539  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							[multi-device] public chat 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bd17c4b026 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f1c155b943 
								
							
								 
							
						 
						
							
							
								
								Stop sending sync messages to public chats and mark messages from any of our devices as outgoing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								807f4cbd2a 
								
							
								 
							
						 
						
							
							
								
								Storing primary device pubkey on the conversation model for easier access, ensuring that we accept all the friend requests from the primary conversation rather than the secondary  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								030264c689 
								
							
								 
							
						 
						
							
							
								
								Fix misuse of getAllDevicePubKeysForPrimaryPubKey and rename some vars  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6611a10855 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #590  from BeaudanBrown/session-reset-on-fr  
							
							... 
							
							
							
							Session reset on fr 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								370dee5abb 
								
							
								 
							
						 
						
							
							
								
								Ensure we have the correct apis and listeners during the pairing process. Catch upnp error. Remove redundant friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c31535edb4 
								
							
								 
							
						 
						
							
							
								
								Rename blockSync, only send contacts and profile if sending a GRANT request, do *not* always be friends with secondary devices because we still need to complete a friend request exchange  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								332cd30052 
								
							
								 
							
						 
						
							
							
								
								Send contact sync message when becoming friends with contact and auto accept/send friend requests when receiving contact sync  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e88aca57f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #603  from sachaaaaa/Fix_secondary_nickname  
							
							... 
							
							
							
							[multi-device] Fix secondary nickname 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0f74a002df 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #601  from BeaudanBrown/sync-messages  
							
							... 
							
							
							
							[multi-device] Sync messages 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								15c07ea7df 
								
							
								 
							
						 
						
							
							
								
								Sync secondary devices again but handle the receiving of them properly  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								41fdcef695 
								
							
								 
							
						 
						
							
							
								
								Ensure that we can't miss the apisReady event and only listen for single emit  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dc626ec4d0 
								
							
								 
							
						 
						
							
							
								
								use primary device pubkey when setting nickname  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7e275ac266 
								
							
								 
							
						 
						
							
							
								
								Don't sync secondary devices and make sure initAPIs has been called before sending friend requests to synced contacts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c05939f55 
								
							
								 
							
						 
						
							
							
								
								Add group admins and the ability to remove members from private groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf18572049 
								
							
								 
							
						 
						
							
							
								
								Adding new group members; establishing sessions between non-friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d19b708f9 
								
							
								 
							
						 
						
							
							
								
								Creating private group chats between friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								65361d33f5 
								
							
								 
							
						 
						
							
							
								
								New menu item "show pairing words" for secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9dc3b531e 
								
							
								 
							
						 
						
							
							
								
								Simplify auto accept check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ccf62ed4e 
								
							
								 
							
						 
						
							
							
								
								Trigger endSession code if we receive a friend request from a friend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3ba71fad9e 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5e1e70ac8c 
								
							
								 
							
						 
						
							
							
								
								Enable link previews by default  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4e70b66131 
								
							
								 
							
						 
						
							
							
								
								Extract the async token grab from the server api constructor and put in the factory. Fix up the areas this affects  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5d2f7ddb20 
								
							
								 
							
						 
						
							
							
								
								Add messages needed for UI, bit of house work  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								39fac5fd02 
								
							
								 
							
						 
						
							
							
								
								Add initial add server UI skeleton  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cbee5a884c 
								
							
								 
							
						 
						
							
							
								
								Secondary device to update device mapping to server after lokiFileServerAPI creation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								73d90a5277 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #537  from sachaaaaa/secondary_device_minimum_receiver  
							
							... 
							
							
							
							[multi-device] Start all the receivers only after the secondary registration is fini… 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc04bee38a 
								
							
								 
							
						 
						
							
							
								
								Start all the receivers only after the secondary registration is finished  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a8ab00a96 
								
							
								 
							
						 
						
							
							
								
								Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b63d8ec84f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							... 
							
							
							
							* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ... 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7756d4f0f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into PR_file_server  
							
							... 
							
							
							
							* clearnet:
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  allow mixpanel to be already set up elsewhere
  Address review comments
  Add missing file in tests
  Add UI elements for searching and selecting members in a group chat
  Desktop Analytics
  Replaced value with a descriptive constant.
  Add comment to fix up confusion.
  Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.
# Conflicts:
#	js/background.js
#	js/modules/loki_public_chat_api.js 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								51eaa90823 
								
							
								 
							
						 
						
							
							
								
								use window.mixpanel, remove eventEmitter  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f8e9e1d3bd 
								
							
								 
							
						 
						
							
							
								
								Remove rejected authorisation from database  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e07f81c150 
								
							
								 
							
						 
						
							
							
								
								Add LokiFileServerAPI  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c921d3e3b3 
								
							
								 
							
						 
						
							
							
								
								allow mixpanel to be already set up elsewhere  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								88b44390bf 
								
							
								 
							
						 
						
							
							
								
								Desktop Analytics  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d3653e8665 
								
							
								 
							
						 
						
							
							
								
								lint after manual merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6de6b762e6 
								
							
								 
							
						 
						
							
							
								
								Ensure the latest contact signed prekey is used  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								51f161a613 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #498  from Mikunj/mod-badges  
							
							... 
							
							
							
							Mod badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f9df221638 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #497  from sachaaaaa/prevent_multiple_retrievers  
							
							... 
							
							
							
							[multi-device] Ensure API objects are inited only once 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								025ad10fc5 
								
							
								 
							
						 
						
							
							
								
								Ensure API objects are inited only once  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9fe613967a 
								
							
								 
							
						 
						
							
							
								
								Fix duplicate detection for sent messages in public chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b10835ffc7 
								
							
								 
							
						 
						
							
							
								
								Share contact upon authorising secondary device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b3e2a5aba8 
								
							
								 
							
						 
						
							
							
								
								move refreshModStatus into constructor of channelAPI, just instantiate channelAPI now  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								35b6182074 
								
							
								 
							
						 
						
							
							
								
								Clean up after account registration failure  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								48b6bf54c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #461  from Mikunj/qr-code  
							
							... 
							
							
							
							Pubkey QR code 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a6abcaf826 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #453  from Mikunj/profile-simplification  
							
							... 
							
							
							
							Profile simplification 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								831ae09576 
								
							
								 
							
						 
						
							
							
								
								Cherry pick "profile simplification" from Mik  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								27976a053c 
								
							
								 
							
						 
						
							
							
								
								Save the last retrieved message for public chats on the conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ef8b515d70 
								
							
								 
							
						 
						
							
							
								
								Make sure we only initialise special conversations after both registration and storage load have complete  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8066affd2c 
								
							
								 
							
						 
						
							
							
								
								Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d77d6fd79 
								
							
								 
							
						 
						
							
							
								
								All the API updates, enable mod status retrieval and allow for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4ecc5b389 
								
							
								 
							
						 
						
							
							
								
								A prepare for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4dd10a5cd 
								
							
								 
							
						 
						
							
							
								
								Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f7787ecf7 
								
							
								 
							
						 
						
							
							
								
								Add token retrieval functions to public chat api  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7e0217dca8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #439  from sachaaaaa/registration_done_secondary  
							
							... 
							
							
							
							[multi-device] Prevent showing inbox if secondary registration is ongoing 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c052a65a2 
								
							
								 
							
						 
						
							
							
								
								Display incoming messages in the primary device conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								415ea7992c 
								
							
								 
							
						 
						
							
							
								
								Prevent showing inbox if secondary device registration is still ongoing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b5aee4f4be 
								
							
								 
							
						 
						
							
							
								
								Display "Pair New Device" in menu for non-secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								895cedc801 
								
							
								 
							
						 
						
							
							
								
								Lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3f4b94ba74 
								
							
								 
							
						 
						
							
							
								
								Transition to initialising rss feeds in schema update  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								48f2637ff9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								962469a54c 
								
							
								 
							
						 
						
							
							
								
								messenger and loki.network feeds  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c57571fdfd 
								
							
								 
							
						 
						
							
							
								
								loki.network rss feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c9f433fbba 
								
							
								 
							
						 
						
							
							
								
								Save message id when sending/receiving to/from public server and lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f857744e88 
								
							
								 
							
						 
						
							
							
								
								Revert sending id  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f7039080af 
								
							
								 
							
						 
						
							
							
								
								Remove accidental swapfile, save messages with the id given to them from public server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								143bf1bdc1 
								
							
								 
							
						 
						
							
							
								
								Fill out unregister channel stub, trigger unregister channel on conversation deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								014558d939 
								
							
								 
							
						 
						
							
							
								
								Squash and clean of old PRs, move towards sending cleartext again  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dd7bf1b2bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #370  from msgmaxim/clipboard  
							
							... 
							
							
							
							Add a button to paste pubkey from clipboard if valid 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cdd374a4b2 
								
							
								 
							
						 
						
							
							
								
								Add a toggle option for typing indicators; use short ttl for them  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d0e73ed7f8 
								
							
								 
							
						 
						
							
							
								
								Add a button to paste pubkey from clipboard if valid  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								df2c4af67c 
								
							
								 
							
						 
						
							
							
								
								Run lint and check for ip or address when removing unreachable nodes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								580931c4fb 
								
							
								 
							
						 
						
							
							
								
								Pass ourKey to message api, initialise these APIs after registration or when storage is ready so we always have ourKey  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								676cebdce4 
								
							
								 
							
						 
						
							
							
								
								Fix async  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								37e95cf7d2 
								
							
								 
							
						 
						
							
							
								
								remove unnecessary await  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c53633e367 
								
							
								 
							
						 
						
							
							
								
								Clearnet p2p with https (no verification yet)  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d12f6b6d32 
								
							
								 
							
						 
						
							
							
								
								Handle swarm nodes the same for us or contacts, attach our key to message api object  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e520bf109a 
								
							
								 
							
						 
						
							
							
								
								Persist PoW difficulty and update if get response from snodes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2c12c8a1d8 
								
							
								 
							
						 
						
							
							
								
								Convert profile field in data message to use LokiProfile instead of signal Contact.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								796181e00c 
								
							
								 
							
						 
						
							
							
								
								Add database functions for storing, retrieving and cleaning last hash for snodes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c8ea2e9463 
								
							
								 
							
						 
						
							
							
								
								Download and install updates without the help of electron-updater  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								782516186f 
								
							
								 
							
						 
						
							
							
								
								Move expiring message cleanup after ConversationController.load()  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14367620d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d0d57ea8c7 
								
							
								 
							
						 
						
							
							
								
								Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								df93c97b48 
								
							
								 
							
						 
						
							
							
								
								Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad53423e0a 
								
							
								 
							
						 
						
							
							
								
								Queue quote reference handling per convo in handleDataMessage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5165eb3bd4 
								
							
								 
							
						 
						
							
							
								
								On database error: show popup, allow user to delete and relaunch  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								77ae717b9b 
								
							
								 
							
						 
						
							
							
								
								Clean up shutdown handling - stop processing incoming messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b00a0cb699 
								
							
								 
							
						 
						
							
							
								
								Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c540ab977 
								
							
								 
							
						 
						
							
							
								
								Add cache support to Signal Protocol Store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7564e270f8 
								
							
								 
							
						 
						
							
							
								
								Lint and code cleanup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								725a41a8d7 
								
							
								 
							
						 
						
							
							
								
								Added link preview setting.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f900a08eda 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #177  from sachaaaaa/merge_1_21_0  
							
							... 
							
							
							
							Merge Signal 1.21.0 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f92e8485f8 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							... 
							
							
							
							Added gitattributes 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								b8aa60b95d 
								
							
								 
							
						 
						
							
							
								
								Added loki icon.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								feb8af476a 
								
							
								 
							
						 
						
							
							
								
								Refactored BlockedNumberController.  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								235dbb2176 
								
							
								 
							
						 
						
							
							
								
								Added display of message ttl in settings.  
							
							... 
							
							
							
							Fixed setting message ttl. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								87113b6cc1 
								
							
								 
							
						 
						
							
							
								
								Added message ttl setting storage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								47f834cf5c 
								
							
								 
							
						 
						
							
							
								
								Encrypt device name on account create, on first launch if needed  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0491ceacf1 
								
							
								 
							
						 
						
							
							
								
								Added seed dialog.  
							
							... 
							
							
							
							Fixed issue where incorrect language was used to generate seed. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0b87f13699 
								
							
								 
							
						 
						
							
							
								
								Added password dialog view.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								26ba553e6a 
								
							
								 
							
						 
						
							
							
								
								Added menu options to set, change and remove password.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								962c947605 
								
							
								 
							
						 
						
							
							
								
								Prevent "secure session reset succeeded" message from being cleaned up at startup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								570a7f5bf8 
								
							
								 
							
						 
						
							
							
								
								Fix header not updating when editing nickname.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2de01d0343 
								
							
								 
							
						 
						
							
							
								
								Back to multiple pending states, fix some notification bugs and friend requests should now work for all cases besides message sending interruption  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06f79eb3fd 
								
							
								 
							
						 
						
							
							
								
								Allow user to set display name when registering.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								62135a1810 
								
							
								 
							
						 
						
							
							
								
								Added a section below conversation list.  
							
							... 
							
							
							
							Fixed scrolling on conversations. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								313d08344a 
								
							
								 
							
						 
						
							
							
								
								Request configuration sync on startup of new version  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								18d638fdbf 
								
							
								 
							
						 
						
							
							
								
								Fix sending and receiving profile.  
							
							... 
							
							
							
							Don't delete profile after if we set the display name to empty. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								610a305e23 
								
							
								 
							
						 
						
							
							
								
								Added localised strings.  
							
							... 
							
							
							
							Only override name when editing profile. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ac4e04912c 
								
							
								 
							
						 
						
							
							
								
								Minor language fixes.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14ee7fec65 
								
							
								 
							
						 
						
							
							
								
								Moved and nicknames into conversations.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								98c4b5d77b 
								
							
								 
							
						 
						
							
							
								
								Added editing own nickname.  
							
							... 
							
							
							
							Fix dark theme support.
Fix notification titles. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ce9d6a08c 
								
							
								 
							
						 
						
							
							
								
								Added nickname dialog.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								79a861a870 
								
							
								 
							
						 
						
							
							
								
								Typing Indicators  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b65d6a6d2c 
								
							
								 
							
						 
						
							
							
								
								Refactor friend request status to use a state enum variable  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d37b02421c 
								
							
								 
							
						 
						
							
							
								
								Merge commit '96595a46d81b2d7361dfde213392e203b18ee279' into fix/prekey-saving  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0dabce9e28 
								
							
								 
							
						 
						
							
							
								
								Remove preKeyBundle from message.  
							
							... 
							
							
							
							Always save preKeyBundles if we receive them.
Always override preKeys when saving. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								19b6698a24 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #53  from BeaudanBrown/read-receipts  
							
							... 
							
							
							
							Read receipts setting 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bed9ce5be2 
								
							
								 
							
						 
						
							
							
								
								Added read receipt checkbox to the settings window which enables or disables the sending and receiving of read receipts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbdd52b4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from Mikunj/fix/friend-request  
							
							... 
							
							
							
							Friend request fixes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dba6a36e83 
								
							
								 
							
						 
						
							
							
								
								removed old unused code.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								110387508f 
								
							
								 
							
						 
						
							
							
								
								UI fixes.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a3a7f4a621 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'ef44a123ed4ada70489d78fde16a86c60ced34a8' into feature/blocking  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								489ec8fc65 
								
							
								 
							
						 
						
							
							
								
								Heap of linting, eslint warning/error removal, and fixed a couple small bugs found along the way  
							
							... 
							
							
							
							Created new table to store the received message hashes. Checking this table when receiving messages to look for duplicates. Should be cleared of expired messages on app start and every hour after
Removed id which was not needed for seen messages. Refactored filter logic into function and found function name error
create unique index for contact prekeys (to allow using REPLACE)
Fixed lint stuff that merge brought back 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a82999818a 
								
							
								 
							
						 
						
							
							
								
								Added blocking/unblocking from friend request.  
							
							... 
							
							
							
							Fixed incoming messages being deleted. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8cc9b7b54b 
								
							
								 
							
						 
						
							
							
								
								Added blocked number model and collection.  
							
							... 
							
							
							
							Added blocked number controller.
Hooked up BlockedNumberController loading. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								34f43088ff 
								
							
								 
							
						 
						
							
							
								
								Fix incoming messages being deleted on startup.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4148628e70 
								
							
								 
							
						 
						
							
							
								
								Remove any unsent messages when app is started.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ece266fffd 
								
							
								 
							
						 
						
							
							
								
								Added showing pow icon.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d3fb17e61 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sig-development' into merge/signal  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5e48efc935 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'd94365f1c6dbb315f67f29b47982b5f24bd11f5f' into feature/friend-request  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2451ffdca4 
								
							
								 
							
						 
						
							
							
								
								Comment out signal-specific logic introduced in latest merge  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ecf3f18762 
								
							
								 
							
						 
						
							
							
								
								Improve our deletion of IndexedDB post-SQLCipher migration  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6300256a3e 
								
							
								 
							
						 
						
							
							
								
								Gracefully shut down database operations before app exit  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fca5a74da3 
								
							
								 
							
						 
						
							
							
								
								Fixed review issues.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c583819ccf 
								
							
								 
							
						 
						
							
							
								
								Fixed view layouts after deleting a conversation.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0a88f337d5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sig-development' into merge/signal  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b9e85bb141 
								
							
								 
							
						 
						
							
							
								
								Added handling of accept and decline events.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2d48daa7b6 
								
							
								 
							
						 
						
							
							
								
								Refine Sealed Sender behaviors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f589fdac5c 
								
							
								 
							
						 
						
							
							
								
								Merge signal changes into branch.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fb670ad6b9 
								
							
								 
							
						 
						
							
							
								
								Remove IndexedDB files after removing IndexedDB database  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e08c5e3307 
								
							
								 
							
						 
						
							
							
								
								Add current message counter to the log to help with debugging  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e2e0e4c96b 
								
							
								 
							
						 
						
							
							
								
								Refine sealed sender logic  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1755e0adfd 
								
							
								 
							
						 
						
							
							
								
								Move all remaining stores to SQLCipher  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a7d78c0e9b 
								
							
								 
							
						 
						
							
							
								
								Sealed Sender support  
							
							... 
							
							
							
							https://signal.org/blog/sealed-sender/  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								739bd4dbda 
								
							
								 
							
						 
						
							
							
								
								Request contact sync only on the first connect after upgrade  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2060118e85 
								
							
								 
							
						 
						
							
							
								
								Remove messages/conversations/unprocessed IndexedDB object stores  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e1ffe582c3 
								
							
								 
							
						 
						
							
							
								
								Prompt user when an incoming friend request is received  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9370e2b74a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							... 
							
							
							
							* 'master' of https://github.com/signalapp/Signal-Desktop : (38 commits)
  v1.17.0
  v1.17.0-beta.4
  Ensure that blue group avatars are preserved in dark theme
  Android theme: Incoming quotes take color from containing message
  Conversations have blue avatar backgrounds if no image provided
  Fix lint errors
  Add ca language
  inboxView: Ensure Conversation exists for our own number
  Ensure that file is not attached if we've filtered it
  v1.17.0-beta.3
  Localization updates
  v1.16.3
  Lint fixes
  Lint fixes
  Better handle large numbers of messages in cache on startup
  Keep object stores after conversations migrate to SQLCipher
  Longer timeout for orphaned file cleanup
  Tests and increase consistency for isFileDangerous calls
  Longer timeout for orphaned file cleanup
  v1.17.0-beta.2
  ...
# Conflicts:
#	background.html
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7532f397ea 
								
							
								 
							
						 
						
							
							
								
								Keep object stores after conversations migrate to SQLCipher  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7d9711ba65 
								
							
								 
							
						 
						
							
							
								
								Restore iOS-specific theme; colors on left in android theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3b8f934741 
								
							
								 
							
						 
						
							
							
								
								On startup, if we've just upgraded to a new version, contact sync  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								10c53bddb0 
								
							
								 
							
						 
						
							
							
								
								Move to new colors, switch incoming/outgoing colors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cd60bdd08a 
								
							
								 
							
						 
						
							
							
								
								Move conversations to SQLCipher  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								33ad509fbf 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							... 
							
							
							
							# Conflicts:
#	_locales/ar/messages.json
#	_locales/es_419/messages.json
#	_locales/he/messages.json
#	_locales/hi/messages.json
#	_locales/hr/messages.json
#	_locales/kn/messages.json
#	_locales/ko/messages.json
#	_locales/mk/messages.json
#	_locales/sr/messages.json
#	_locales/uk/messages.json
#	_locales/vi/messages.json
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								814b9cf26a 
								
							
								 
							
						 
						
							
							
								
								Only accept 'you left group' messages when group blocked  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c399624cc 
								
							
								 
							
						 
						
							
							
								
								Support for blocking groups on mobile, via group/blocked syncs  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8584a79352 
								
							
								 
							
						 
						
							
							
								
								Don't treat sends to a group with unregistered users as an error  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9638639045 
								
							
								 
							
						 
						
							
							
								
								Bypass SMS verification  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9f920aa35b 
								
							
								 
							
						 
						
							
							
								
								Re-enable orphaned attachment cleanup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fedfbed304 
								
							
								 
							
						 
						
							
							
								
								Copy quoted message contents into quote on receipt  
							
							... 
							
							
							
							Also:
  - visually distinguish any reference we couldn't verify on receipt
  - show toast on quote click if we can't scroll to message
  - toast visuals redesigned to match rest of app 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0eb2c958a5 
								
							
								 
							
						 
						
							
							
								
								Handle contact: don't exit early if timer is 'invalid'  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								621883a0ce 
								
							
								 
							
						 
						
							
							
								
								Disable drag and drop if it's not a file attachment  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7983300f4a 
								
							
								 
							
						 
						
							
							
								
								Use base64 strings for incoming message cache instead of binary  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								727925a266 
								
							
								 
							
						 
						
							
							
								
								Clean up old messages, better handle errors from sending  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								44dec45995 
								
							
								 
							
						 
						
							
							
								
								Ensure that all messages in cache are migrated properly  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d7987108b 
								
							
								 
							
						 
						
							
							
								
								Show and log progress during the SQLCipher migration  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1e8f71f035 
								
							
								 
							
						 
						
							
							
								
								Make settings and debug log available during initial migrations  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b1c6a5fe19 
								
							
								 
							
						 
						
							
							
								
								When updating message schema pre-SQLCipher, use legacy save  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3105b77475 
								
							
								 
							
						 
						
							
							
								
								Migrate to SQLCipher for messages/cache  
							
							... 
							
							
							
							Quite a few other fixes, including:
  - Sending to contact with no avatar yet (not synced from mobile)
  - Left pane doesn't update quickly or at all on new message
  - Left pane doesn't show sent or error status
Also:
 - Contributing.md: Ensure set of linux dev dependencies is complete 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aa4339a69f 
								
							
								 
							
						 
						
							
							
								
								Preserve migration state when deleting config due to failed login  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								02675312c5 
								
							
								 
							
						 
						
							
							
								
								Introduce mandatary migration on startup, to minimum version  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f39a96bc76 
								
							
								 
							
						 
						
							
							
								
								Move to centralized message/cache data layer  
							
							... 
							
							
							
							Also, ensure that conversation.messageCollection has nothing in it
unless it has an associated ConversationView. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								34231168a7 
								
							
								 
							
						 
						
							
							
								
								On message delete, ensure that all external files are deleted  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								80dd25e995 
								
							
								 
							
						 
						
							
							
								
								Preload all icon images to reduce flickering when they are used  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bffa910c64 
								
							
								 
							
						 
						
							
							
								
								Remove too-verbose logging on contact sync  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b3f9e969a 
								
							
								 
							
						 
						
							
							
								
								Ensure a theme is selected on initial load  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5933a34a18 
								
							
								 
							
						 
						
							
							
								
								Use window.log in browser context, turn on console eslint rule  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f2a63c99ed 
								
							
								 
							
						 
						
							
							
								
								Streamline code to clean logs based on version number  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								12f1932d02 
								
									
								
							
								 
							
						 
						
							
							
								
								Workaround for linux w/tmp mounted as noexec; spellcheck fails ( #2548 )  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c517e4193b 
								
							
								 
							
						 
						
							
							
								
								New option: Disable spell check  
							
							
							
						 
						
							7 years ago