abde96bc1e 
								
							
								 
							
						 
						
							
							
								
								Fix medium group updates  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2a0130ff04 
								
							
								 
							
						 
						
							
							
								
								Multidevice support for medium groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3561ac49c0 
								
							
								 
							
						 
						
							
							
								
								UI and some integrations tests for sender keys  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fa853538d0 
								
									
								
							
								 
							
						 
						
							
							
								
								LINT after prettier upgrade  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fe7b22dbc3 
								
							
								 
							
						 
						
							
							
								
								Groups not friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								54ee9e3ad4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/loki-messenger  into fileonion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								291ae531d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d695c57805 
								
									
								
							
								 
							
						 
						
							
							
								
								wait to delete secondaryDevice conversation after unpairing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3c6e58e54b 
								
							
								 
							
						 
						
							
							
								
								build paths if useFileOnionRequests is on and useOnionRequests is not  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e5e71c4577 
								
							
								 
							
						 
						
							
							
								
								move window.LokiPublicChatAPI.setClockParams() out  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c87519048 
								
									
								
							
								 
							
						 
						
							
							
								
								send syncMessage when we just created a closed group  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								308e06b2cd 
								
									
								
							
								 
							
						 
						
							
							
								
								fix bug since refactor: autoFR and session request message were mixed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5b79f715ba 
								
									
								
							
								 
							
						 
						
							
							
								
								integration-test fix some tests add tests of logs  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								5c02dc9371 
								
							
								 
							
						 
						
							
							
								
								sorting-tinkers  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								61d4c7c349 
								
							
								 
							
						 
						
							
							
								
								Encrypt source for medium groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5b1101216 
								
							
								 
							
						 
						
							
							
								
								Slave unlinking & FR dup fix  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								debb922521 
								
							
								 
							
						 
						
							
							
								
								Medium groups with sender keys essentials  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3f650a1d15 
								
							
								 
							
						 
						
							
							
								
								prevent note to self on unlink from slave  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3e3df7717f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1094  from Bilb/link-device-fixes  
							
							... 
							
							
							
							Link device fixes 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf05d4ff6c 
								
							
								 
							
						 
						
							
							
								
								revivify  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6f8affe5c9 
								
									
								
							
								 
							
						 
						
							
							
								
								add spinner while unlinking device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								035daffe2b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1074  from Bilb/various-group-fixes  
							
							... 
							
							
							
							Various group fixes 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f453bc12e 
								
							
								 
							
						 
						
							
							
								
								Fix unnecessary db calls  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3575c0295 
								
									
								
							
								 
							
						 
						
							
							
								
								showtoast on invite accept from already member open-group  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								18851c3f87 
								
							
								 
							
						 
						
							
							
								
								Move builing paths after storage becomes ready.  
							
							... 
							
							
							
							We do this so it doesn't block any of the other communication apis from being initialized. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6cda163b27 
								
							
								 
							
						 
						
							
							
								
								upgrade typescript  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24a3e05154 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Clean up unused dependencies.""  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5ff7476359 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Clean up unused dependencies."  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c5ffcf1c3b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into package-cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d2417c2f6 
								
							
								 
							
						 
						
							
							
								
								Removed proxy-agent and web-socket.  
							
							... 
							
							
							
							Trimmed down web_api.js to most basic functions we are using. This needs to be completely removed in the future. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24114bab8d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1024  from Bilb/fix-pre-approved-friend-request  
							
							... 
							
							
							
							fix pre approved friend requests 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e48c7c2f3d 
								
									
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f01d1dbb7 
								
									
								
							
								 
							
						 
						
							
							
								
								enable by default spell-check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e64ae7db5f 
								
									
								
							
								 
							
						 
						
							
							
								
								fixes   #989  pre approved friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9ff16d7e60 
								
									
								
							
								 
							
						 
						
							
							
								
								move to electron spellchecker  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a91d925384 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #1000  from msgmaxim/onion-requests  
							
							... 
							
							
							
							Client-side implementation for onion requests 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d8a12aab0f 
								
							
								 
							
						 
						
							
							
								
								conv tinkering  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3a746109ea 
								
							
								 
							
						 
						
							
							
								
								Path building for onion requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b3d895caf3 
								
									
								
							
								 
							
						 
						
							
							
								
								Toast on device pairing request received but in device pairing mode  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bb7d4820a5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #959  from neuroscr/opengroupordering  
							
							... 
							
							
							
							open group avatar redo conversion properly 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f599c28470 
								
							
								 
							
						 
						
							
							
								
								organisation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								33925d69e9 
								
							
								 
							
						 
						
							
							
								
								Cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d8b982e194 
								
							
								 
							
						 
						
							
							
								
								Fix messages not being created properly in open groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9a6aafe99c 
								
							
								 
							
						 
						
							
							
								
								Pull from clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7235ccff88 
								
							
								 
							
						 
						
							
							
								
								Emoji quick styling  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8c91aa04f1 
								
							
								 
							
						 
						
							
							
								
								Speed up message creation.  
							
							... 
							
							
							
							We were fetching all of our devices everytime a new message was received.
