Mikunj
							
						 
						
							 
							
							
							
								
							
								3eb193cca2 
								
							
								 
							
						 
						
							
							
								
								Added accordian  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								fbc3832cfb 
								
							
								 
							
						 
						
							
							
								
								Show friends in inbox.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								f900fc496d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #61  from Mikunj/feature/profile-nickname  
							
							 
							
							... 
							
							
							
							Added profile sharing and setting nicknames. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								fa63ce5ade 
								
							
								 
							
						 
						
							
							
								
								Review changes  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								35c89ea4d9 
								
							
								 
							
						 
						
							
							
								
								Big refactor, prekeybundle moved back to a content message  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								14ee7fec65 
								
							
								 
							
						 
						
							
							
								
								Moved and nicknames into conversations.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								98c4b5d77b 
								
							
								 
							
						 
						
							
							
								
								Added editing own nickname.  
							
							 
							
							... 
							
							
							
							Fix dark theme support.
Fix notification titles. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								449f44cc5a 
								
							
								 
							
						 
						
							
							
								
								Added changing user nicknames.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6ce9d6a08c 
								
							
								 
							
						 
						
							
							
								
								Added nickname dialog.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								05602b3281 
								
							
								 
							
						 
						
							
							
								
								Fix accessing $messageField before assignment  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								19b6698a24 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #53  from BeaudanBrown/read-receipts  
							
							 
							
							... 
							
							
							
							Read receipts setting 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Beaudan
							
						 
						
							 
							
							
							
								
							
								bed9ce5be2 
								
							
								 
							
						 
						
							
							
								
								Added read receipt checkbox to the settings window which enables or disables the sending and receiving of read receipts  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								dbdd52b4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from Mikunj/fix/friend-request  
							
							 
							
							... 
							
							
							
							Friend request fixes 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								4fd709be35 
								
							
								 
							
						 
						
							
							
								
								Removed unused state.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								628ec5fc76 
								
							
								 
							
						 
						
							
							
								
								Updated truncate length to 25.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								7d8719f250 
								
							
								 
							
						 
						
							
							
								
								Fix incoming friend request messages being deleted.  
							
							 
							
							... 
							
							
							
							Set pending outgoing friend requests to declined if we receive an incoming friend request.
Fix text input not blocking. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								dba6a36e83 
								
							
								 
							
						 
						
							
							
								
								removed old unused code.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								110387508f 
								
							
								 
							
						 
						
							
							
								
								UI fixes.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								6689802513 
								
							
								 
							
						 
						
							
							
								
								Truncate text to 15 characters.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a9c1f628a4 
								
							
								 
							
						 
						
							
							
								
								Switched to using html select.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								dbb92aa9c8 
								
							
								 
							
						 
						
							
							
								
								Added i18n messages.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ba390e354b 
								
							
								 
							
						 
						
							
							
								
								Added unblocking.  
							
							 
							
							... 
							
							
							
							Added styling.
Trigger changes on both conversation and messages when we block/unblock. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								658b2b0332 
								
							
								 
							
						 
						
							
							
								
								List blocked users in settings.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a82999818a 
								
							
								 
							
						 
						
							
							
								
								Added blocking/unblocking from friend request.  
							
							 
							
							... 
							
							
							
							Fixed incoming messages being deleted. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								ae2e2fa2ae 
								
							
								 
							
						 
						
							
							
								
								Updated UI in conversation to support user blocking behaviour.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								688f275262 
								
							
								 
							
						 
						
							
							
								
								pass in source, sourceDevice, timestamp and receivedAt when adding a friend request.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c583819ccf 
								
							
								 
							
						 
						
							
							
								
								Fixed view layouts after deleting a conversation.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							 
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								c150cbe34f 
								
							
								 
							
						 
						
							
							
								
								Friend request message indicator.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								b9e85bb141 
								
							
								 
							
						 
						
							
							
								
								Added handling of accept and decline events.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								5626cfe47d 
								
							
								 
							
						 
						
							
							
								
								Added FriendRequest message  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1a4adf2281 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into merge/signal  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f589fdac5c 
								
							
								 
							
						 
						
							
							
								
								Merge signal changes into branch.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								683d4f4106 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into feature/public-key-validation  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								61d15fdd57 
								
							
								 
							
						 
						
							
							
								
								Changed == to ===  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								9d342e8951 
								
							
								 
							
						 
						
							
							
								
								Show a message if user types in an invalid public key in search.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								28f6992085 
								
							
								 
							
						 
						
							
							
								
								Replaced var with const.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								8d9fbdb3df 
								
							
								 
							
						 
						
							
							
								
								Fix create conversation appearing even if you already have a conversation with the contact.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								7b1fbe362e 
								
							
								 
							
						 
						
							
							
								
								Allow choosing language for mnemonic seed  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								bbabeb34b8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #18  from sachaaaaa/mnemonic  
							
							 
							
							... 
							
							
							
							Allow registering using a mnemonic word list 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								e1ffe582c3 
								
							
								 
							
						 
						
							
							
								
								Prompt user when an incoming friend request is received  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
								
								
							
							
								
							
								143b1e883d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #17  from sachaaaaa/lock_input_friend_request  
							
							 
							
							... 
							
							
							
							Lock input after friend request is sent 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								1ce29d77c3 
								
							
								 
							
						 
						
							
							
								
								Moved mnemonic to node side. Added sc_reduce32 (asm) to generate privkey. Moved mnemonic languages to separate files.  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a418a9d23b 
								
							
								 
							
						 
						
							
							
								
								allow registering using a mnemonic word list (seed used as privKey for now)  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								5602f4bfff 
								
							
								 
							
						 
						
							
							
								
								Change placeholder in discussion  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								d4d0d05adf 
								
							
								 
							
						 
						
							
							
								
								Lock text input while waiting for friend request reply  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								b9cc17b81a 
								
							
								 
							
						 
						
							
							
								
								inboxView: Ensure Conversation exists for our own number  
							
							 
							
							
							
						 
						
							7 years ago