4d3fb17e61 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sig-development' into merge/signal  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								557fed11f3 
								
							
								 
							
						 
						
							
							
								
								Only display retry send button if the request is pending.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d08a74d53 
								
							
								 
							
						 
						
							
							
								
								Updated FriendRequest to be more consistent with the other typescript components.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f45e0030c4 
								
							
								 
							
						 
						
							
							
								
								Added status display and retry send to friend request.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fc3cb9c46d 
								
							
								 
							
						 
						
							
							
								
								Replace old pending messages with new one when adding a new incoming friend request.  
							
							... 
							
							
							
							More refactoring. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4610b63fb7 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0a23888875 
								
							
								 
							
						 
						
							
							
								
								Fix up friend request message layout  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0a88f337d5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sig-development' into merge/signal  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c150cbe34f 
								
							
								 
							
						 
						
							
							
								
								Friend request message indicator.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9dc19044b9 
								
							
								 
							
						 
						
							
							
								
								Handle the case where the user is sending a friend request.  
							
							... 
							
							
							
							Fix up styling for outgoing message. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								08ca779fe1 
								
							
								 
							
						 
						
							
							
								
								Fixed up friend request message display  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5626cfe47d 
								
							
								 
							
						 
						
							
							
								
								Added FriendRequest message  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								1755e0adfd 
								
							
								 
							
						 
						
							
							
								
								Move all remaining stores to SQLCipher  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a7d78c0e9b 
								
							
								 
							
						 
						
							
							
								
								Sealed Sender support  
							
							... 
							
							
							
							https://signal.org/blog/sealed-sender/  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6656469f5f 
								
							
								 
							
						 
						
							
							
								
								Update lint exceptions  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7789beec64 
								
							
								 
							
						 
						
							
							
								
								Calculate warning properly for all methods of attachment download  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								639c3e9a4f 
								
							
								 
							
						 
						
							
							
								
								fix app name from previous merge  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								2b5f6d8b5e 
								
							
								 
							
						 
						
							
							
								
								Ensure that blue group avatars are preserved in dark theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fbaef50c4a 
								
							
								 
							
						 
						
							
							
								
								Android theme: Incoming quotes take color from containing message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f21f83a163 
								
							
								 
							
						 
						
							
							
								
								Conversations have blue avatar backgrounds if no image provided  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4514152320 
								
							
								 
							
						 
						
							
							
								
								Fix lint errors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								10bd12d622 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bc0ec92ad2 
								
							
								 
							
						 
						
							
							
								
								Tests and increase consistency for isFileDangerous calls  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0850dc368a 
								
							
								 
							
						 
						
							
							
								
								Lint fixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7d9711ba65 
								
							
								 
							
						 
						
							
							
								
								Restore iOS-specific theme; colors on left in android theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ca61c9cb85 
								
							
								 
							
						 
						
							
							
								
								Warnings for dangerous files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								04b45f6aa1 
								
							
								 
							
						 
						
							
							
								
								Decrypt friend-request messages (the ones using fallback encryption). Moved logic into a new file libloki-protocol.js and concat loki code into js/libloki.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								37822d2ef4 
								
							
								 
							
						 
						
							
							
								
								Update lint exceptions  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a8e12d0771 
								
							
								 
							
						 
						
							
							
								
								Add user's avatar to the top left of the screen  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f3e3b7aaf 
								
							
								 
							
						 
						
							
							
								
								Update to new design for avatars: individual/group icons/colors  
							
							... 
							
							
							
							And two initials. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cf16ced91c 
								
							
								 
							
						 
						
							
							
								
								Unread badge is now attached to avatar in left pane  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								10c53bddb0 
								
							
								 
							
						 
						
							
							
								
								Move to new colors, switch incoming/outgoing colors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cd60bdd08a 
								
							
								 
							
						 
						
							
							
								
								Move conversations to SQLCipher  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								22a86b5351 
								
							
								 
							
						 
						
							
							
								
								store key bundle status in conversation model  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c13b91a790 
								
							
								 
							
						 
						
							
							
								
								Update linter exceptions after update  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ecb126e74c 
								
									
								
							
								 
							
						 
						
							
							
								
								Custom linter to check code quality ( #2753 )  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c399624cc 
								
							
								 
							
						 
						
							
							
								
								Support for blocking groups on mobile, via group/blocked syncs  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8290146721 
								
							
								 
							
						 
						
							
							
								
								Show generic attachment for non-loading/too-large images/videos  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								006700f9a2 
								
							
								 
							
						 
						
							
							
								
								Properly style countdown icon in iOS light/dark themes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								37f3054976 
								
							
								 
							
						 
						
							
							
								
								Both UI timer and database timer will remove expired message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3d56276a8 
								
							
								 
							
						 
						
							
							
								
								Conversations now better take advantage of wide screens  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								a247ffe5cf 
								
							
								 
							
						 
						
							
							
								
								When iOS device has been linked, use iOS color scheme  
							
							
							
						 
						
							7 years ago