12b396ce7e 
								
									
								
							
								 
							
						 
						
							
							
								
								add option to send a message to a single device, or to all device except one  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f9f3117101 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'vinc/fr-fixes' into integration-test-logs-rebased  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f5bdcca569 
								
							
								 
							
						 
						
							
							
								
								pending request filters  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2378574519 
								
							
								 
							
						 
						
							
							
								
								Testing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								307fdd1bd6 
								
							
								 
							
						 
						
							
							
								
								Finalisation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1b345bce42 
								
							
								 
							
						 
						
							
							
								
								Simplification  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f9b3ce5ea 
								
							
								 
							
						 
						
							
							
								
								Updated comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1cd716d053 
								
							
								 
							
						 
						
							
							
								
								Removed comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								632de4e9c7 
								
									
								
							
								 
							
						 
						
							
							
								
								handleDataMessage: handle messages as coming from primaryDevice  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e399b9b65b 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								aa6371b6b0 
								
									
								
							
								 
							
						 
						
							
							
								
								fix bug friend request being auto accepted by unknown user from their secondary device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								19cf4fa54b 
								
							
								 
							
						 
						
							
							
								
								Set profile name  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9c7f5b2c09 
								
							
								 
							
						 
						
							
							
								
								Accepting FR from each conv  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f08c2aabf 
								
							
								 
							
						 
						
							
							
								
								Accept FRs from all Devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e8e7b2121e 
								
							
								 
							
						 
						
							
							
								
								Message FR accept fiddling  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5db9795076 
								
							
								 
							
						 
						
							
							
								
								Accepting FRs to all devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								60ddaa14be 
								
							
								 
							
						 
						
							
							
								
								Prevent multiple FR conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ec3132afc9 
								
							
								 
							
						 
						
							
							
								
								Fix auto accepting friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a1f2b38325 
								
							
								 
							
						 
						
							
							
								
								Merge changes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e666c3c97d 
								
							
								 
							
						 
						
							
							
								
								Add comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a497871ea3 
								
							
								 
							
						 
						
							
							
								
								Made changes for new protocol  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								eb894a9b66 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f46c885fdf 
								
									
								
							
								 
							
						 
						
							
							
								
								merge fix-closed-group to clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ead2f62b6d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into sender-keys  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3cbb90516f 
								
							
								 
							
						 
						
							
							
								
								Remove clgs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4e6e573f18 
								
							
								 
							
						 
						
							
							
								
								Testing w clg  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7d803280e8 
								
							
								 
							
						 
						
							
							
								
								halfway  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2b7df8e40b 
								
							
								 
							
						 
						
							
							
								
								Filtering groups fromstate  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3ab2b550e4 
								
							
								 
							
						 
						
							
							
								
								Remove archive conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								debb922521 
								
							
								 
							
						 
						
							
							
								
								Medium groups with sender keys essentials  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5f7c82d41d 
								
							
								 
							
						 
						
							
							
								
								Cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e7e62b2479 
								
							
								 
							
						 
						
							
							
								
								Conditional retry for slave fail  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3de82cd292 
								
							
								 
							
						 
						
							
							
								
								rm  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b5f0f552a7 
								
							
								 
							
						 
						
							
							
								
								Changes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3c571770ed 
								
							
								 
							
						 
						
							
							
								
								Useful comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1a0b760fa1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1093  from Bilb/fix-various-closed-group  
							
							... 
							
							
							
							Fix various closed group 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf05d4ff6c 
								
							
								 
							
						 
						
							
							
								
								revivify  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3c2746d910 
								
									
								
							
								 
							
						 
						
							
							
								
								fix group update notifcation when we are added to the group  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6848eb975a 
								
									
								
							
								 
							
						 
						
							
							
								
								fix tests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								645b2d55fc 
								
									
								
							
								 
							
						 
						
							
							
								
								invite friends to closed group: hide already members  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ab77b0f9a5 
								
									
								
							
								 
							
						 
						
							
							
								
								disable message contextmenu on group chats when kicked  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6cda163b27 
								
							
								 
							
						 
						
							
							
								
								upgrade typescript  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								473c4d817b 
								
									
								
							
								 
							
						 
						
							
							
								
								fix bug with accept/reject buttons on friend request  #914  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d8a12aab0f 
								
							
								 
							
						 
						
							
							
								
								conv tinkering  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6d9bcc3079 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								99a5766592 
								
							
								 
							
						 
						
							
							
								
								session nomenclature updates  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bed64b2ab8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #935  from Bilb/fix-contextmenu-cache-conversation-view  
							
							... 
							
							
							
							Fix menu cache conversation view 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1d289c04ed 
								
							
								 
							
						 
						
							
							
								
								Message reading instantaneous completed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9a6aafe99c 
								
							
								 
							
						 
						
							
							
								
								Pull from clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7235ccff88 
								
							
								 
							
						 
						
							
							
								
								Emoji quick styling  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								19a5571536 
								
							
								 
							
						 
						
							
							
								
								Protobuf init for attachments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								74142fab28 
								
							
								 
							
						 
						
							
							
								
								Waveform dividing across fullwidth  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a09e370e1d 
								
							
								 
							
						 
						
							
							
								
								Added testing on pull request  
							
							... 
							
							
							
							Disable proxy in tests. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a52127de5d 
								
									
								
							
								 
							
						 
						
							
							
								
								do not trigger change of unchanged messages on conversation reset  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5d11ef1457 
								
							
								 
							
						 
						
							
							
								
								Header props  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0eaebcbcac 
								
							
								 
							
						 
						
							
							
								
								Don't send contact sync message with pairing authorisation.  
							
							... 
							
							
							
							Don't send secondary devices in contact sync messages. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ea4dc05009 
								
							
								 
							
						 
						
							
							
								
								Upgrade typescript, finding messaages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b61dd6a839 
								
							
								 
							
						 
						
							
							
								
								Don't send groups in contact sync message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								62825faa61 
								
							
								 
							
						 
						
							
							
								
								Don't perform admin check if it's a new group that we are creating  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fc6ca57e1e 
								
							
								 
							
						 
						
							
							
								
								Added support for group request info  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d20d31b574 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c6be289092 
								
							
								 
							
						 
						
							
							
								
								Fix leaving closed groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc85de5250 
								
							
								 
							
						 
						
							
							
								
								Optimisation and lint fixes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4f6dd7a8d5 
								
							
								 
							
						 
						
							
							
								
								Rename functions to be less confusing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a75ef365b8 
								
							
								 
							
						 
						
							
							
								
								Fix device unlinking.  
							
							... 
							
							
							
							Fix session request being sent even if we have keys to setup a session.
