08cc218364 
								
							
								 
							
						 
						
							
							
								
								Fixed orderin of toasts with Maps  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e7a08b696b 
								
							
								 
							
						 
						
							
							
								
								make sure isPublic/isRss are boolean values  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02d23e972c 
								
							
								 
							
						 
						
							
							
								
								Optimisations and SASS simplifcation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fc235d6057 
								
							
								 
							
						 
						
							
							
								
								Completed message selection  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0c4f57e57d 
								
							
								 
							
						 
						
							
							
								
								Added session button types and session button colors  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								98b4b18583 
								
							
								 
							
						 
						
							
							
								
								Added message selection inital functionality and added to buttons  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								027bb76989 
								
							
								 
							
						 
						
							
							
								
								setPublicSource now marks convo active, make getPublicSendData use the lokiPublicChatAPI findOrCreateChannel, add some warnings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3abf3b14a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #661  from sachaaaaa/encrypted_avatar  
							
							... 
							
							
							
							Encrypted profile pic 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								19786108a3 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								acc19985f5 
								
							
								 
							
						 
						
							
							
								
								allow removing picture when avatar set to null (currently only possible via mobile)  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a29f0a4120 
								
							
								 
							
						 
						
							
							
								
								encrypted pictures for public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5b7baaf357 
								
							
								 
							
						 
						
							
							
								
								enable profile sharing after becoming friends for private messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1020f54b60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #662  from Bilb/655-clickable-profile  
							
							... 
							
							
							
							clickable profile 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2e83881373 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #652  from vincentbavitz/public-ban  
							
							... 
							
							
							
							Public ban 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								64996844ac 
								
							
								 
							
						 
						
							
							
								
								Updated references to hasModPerms to isModerator for code consistency  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0643c6836c 
								
							
								 
							
						 
						
							
							
								
								Cached constants for readability  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a7a2f9289c 
								
							
								 
							
						 
						
							
							
								
								Updated references to hasModPerms to isModerator for code consistency  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9068d56ce 
								
							
								 
							
						 
						
							
							
								
								Updated isModerator to senderIsModerator and fixed logic of isModerator function  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								81bfa90943 
								
							
								 
							
						 
						
							
							
								
								Prompting the user to reset session on invalid ciphertext  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7ed103f286 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #651  from msgmaxim/original-message  
							
							... 
							
							
							
							Check again for quoted messages after a short timeout 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								43a91ab672 
								
							
								 
							
						 
						
							
							
								
								Linted  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bee5a89f14 
								
							
								 
							
						 
						
							
							
								
								Show toast on user ban  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ab0d084f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from msgmaxim/group-invites  
							
							... 
							
							
							
							Public chat invitations 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d562a88583 
								
							
								 
							
						 
						
							
							
								
								Check again for quoted messages after a short timeout  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2bbc1ecf63 
								
							
								 
							
						 
						
							
							
								
								Make ban user; handle server request  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3d171884d 
								
							
								 
							
						 
						
							
							
								
								Added ban user right click functionality  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								56bb2ed792 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ea82b14e3 
								
							
								 
							
						 
						
							
							
								
								Add channel id field to invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d50c21b29 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #635  from msgmaxim/context-menu-select  
							
							... 
							
							
							
							Don't select messages when context menu is shown 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d47f305ca 
								
							
								 
							
						 
						
							
							
								
								add missing await  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8b2876dadc 
								
							
								 
							
						 
						
							
							
								
								Disable context menu and message selection for RSS feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2262b41cd7 
								
							
								 
							
						 
						
							
							
								
								Prevent hiding the context menu by clicking away to also potentially select messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6c28b1aa79 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #623  from loki-project/multi-device  
							
							... 
							
							
							
							Multi device 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d1c450a213 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #621  from msgmaxim/select-messages  
							
							... 
							
							
							
							Prevent clicking on quote from selecting the message 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								6c4fa6986b 
								
							
								 
							
						 
						
							
							
								
								Prevent clicking on quote from selecting the message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f1c155b943 
								
							
								 
							
						 
						
							
							
								
								Stop sending sync messages to public chats and mark messages from any of our devices as outgoing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b42a8aab1f 
								
									
								
							
								 
							
						 
						
							
							
								
								Typo  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								24a687c106 
								
							
								 
							
						 
						
							
							
								
								Throttle the refreshing of device mappings to once every minute  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6611a10855 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #590  from BeaudanBrown/session-reset-on-fr  
							
							... 
							
							
							
							Session reset on fr 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								027e17f7d0 
								
							
								 
							
						 
						
							
							
								
								Reset multi selection when conversation is deleted/changed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								accd16cae1 
								
							
								 
							
						 
						
							
							
								
								Trigger friend request received update for the correct device conversation, throttle the sending of automated friend requests and don't send them to devices which sent *us* a friend request  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c96990119 
								
							
								 
							
						 
						
							
							
								
								Correctly handle server errors in multi-deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f16b032056 
								
							
								 
							
						 
						
							
							
								
								Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								395daf3aba 
								
							
								 
							
						 
						
							
							
								
								Use Array.includes in place of Array.indexOf  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2f836c690 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								f5e9a870f7 
								
							
								 
							
						 
						
							
							
								
								Add support for mentions in 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  
				
					
						
							
							
								 
						
							
							
								1f4af59dad 
								
							
								 
							
						 
						
							
							
								
								Delete public chat messages locally if not stored on the server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9dc3b531e 
								
							
								 
							
						 
						
							
							
								
								Simplify auto accept check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								653fd06451 
								
							
								 
							
						 
						
							
							
								
								Don't await for some background messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ccf62ed4e 
								
							
								 
							
						 
						
							
							
								
								Trigger endSession code if we receive a friend request from a friend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc8277f54d 
								
							
								 
							
						 
						
							
							
								
								Better variable name and use it in more places  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								883feb668d 
								
							
								 
							
						 
						
							
							
								
								The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								aa66b28ffe 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #579  from BeaudanBrown/friends-with-any  
							
							... 
							
							
							
							Add isFriendsWithAnyDevice and use it in relevant places 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								76b36845bb 
								
							
								 
							
						 
						
							
							
								
								Add isFriendsWithAnyDevice and use it in relevant places  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08ad913105 
								
							
								 
							
						 
						
							
							
								
								Add explicit isSecondary flag to conversation list items so they can remain hidden in the menu after they become friends etc  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2f52995e18 
								
							
								 
							
						 
						
							
							
								
								Fix the delete messages button to not break the conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3635216db 
								
							
								 
							
						 
						
							
							
								
								Enable sending audio recordings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								22df66c08f 
								
							
								 
							
						 
						
							
							
								
								Fix missing await, fix undefined bug  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3019e12bf 
								
							
								 
							
						 
						
							
							
								
								Hide android friend request accepts and lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ac80ef0d4e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #557  from BeaudanBrown/add-server  
							
							... 
							
							
							
							Add server 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f538aeea50 
								
							
								 
							
						 
						
							
							
								
								Remove old link preview system  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								29e83cadbf 
								
							
								 
							
						 
						
							
							
								
								Check against null message body when detecting mentions  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								8d6fee4aec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								53bdf14321 
								
							
								 
							
						 
						
							
							
								
								refactor  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8be1c61f4c 
								
							
								 
							
						 
						
							
							
								
								Highlight conversations with unread mentions of the user  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f3311bc5d 
								
							
								 
							
						 
						
							
							
								
								Save device mappings upon accepting friend request + various fixes  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								51f161a613 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #498  from Mikunj/mod-badges  
							
							... 
							
							
							
							Mod badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0acea50acb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #490  from BeaudanBrown/incoming-public  
							
							... 
							
							
							
							Fix duplicate detection for sent messages in public chat 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c48ae80468 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #486  from Mikunj/profile-icons  
							
							... 
							
							
							
							Profile icons 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								72b3d02b52 
								
							
								 
							
						 
						
							
							
								
								Poll for moderators, store them on the conversation and use the list to determine our own mod status  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e5eab74b1b 
								
							
								 
							
						 
						
							
							
								
								Fix   #355  Display timestamp for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9fe613967a 
								
							
								 
							
						 
						
							
							
								
								Fix duplicate detection for sent messages in public chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								500a88dbab 
								
							
								 
							
						 
						
							
							
								
								Removed identicon.js  
							
							... 
							
							
							
							Updated profile image helper. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9beea2cbd3 
								
							
								 
							
						 
						
							
							
								
								Enforce curlies completely and lint with new settings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0c870d04e3 
								
							
								 
							
						 
						
							
							
								
								Stop polling when leaving public chat, only grab the most recent 100 messages on first poll  
							
							
							
						 
						
							6 years ago