This was only used for when the message was a public chat message, so i moved it into the relevant if statement.
In the future if we increase the device link limit, we'll need to fetch all our devices on application launch or something. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								26140e0ed0 
								
							
								 
							
						 
						
							
							
								
								Send delivery receipts asynchronously  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								745e898bcc 
								
							
								 
							
						 
						
							
							
								
								Remove more unused functions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d5bb069207 
								
							
								 
							
						 
						
							
							
								
								Cleanup unused functions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								738057587d 
								
							
								 
							
						 
						
							
							
								
								open group avatar redo conversion properly  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2dc5885c88 
								
							
								 
							
						 
						
							
							
								
								Microphone timer  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								64778d15d7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #948  from konstantinullrich/#893-Unhandled-Promise-Rejection-error-when-updating  
							
							... 
							
							
							
							Move cleanupOrphanedAttachments before restart 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9cc9d61fcd 
								
							
								 
							
						 
						
							
							
								
								Remove a redundant restart call  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1ea0edafa9 
								
							
								 
							
						 
						
							
							
								
								Remove redundant if statement to avoid future bugs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f7d562eafe 
								
							
								 
							
						 
						
							
							
								
								lint remove empty line after newVersion if  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1a9206fdbe 
								
							
								 
							
						 
						
							
							
								
								Move cleanupOrphanedAttachments before restart  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								488c0b4e08 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #917  from Bilb/closed-group-contact-panel  
							
							... 
							
							
							
							Make closed groups show up in contacts left panel 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								67e3846787 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #905  from jian10au/scaleslider  
							
							... 
							
							
							
							Zoom factor slider 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								548db7150d 
								
							
								 
							
						 
						
							
							
								
								Start message selection reactification  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								370467a127 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #878  from Bilb/group-profile-image  
							
							... 
							
							
							
							Group profile image upload 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								845fc34964 
								
									
								
							
								 
							
						 
						
							
							
								
								Fix my typo  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5d11ef1457 
								
							
								 
							
						 
						
							
							
								
								Header props  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								203d314254 
								
							
								 
							
						 
						
							
							
								
								fix the slider bug  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								23da1831c2 
								
							
								 
							
						 
						
							
							
								
								removed unnecessary comments after review  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f5b3eb394c 
								
									
								
							
								 
							
						 
						
							
							
								
								enable notifications after 10seconds of start or reconnect  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d6a9038198 
								
									
								
							
								 
							
						 
						
							
							
								
								enable back notifications  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f0760b22ea 
								
									
								
							
								 
							
						 
						
							
							
								
								Make closed groups show up in contacts left panel  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bf5badda3b 
								
							
								 
							
						 
						
							
							
								
								Working conversation openning  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b2322bae02 
								
							
								 
							
						 
						
							
							
								
								check to whether the zoomFactor is shown in preload.js  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								96e9a68abd 
								
							
								 
							
						 
						
							
							
								
								add zoomfactor to main  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								790085bea1 
								
									
								
							
								 
							
						 
						
							
							
								
								disable profile image upload for closed group  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								6d5aed7de8 
								
									
								
							
								 
							
						 
						
							
							
								
								make upload of group picture work  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fc6ca57e1e 
								
							
								 
							
						 
						
							
							
								
								Added support for group request info  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c5e2df817 
								
							
								 
							
						 
						
							
							
								
								reactification conversationview bottombar initial  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								481315c100 
								
							
								 
							
						 
						
							
							
								
								Initiating new conversationVew  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ff10637a5a 
								
									
								
							
								 
							
						 
						
							
							
								
								separate update group name and group members dialog  
							
							... 
							
							
							
							(add and remove members are separated) 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2101abb911 
								
							
								 
							
						 
						
							
							
								
								Modal blurs and stylistic simplifications  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								13634a42c6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #834  from loki-project/multi-device-fix  
							
							... 
							
							
							
							Multi device fixes 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								0bf7dfab6a 
								
							
								 
							
						 
						
							
							
								
								log.verbose isn't a thing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								47e87a4720 
								
							
								 
							
						 
						
							
							
								
								add note  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c37650c45d 
								
							
								 
							
						 
						
							
							
								
								Don't wait for file server to return tokens when establishing home connection.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8b1e24fc44 
								
							
								 
							
						 
						
							
							
								
								Clean  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								75660c7269 
								
							
								 
							
						 
						
							
							
								
								fixed file server holding up message sender init.  
							
							... 
							
							
							
							fix joining closed groups. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								21e982e5c2 
								
							
								 
							
						 
						
							
							
								
								Fix open group joining.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a440941ea 
								
							
								 
							
						 
						
							
							
								
								squelch RSS duplicate messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c4facc694 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/loki-messenger  into tls-fix  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								799fcb80f4 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/session-desktop  into clearnet  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								b341ceaf76 
								
							
								 
							
						 
						
							
							
								
								Closed group joining completed w/o backend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								83e2404d89 
								
							
								 
							
						 
						
							
							
								
								move comments from connecting_to_server_dialog_view  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4fd2126fbe 
								
							
								 
							
						 
						
							
							
								
								Fileserver update  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								de4edf9252 
								
							
								 
							
						 
						
							
							
								
								CLosed groups ui initial listprops  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								71e19c18d6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #778  from msgmaxim/remove-sender  
							
							... 
							
							
							
							Remove source field from envelope 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dadd4b97ad 
								
							
								 
							
						 
						
							
							
								
								Remove source field from envelope  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5527cf7ed2 
								
							
								 
							
						 
						
							
							
								
								Localise global vars  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cb417d3665 
								
							
								 
							
						 
						
							
							
								
								Link preview warning on setting toggle  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2d4bf2b3e2 
								
							
								 
							
						 
						
							
							
								
								Complete conditional message onboarding  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3f58dea035 
								
							
								 
							
						 
						
							
							
								
								Remove mixpanel  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9dcc851ebd 
								
							
								 
							
						 
						
							
							
								
								Updated all icon references  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02320334f0 
								
							
								 
							
						 
						
							
							
								
								Remove P2P  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d68aeb947e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7867f4dceb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dc0571137c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #734  from neuroscr/fileproxy  
							
							... 
							
							
							
							ephemeral layering file proxy 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3b24714f3e 
								
									
								
							
								 
							
						 
						
							
							
								
								Sort messages by sent_at ( #718 )  
							
							... 
							
							
							
							Sort messages by sent_at 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								56648a6e30 
								
							
								 
							
						 
						
							
							
								
								remove date, we have git  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								419dd09c03 
								
									
								
							
								 
							
						 
						
							
							
								
								Disable link previews as default per Kee on signup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3dd18a0c9c 
								
							
								 
							
						 
						
							
							
								
								Profile picture upload, fixes and copy  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								293eca0509 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'brand-redesign' into clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2194a3a537 
								
							
								 
							
						 
						
							
							
								
								HARDCODE theme to be dark, even if an old config is set to be light mode enabled  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24bf436b0c 
								
							
								 
							
						 
						
							
							
								
								disable menubar by default and remove old preferences from menubar  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b68b4d8a27 
								
							
								 
							
						 
						
							
							
								
								Formatting and button positioning  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c369b0c553 
								
							
								 
							
						 
						
							
							
								
								Edit user profile complete  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								25344685a2 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0f4f5847ed 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								411b343e6a 
								
							
								 
							
						 
						
							
							
								
								add unpairing of device from settings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f7548fc6ef 
								
							
								 
							
						 
						
							
							
								
								Finalising pr  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e065cc404f 
								
							
								 
							
						 
						
							
							
								
								Password set, change and remove complete  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a64a34edcb 
								
							
								 
							
						 
						
							
							
								
								Disclaimer modal and settings view cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c26097554f 
								
							
								 
							
						 
						
							
							
								
								settings optimisations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								67262c7eaa 
								
							
								 
							
						 
						
							
							
								
								lint after merge and fix startup of app  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9b8ad976e3 
								
							
								 
							
						 
						
							
							
								
								remove not used AddServerDialog -> now on chanel section  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d217c76647 
								
							
								 
							
						 
						
							
							
								
								mergable settingsview  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b0658ba7ed 
								
							
								 
							
						 
						
							
							
								
								settings toggling abstraction  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b97c9ec8e4 
								
							
								 
							
						 
						
							
							
								
								SessionRadio  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8de2ce9e23 
								
							
								 
							
						 
						
							
							
								
								Theme toggle and settings abstraction  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7a02d29674 
								
							
								 
							
						 
						
							
							
								
								Add missing sent_at for group update messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5360968a91 
								
							
								 
							
						 
						
							
							
								
								Add public server modal to message pane  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d20d62e8c6 
								
							
								 
							
						 
						
							
							
								
								Messages display temporary fix and panel optimisations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dd421d58f1 
								
							
								 
							
						 
						
							
							
								
								Theme switching. Need to update _session*_light  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e7d3bc6d35 
								
							
								 
							
						 
						
							
							
								
								Settings view modals and categories  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								53555c0133 
								
							
								 
							
						 
						
							
							
								
								Fixed wrt review @ Audric  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8074756dc2 
								
							
								 
							
						 
						
							
							
								
								Infinte duration toasts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6ee5d041fb 
								
							
								 
							
						 
						
							
							
								
								Finishing up some modals  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2419272608 
								
							
								 
							
						 
						
							
							
								
								Updated React dialogs to SessionModals  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								228e4ca81e 
								
							
								 
							
						 
						
							
							
								
								Adding session settings to utilise toggles  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9afb8b4d5e 
								
							
								 
							
						 
						
							
							
								
								Major rework of context menus  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d0d5012e07 
								
							
								 
							
						 
						
							
							
								
								Fixed breaking sessionToggle issues  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9d543fe4a 
								
							
								 
							
						 
						
							
							
								
								Dropdown generalisation and simplification  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								12011a30d4 
								
							
								 
							
						 
						
							
							
								
								Inital dropdown, modal and toggle  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								649c8c9be5 
								
							
								 
							
						 
						
							
							
								
								Resolved conflicts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08cc218364 
								
							
								 
							
						 
						
							
							
								
								Fixed orderin of toasts with Maps  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24ebf6b26a 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								90cce5e9ae 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bfab163c5c 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4d7cfb90e 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/background.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com> 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9cd27abf31 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'brand-redesign' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								597c177ced 
								
							
								 
							
						 
						
							
							
								
								Syntactical sugar  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								34ce386bdb 
								
							
								 
							
						 
						
							
							
								
								Finalise uniquified toast stacking and deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d463c659c 
								
							
								 
							
						 
						
							
							
								
								Filesize toast amend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6574585938 
								
							
								 
							
						 
						
							
							
								
								make default theme to dark  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								47101c85f7 
								
							
								 
							
						 
						
							
							
								
								add signin with mnemonic to sessionRegistration page  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2cf39cc1ed 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #690  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							Add/Remove Moderators interface 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5730a88c18 
								
							
								 
							
						 
						
							
							
								
								add/remove moderator modal dialogs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								531b782669 
								
							
								 
							
						 
						
							
							
								
								click on our avatar show the edit profile dialog & fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								549e3b4516 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multidevice-publicchat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5123fa0409 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #669  from msgmaxim/restoration  
							
							... 
							
							
							
							Prompting the user to reset session on invalid ciphertext 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								449eb8536b 
								
							
								 
							
						 
						
							
							
								
								System clock ( #677 )  
							
							... 
							
							
							
							* Show toast when client clock is out of sync
* Fixed syntactical misarrangements
* Simplify getServerTime method
* Futher simplify getServerTime method
* Update js/modules/loki_app_dot_net_api.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
* Update js/modules/loki_app_dot_net_api.js
Co-Authored-By: Mikunj Varsani <Mikunj@users.noreply.github.com>
* Update loki_app_dot_net_api.js
Use cached timestamp value
* Update preload.js
Update some values to function scope
* Updated syntax
* Semifinal changes
* Improved efficiency and eliminated need for restart on clock update
* Remove await and immediately invoked function 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ca0e1f995c 
								
							
								 
							
						 
						
							
							
								
								handle public group updates differently  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3abf3b14a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #661  from sachaaaaa/encrypted_avatar  
							
							... 
							
							
							
							Encrypted profile pic 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								19786108a3 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a29f0a4120 
								
							
								 
							
						 
						
							
							
								
								encrypted pictures for public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c52a1d038 
								
							
								 
							
						 
						
							
							
								
								encrypt and decrypt images before upload and after download  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								061556bb7d 
								
							
								 
							
						 
						
							
							
								
								trigger showUserDetails on message's avatar clicks  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								81bfa90943 
								
							
								 
							
						 
						
							
							
								
								Prompting the user to reset session on invalid ciphertext  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ab0d084f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from msgmaxim/group-invites  
							
							... 
							
							
							
							Public chat invitations 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6cde9aa263 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #638  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							Public Chat - home server refactor / read public chat avatars from home server 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								89e5e919f2 
								
							
								 
							
						 
						
							
							
								
								Address more review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ea82b14e3 
								
							
								 
							
						 
						
							
							
								
								Add channel id field to invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8f52080eed 
								
							
								 
							
						 
						
							
							
								
								immediately set profile name on public chat servers when you update it  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db0068b429 
								
							
								 
							
						 
						
							
							
								
								Sending and handling of special UNPAIRING_REQUEST message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8cd8c8d4f9 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #610  from msgmaxim/profile-pictures  
							
							... 
							
							
							
							Enable custom profile pictures 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								207e3d022f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'profile-pictures' of  https://github.com/msgmaxim/loki-messenger  into multidevice-publicchat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e1554496d2 
								
							
								 
							
						 
						
							
							
								
								convert LokiFileServerAPI to factory and use establishHomeConnection, lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a08ac9cc1 
								
							
								 
							
						 
						
							
							
								
								Use avatar specific endpoint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								40208442e6 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8850d9bcce 
								
							
								 
							
						 
						
							
							
								
								Only set when account already created  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0b41ef0983 
								
							
								 
							
						 
						
							
							
								
								Ensure primaryDevicePubKey is always defined in storage  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2e8e6480f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #539  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							[multi-device] public chat 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bd17c4b026 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f1c155b943 
								
							
								 
							
						 
						
							
							
								
								Stop sending sync messages to public chats and mark messages from any of our devices as outgoing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								807f4cbd2a 
								
							
								 
							
						 
						
							
							
								
								Storing primary device pubkey on the conversation model for easier access, ensuring that we accept all the friend requests from the primary conversation rather than the secondary  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								030264c689 
								
							
								 
							
						 
						
							
							
								
								Fix misuse of getAllDevicePubKeysForPrimaryPubKey and rename some vars  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6611a10855 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #590  from BeaudanBrown/session-reset-on-fr  
							
							... 
							
							
							
							Session reset on fr 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								370dee5abb 
								
							
								 
							
						 
						
							
							
								
								Ensure we have the correct apis and listeners during the pairing process. Catch upnp error. Remove redundant friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c31535edb4 
								
							
								 
							
						 
						
							
							
								
								Rename blockSync, only send contacts and profile if sending a GRANT request, do *not* always be friends with secondary devices because we still need to complete a friend request exchange  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								332cd30052 
								
							
								 
							
						 
						
							
							
								
								Send contact sync message when becoming friends with contact and auto accept/send friend requests when receiving contact sync  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e88aca57f2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #603  from sachaaaaa/Fix_secondary_nickname  
							
							... 
							
							
							
							[multi-device] Fix secondary nickname 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0f74a002df 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #601  from BeaudanBrown/sync-messages  
							
							... 
							
							
							
							[multi-device] Sync messages 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								15c07ea7df 
								
							
								 
							
						 
						
							
							
								
								Sync secondary devices again but handle the receiving of them properly  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								41fdcef695 
								
							
								 
							
						 
						
							
							
								
								Ensure that we can't miss the apisReady event and only listen for single emit  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dc626ec4d0 
								
							
								 
							
						 
						
							
							
								
								use primary device pubkey when setting nickname  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7e275ac266 
								
							
								 
							
						 
						
							
							
								
								Don't sync secondary devices and make sure initAPIs has been called before sending friend requests to synced contacts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c05939f55 
								
							
								 
							
						 
						
							
							
								
								Add group admins and the ability to remove members from private groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf18572049 
								
							
								 
							
						 
						
							
							
								
								Adding new group members; establishing sessions between non-friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d19b708f9 
								
							
								 
							
						 
						
							
							
								
								Creating private group chats between friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								65361d33f5 
								
							
								 
							
						 
						
							
							
								
								New menu item "show pairing words" for secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9dc3b531e 
								
							
								 
							
						 
						
							
							
								
								Simplify auto accept check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ccf62ed4e 
								
							
								 
							
						 
						
							
							
								
								Trigger endSession code if we receive a friend request from a friend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3ba71fad9e 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5e1e70ac8c 
								
							
								 
							
						 
						
							
							
								
								Enable link previews by default  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4e70b66131 
								
							
								 
							
						 
						
							
							
								
								Extract the async token grab from the server api constructor and put in the factory. Fix up the areas this affects  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5d2f7ddb20 
								
							
								 
							
						 
						
							
							
								
								Add messages needed for UI, bit of house work  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								39fac5fd02 
								
							
								 
							
						 
						
							
							
								
								Add initial add server UI skeleton  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cbee5a884c 
								
							
								 
							
						 
						
							
							
								
								Secondary device to update device mapping to server after lokiFileServerAPI creation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								73d90a5277 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #537  from sachaaaaa/secondary_device_minimum_receiver  
							
							... 
							
							
							
							[multi-device] Start all the receivers only after the secondary registration is fini… 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc04bee38a 
								
							
								 
							
						 
						
							
							
								
								Start all the receivers only after the secondary registration is finished  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5a8ab00a96 
								
							
								 
							
						 
						
							
							
								
								Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b63d8ec84f 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							... 
							
							
							
							* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ... 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7756d4f0f3 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into PR_file_server  
							
							... 
							
							
							
							* clearnet:
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  allow mixpanel to be already set up elsewhere
  Address review comments
  Add missing file in tests
  Add UI elements for searching and selecting members in a group chat
  Desktop Analytics
  Replaced value with a descriptive constant.
  Add comment to fix up confusion.
  Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.
# Conflicts:
#	js/background.js
#	js/modules/loki_public_chat_api.js 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								51eaa90823 
								
							
								 
							
						 
						
							
							
								
								use window.mixpanel, remove eventEmitter  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f8e9e1d3bd 
								
							
								 
							
						 
						
							
							
								
								Remove rejected authorisation from database  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e07f81c150 
								
							
								 
							
						 
						
							
							
								
								Add LokiFileServerAPI  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c921d3e3b3 
								
							
								 
							
						 
						
							
							
								
								allow mixpanel to be already set up elsewhere  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								88b44390bf 
								
							
								 
							
						 
						
							
							
								
								Desktop Analytics  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d3653e8665 
								
							
								 
							
						 
						
							
							
								
								lint after manual merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0426d85e7a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							... 
							
							
							
							* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix  #355  Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...
# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6de6b762e6 
								
							
								 
							
						 
						
							
							
								
								Ensure the latest contact signed prekey is used  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								51f161a613 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #498  from Mikunj/mod-badges  
							
							... 
							
							
							
							Mod badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f9df221638 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #497  from sachaaaaa/prevent_multiple_retrievers  
							
							... 
							
							
							
							[multi-device] Ensure API objects are inited only once 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								025ad10fc5 
								
							
								 
							
						 
						
							
							
								
								Ensure API objects are inited only once  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9fe613967a 
								
							
								 
							
						 
						
							
							
								
								Fix duplicate detection for sent messages in public chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b10835ffc7 
								
							
								 
							
						 
						
							
							
								
								Share contact upon authorising secondary device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b3e2a5aba8 
								
							
								 
							
						 
						
							
							
								
								move refreshModStatus into constructor of channelAPI, just instantiate channelAPI now  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								35b6182074 
								
							
								 
							
						 
						
							
							
								
								Clean up after account registration failure  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								48b6bf54c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #461  from Mikunj/qr-code  
							
							... 
							
							
							
							Pubkey QR code 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a6abcaf826 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #453  from Mikunj/profile-simplification  
							
							... 
							
							
							
							Profile simplification 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								831ae09576 
								
							
								 
							
						 
						
							
							
								
								Cherry pick "profile simplification" from Mik  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								27976a053c 
								
							
								 
							
						 
						
							
							
								
								Save the last retrieved message for public chats on the conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ef8b515d70 
								
							
								 
							
						 
						
							
							
								
								Make sure we only initialise special conversations after both registration and storage load have complete  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8066affd2c 
								
							
								 
							
						 
						
							
							
								
								Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d77d6fd79 
								
							
								 
							
						 
						
							
							
								
								All the API updates, enable mod status retrieval and allow for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4ecc5b389 
								
							
								 
							
						 
						
							
							
								
								A prepare for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4dd10a5cd 
								
							
								 
							
						 
						
							
							
								
								Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f7787ecf7 
								
							
								 
							
						 
						
							
							
								
								Add token retrieval functions to public chat api  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7e0217dca8 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #439  from sachaaaaa/registration_done_secondary  
							
							... 
							
							
							
							[multi-device] Prevent showing inbox if secondary registration is ongoing 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c052a65a2 
								
							
								 
							
						 
						
							
							
								
								Display incoming messages in the primary device conversation  
							
							
							
						 
						
							6 years ago