Fix minor crash. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e1d06fc9be 
								
							
								 
							
						 
						
							
							
								
								Fix messages from secondary device not being mapped correctly to their primary device.  
							
							... 
							
							
							
							Fix creating closed groups from secondary device.
Fix primary device showing up in create group dialog. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d9c521b09d 
								
							
								 
							
						 
						
							
							
								
								Fix message syncing in closed groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								054a523738 
								
							
								 
							
						 
						
							
							
								
								Fix linked device sending automatic friend request when it already has keys for a device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								beb4cdbed8 
								
							
								 
							
						 
						
							
							
								
								Closed group fixes. ( #816 )  
							
							... 
							
							
							
							* Fix group updates not syning
* Fix leaving closed groups
* Fix incorrect members being shown on create group dialog
* Linting
* Fix create closed group showing our own conversation 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f77c2e00b 
								
							
								 
							
						 
						
							
							
								
								expose isRss, don't close uncloseable Rss conversation on deleteMessages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								799fcb80f4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								821cf00b65 
								
							
								 
							
						 
						
							
							
								
								Closed group update message stylgin  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c9f60826b4 
								
							
								 
							
						 
						
							
							
								
								Fix friend request messages being sent to users you don't have a session in closed groups.  
							
							... 
							
							
							
							Disable typing messages and read receipts in groups.
Send out session request messages if you don't have a session with a member in the group. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d7f71650ea 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ae793db19 
								
							
								 
							
						 
						
							
							
								
								Rename BACKGROUND_FRIEND_REQUEST to SESSION_REQUEST.  
							
							... 
							
							
							
							Don't trigger friend request logic if a message is aimed at a group. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cb417d3665 
								
							
								 
							
						 
						
							
							
								
								Link preview warning on setting toggle  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b9da721faa 
								
									
								
							
								 
							
						 
						
							
							
								
								open the conversation when accepting a friend request  
							
							... 
							
							
							
							also, it does what is needed to show the new friend in the friend list 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02320334f0 
								
							
								 
							
						 
						
							
							
								
								Remove P2P  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7867f4dceb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3b24714f3e 
								
									
								
							
								 
							
						 
						
							
							
								
								Sort messages by sent_at ( #718 )  
							
							... 
							
							
							
							Sort messages by sent_at 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ce066b802 
								
							
								 
							
						 
						
							
							
								
								Display subscriber count for open chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d690768a6 
								
							
								 
							
						 
						
							
							
								
								Scrolling button updated and animations to modals  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a0a5a61b29 
								
							
								 
							
						 
						
							
							
								
								Various changes suggested by redesign overview  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3dd18a0c9c 
								
							
								 
							
						 
						
							
							
								
								Profile picture upload, fixes and copy  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								25344685a2 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								033492a200 
								
							
								 
							
						 
						
							
							
								
								Sort messages by sent_at  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6209d7d2e2 
								
							
								 
							
						 
						
							
							
								
								remove conversation when friendrequest is declined  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								34fde5f71a 
								
							
								 
							
						 
						
							
							
								
								contact list, show receivedfriendrequest, then sent, then friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								05bbc43b22 
								
							
								 
							
						 
						
							
							
								
								fix accept/decline friend request from conversationListItem  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8074756dc2 
								
							
								 
							
						 
						
							
							
								
								Infinte duration toasts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6ee5d041fb 
								
							
								 
							
						 
						
							
							
								
								Finishing up some modals  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								bf7742932b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #480  from BeaudanBrown/loop-stopping  
							
							... 
							
							
							
							Stop polling on public chat deletion 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6e6428928c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #479  from neuroscr/use-user-obj  
							
							... 
							
							
							
							Make sure public chat timers can't be restarted / Channel name bug fix 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d2dcd6c23d 
								
							
								 
							
						 
						
							
							
								
								Stop polling when you leave the public chat, clear up a bit  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								eea6bac7e6 
								
							
								 
							
						 
						
							
							
								
								add setGroupName()  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								870dc7f904 
								
							
								 
							
						 
						
							
							
								
								Fix tests, refactor menu items to please linter and lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66459ac4bd 
								
							
								 
							
						 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								8066affd2c 
								
							
								 
							
						 
						
							
							
								
								Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								616e952f8e 
								
							
								 
							
						 
						
							
							
								
								Add right click option to public chat messages to copy pubkey of sender  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								133f2a5656 
								
							
								 
							
						 
						
							
							
								
								replace publicSendData with LokiPublicChannelAPI instance  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3178d67295 
								
							
								 
							
						 
						
							
							
								
								allow yourself to request deletion of messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								351fa09ad6 
								
							
								 
							
						 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4ecc5b389 
								
							
								 
							
						 
						
							
							
								
								A prepare for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1b4105a3d0 
								
							
								 
							
						 
						
							
							
								
								Fix db stuff and remove unneeded message function  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4dd10a5cd 
								
							
								 
							
						 
						
							
							
								
								Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								700ed5d2a8 
								
							
								 
							
						 
						
							
							
								
								Some refactoring from reviews, and include the token in the message pipeline instead of getting in message_api  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b5fd01a468 
								
							
								 
							
						 
						
							
							
								
								Add required metadata to sending pipeline and send to public channels  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								16cc1cb400 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #443  from sachaaaaa/show_secondary_pubkey_message_details  
							
							... 
							
							
							
							[multi-device] Format message details to show secondary pubkey properly 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								54f4fd843b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #440  from sachaaaaa/substitute_secondary_with_primary  
							
							... 
							
							
							
							[multi-device] Display incoming messages in the primary device conversation 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dce8c8bcf7 
								
							
								 
							
						 
						
							
							
								
								Format message details to show secondary pubkey properly  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c052a65a2 
								
							
								 
							
						 
						
							
							
								
								Display incoming messages in the primary device conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd62a265c 
								
							
								 
							
						 
						
							
							
								
								Allow receiving and sending messages before lokiP2PApi is defined.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3f4b94ba74 
								
							
								 
							
						 
						
							
							
								
								Transition to initialising rss feeds in schema update  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d3cf055128 
								
							
								 
							
						 
						
							
							
								
								rss avatar guard  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a67e7fcfe1 
								
							
								 
							
						 
						
							
							
								
								guard for CI fix  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bbffa89308 
								
							
								 
							
						 
						
							
							
								
								make sure we have braces  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								899bfc3b2b 
								
							
								 
							
						 
						
							
							
								
								Add channel id to message table and provide helper functions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f857744e88 
								
							
								 
							
						 
						
							
							
								
								Revert sending id  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5bdfaeaf1d 
								
							
								 
							
						 
						
							
							
								
								Don't send read receipts to public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								406938cf59 
								
							
								 
							
						 
						
							
							
								
								Cleaner forceSave  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f7039080af 
								
							
								 
							
						 
						
							
							
								
								Remove accidental swapfile, save messages with the id given to them from public server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f718bf15d2 
								
							
								 
							
						 
						
							
							
								
								Prepare to delete message, send message id to server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								143bf1bdc1 
								
							
								 
							
						 
						
							
							
								
								Fill out unregister channel stub, trigger unregister channel on conversation deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								21f0149e22 
								
							
								 
							
						 
						
							
							
								
								Send profile and update it  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								014558d939 
								
							
								 
							
						 
						
							
							
								
								Squash and clean of old PRs, move towards sending cleartext again  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b4cc9430be 
								
							
								 
							
						 
						
							
							
								
								Add loki schema versioning and create new public conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								98f1c8d80b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #380  from BeaudanBrown/profile-fix  
							
							... 
							
							
							
							Catch this little rascal. Profile names should update consistently now 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								55152cd33a 
								
							
								 
							
						 
						
							
							
								
								Catch this little rascal. Profile names should update consistently now  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								debd211fe5 
								
							
								 
							
						 
						
							
							
								
								Also don't send typing messages for people we aren't friends with  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fc12f01ab3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #374  from msgmaxim/no-read-receipt-unless-friends  
							
							... 
							
							
							
							Only send read receipts if friends 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b76f84acc5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #377  from msgmaxim/typing-indicators  
							
							... 
							
							
							
							Add a toggle option for typing indicators; use short ttl for them 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cdd374a4b2 
								
							
								 
							
						 
						
							
							
								
								Add a toggle option for typing indicators; use short ttl for them  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f12a7cee4d 
								
							
								 
							
						 
						
							
							
								
								only send read receipts if friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								63396669bc 
								
							
								 
							
						 
						
							
							
								
								Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								96aaa7851d 
								
							
								 
							
						 
						
							
							
								
								Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								4330e48185 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #307  from BeaudanBrown/fix-self-note  
							
							... 
							
							
							
							Fix not to self 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e1d2484797 
								
							
								 
							
						 
						
							
							
								
								Can't update conversation that hasn't been created yet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ab15a4afd6 
								
							
								 
							
						 
						
							
							
								
								Review moving status setting to conversation init  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3bb9d888dc 
								
							
								 
							
						 
						
							
							
								
								Initialise conversation with ourselves as friends and don't allow it to be changed to anything else  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								94b125f2cf 
								
							
								 
							
						 
						
							
							
								
								Consider friend requests that are still being sent as sent  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fd6f6c6a8c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #290  from Mikunj/loki-profile  
							
							... 
							
							
							
							Convert profile field in DataMessage to use LokiProfile 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2c12c8a1d8 
								
							
								 
							
						 
						
							
							
								
								Convert profile field in data message to use LokiProfile instead of signal Contact.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								53cbfb1f5c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into fix-friend-request-logic  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								12cce8fe47 
								
							
								 
							
						 
						
							
							
								
								Auto accept friend request messages if we were already friends with the user.  
							
							... 
							
							
							
							Lint fixes for previous files. 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7387e88c97 
								
							
								 
							
						 
						
							
							
								
								Add showing friends in search.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1f03e04d8c 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23  
							
							... 
							
							
							
							# Conflicts:
#	js/views/conversation_view.js
#	package.json
#	ts/components/ConversationListItem.tsx
#	ts/components/conversation/ConversationHeader.tsx 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								57195017f9 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								22f7a352f9 
								
							
								 
							
						 
						
							
							
								
								updateLastMessage: If we don't update last text, clear it  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								62de2a229d 
								
							
								 
							
						 
						
							
							
								
								Add logging to track synchronization in message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								74cb808763 
								
							
								 
							
						 
						
							
							
								
								New MessageController as the single place for in-memory messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								274949b247 
								
							
								 
							
						 
						
							
							
								
								Enable long message send as an attachment  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d8fbe95ff 
								
							
								 
							
						 
						
							
							
								
								Retry send: Always remove all errors and recalculate recipients  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c4d90df07 
								
							
								 
							
						 
						
							
							
								
								Send long text as an attachment instead of inline  
							
							... 
							
							
							
							Remove Android length warning
Handle incoming long message attachments
Show long download pending status in message bubble
Fix the width of the smallest spinner
Remove Android length warning from HTML templates 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								32fa5cccde 
								
							
								 
							
						 
						
							
							
								
								Send sync sent messages properly in 1-member group  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c76d537482 
								
							
								 
							
						 
						
							
							
								
								Note to Self: On just expire timer update, set TIMER_UPDATE flag  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								768007a269 
								
							
								 
							
						 
						
							
							
								
								Message Detail: Ensure that quotes are not clickable  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								812f895e12 
								
							
								 
							
						 
						
							
							
								
								Bring lastMessage and lastMessageStatus back to conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dcd16775c3 
								
							
								 
							
						 
						
							
							
								
								Note to Self: set expirationStartTimestamp before sending sync  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eb7ad48951 
								
							
								 
							
						 
						
							
							
								
								Only put nbsp before last token in msg body if token is <12 chars  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9717267b00 
								
							
								 
							
						 
						
							
							
								
								Review  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								dca2462f6c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #248  from sachaaaaa/friend_request_expiry  
							
							... 
							
							
							
							Add requestExpired state to Friend Request state machine 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								77fb5b4a71 
								
							
								 
							
						 
						
							
							
								
								Missing closing parenthesis  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								353302ca16 
								
									
								
							
								 
							
						 
						
							
							
								
								Use Array.includes instead of Array.indexOf  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e953ae7be2 
								
							
								 
							
						 
						
							
							
								
								use correct function respondToAllFriendRequests  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								62889bbdd4 
								
							
								 
							
						 
						
							
							
								
								Add requestExpired state to Friend Request state machine  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								926c9ce3ca 
								
							
								 
							
						 
						
							
							
								
								Fix multiple friend request timers instantiated  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								41ea9ee15b 
								
							
								 
							
						 
						
							
							
								
								Ensure that we show error'd recipients in message details screen  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad53423e0a 
								
							
								 
							
						 
						
							
							
								
								Queue quote reference handling per convo in handleDataMessage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								af40ceda6c 
								
							
								 
							
						 
						
							
							
								
								Note to Self timer fixes for bugs reported by beta users  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4bb10044ea 
								
							
								 
							
						 
						
							
							
								
								Clear timers after friend request complete and don't do timer related things if we are already friends  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5b54c9554e 
								
							
								 
							
						 
						
							
							
								
								Remove groups table, conversation is single source of truth  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								462fa712bc 
								
							
								 
							
						 
						
							
							
								
								Show members: Pull conversation from group table  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								12739ac82d 
								
							
								 
							
						 
						
							
							
								
								Ensure we don't add empty attachments to quote  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5d823de6f9 
								
							
								 
							
						 
						
							
							
								
								Renamed lokiSnodeAPI to start with lower case for consistency, refactor snode API to use conversation controller  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d30e950bf9 
								
							
								 
							
						 
						
							
							
								
								Changed hashing algorithm.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a989a1a818 
								
							
								 
							
						 
						
							
							
								
								Save previews locally.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7564e270f8 
								
							
								 
							
						 
						
							
							
								
								Lint and code cleanup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								27c6062351 
								
							
								 
							
						 
						
							
							
								
								Fix incoming messages not showing previews.  
							
							... 
							
							
							
							Linting. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae695fe32f 
								
							
								 
							
						 
						
							
							
								
								Remove sending attachments.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f8e25bb3e 
								
							
								 
							
						 
						
							
							
								
								Added local link preview  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								0d7480bd92 
								
							
								 
							
						 
						
							
							
								
								A number of small fixes for Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								432c336048 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #171  from Mikunj/online-indicator-fix  
							
							... 
							
							
							
							Added online indicator to conversation header. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ddfc99a461 
								
							
								 
							
						 
						
							
							
								
								Added online indicator to conversation header.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e3c0f2147a 
								
							
								 
							
						 
						
							
							
								
								Fixed variable name.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d40bc3af9 
								
							
								 
							
						 
						
							
							
								
								Changed queueMessageSend to use JobQueue.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4518e95619 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f4e9bc655a 
								
							
								 
							
						 
						
							
							
								
								Hooked up LokiP2pAPI with online stuff.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b382de6da 
								
							
								 
							
						 
						
							
							
								
								Added online indicator.  
							
							... 
							
							
							
							Disable selection in contacts. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a40a3d164f 
								
							
								 
							
						 
						
							
							
								
								Lots of logic for establishing a p2p connection, managing when the other user is online vs offline etc. Will always try to use P2P messaging when it can and fall back to storage server otherwise  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ff96a0250 
								
							
								 
							
						 
						
							
							
								
								Fixed tests and moved friend request status enum to new friends file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								07076c27ae 
								
							
								 
							
						 
						
							
							
								
								Moved friend status to window, added start of p2p api stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1533fcc807 
								
							
								 
							
						 
						
							
							
								
								Fail over to all numbers in retry if errors don't have numbers  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c936859d09 
								
							
								 
							
						 
						
							
							
								
								Fix rendering bug with verified state in updateVerified()  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dde63a552f 
								
							
								 
							
						 
						
							
							
								
								Fix bug with replayable errors, fix bug with set representation of swarmNodes not being handled properly  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dcfc97713b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #150  from sachaaaaa/display_nickname_on_friend_accept  
							
							... 
							
							
							
							Send profile along with friend request accept message 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								adfb4ab371 
								
							
								 
							
						 
						
							
							
								
								work with session reset  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e08a63d078 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f92e8485f8 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							... 
							
							
							
							Added gitattributes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bdbdf15469 
								
							
								 
							
						 
						
							
							
								
								Added timeouts for requests so they don't for ages. Changed swarmNodes to be a set to work property with merge, now removing contact swarmNodes if they timeout  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7b1799c418 
								
							
								 
							
						 
						
							
							
								
								Big ol' hunk o' chunk. Now using random.snode to populate swarm lists, now making multiple requests from said lists and they are processed as they complete rather than waiting for all to resolve  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f09f0f5721 
								
							
								 
							
						 
						
							
							
								
								Moved replenishSwarm into libloki-protocol and attached to the window  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								37ba762312 
								
							
								 
							
						 
						
							
							
								
								First stuff for contacting specific nodes for each contact. Hard coded to hit the same bootstrap node for now plus doesn't handle unreachable nodes/errors well yet  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ea1d007b4f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #136  from Mikunj/tests  
							
							... 
							
							
							
							Tests 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								feb8af476a 
								
							
								 
							
						 
						
							
							
								
								Refactored BlockedNumberController.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7341471ce7 
								
							
								 
							
						 
						
							
							
								
								Fix up notification.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								faeb319c58 
								
							
								 
							
						 
						
							
							
								
								Added profile model test.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								61c4447ab0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #126  from Mikunj/friend-request-notification  
							
							... 
							
							
							
							Fix notification display after friend request is accepted. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a12ed61cc1 
								
							
								 
							
						 
						
							
							
								
								Fix notification display after friend request is accepted.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								070d18b514 
								
							
								 
							
						 
						
							
							
								
								Updated function calls.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c0be4718fc 
								
							
								 
							
						 
						
							
							
								
								Update delivered_to for outgoing with earlier delivery receipts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a21d63e450 
								
							
								 
							
						 
						
							
							
								
								Make notification initials consistent with everything else ( #3006 )  
							
							... 
							
							
							
							Make notification initials consistent with Avatar component 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bcb259919 
								
							
								 
							
						 
						
							
							
								
								Added PoW error.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f98fe910d5 
								
							
								 
							
						 
						
							
							
								
								Fix friend request retry not working.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3851bf351f 
								
							
								 
							
						 
						
							
							
								
								Throttle typing events, fix profile logging, fix group typing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2715e79268 
								
							
								 
							
						 
						
							
							
								
								Fix conversation status not being reset upon conversation messages deletion.  
							
							... 
							
							
							
							Fix incoming friend request not replacing old friend requests.
Fixed incorrect function name. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								05c18d42db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #66  from sachaaaaa/session_reset  
							
							... 
							
							
							
							Handle session reset, Loki style 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1e3886cca8 
								
							
								 
							
						 
						
							
							
								
								More consistent naming of key storage functions, moved some loki messenger only functions into new file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								86e04b89e2 
								
							
								 
							
						 
						
							
							
								
								Update js/models/conversations.js  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e62c661ed9 
								
							
								 
							
						 
						
							
							
								
								Treat session reset success messages as incoming, handle failure differently  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								962c947605 
								
							
								 
							
						 
						
							
							
								
								Prevent "secure session reset succeeded" message from being cleaned up at startup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f2e1b9b8de 
								
							
								 
							
						 
						
							
							
								
								more missing awaits  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								df80249cba 
								
							
								 
							
						 
						
							
							
								
								fix missing awaits  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4cc614269e 
								
							
								 
							
						 
						
							
							
								
								add setter for session reset state  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1dc621a917 
								
							
								 
							
						 
						
							
							
								
								Fix using FriendStatusEnum for session reset  
							
							... 
							
							
							
							Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								13db2d666f 
								
							
								 
							
						 
						
							
							
								
								Fixed test again after rebase, reworked some logic in the conversation validateNumber function to correctly reflect what libsignal thinks is valid  
							
							
							
						 
						
							7 years ago