Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3f35170eae
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into use-user-obj
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								428a3b7077
								
							
								
							
						 | 
						
							
							
								
								add back conversationId
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								b1d2b8f081
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #473 from BeaudanBrown/polling-hotfix
							
							
							
							
							
							
							
							Hotfix for polling loop 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								da97d15891
								
							
								
							
						 | 
						
							
							
								
								Log when there are errors polling
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								0dd180d4f4
								
							
								
							
						 | 
						
							
							
								
								Wrap polling function in try finally for safety, fix issue with empty array check and lint
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								e25ed0aba3
								
							
								
							
						 | 
						
							
							
								
								move pubkey/name out of annotation into user object, read channel meta data from server, throw alert if delete fails, constant name clean up, store timers, Calls refreshModStatus/pollForChannel in cstr
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								b3e2a5aba8
								
							
								
							
						 | 
						
							
							
								
								move refreshModStatus into constructor of channelAPI, just instantiate channelAPI now
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								14f5fc53be
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #468 from BeaudanBrown/super-hotfix
							
							
							
							
							
							
							
							Don't look 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								8f4b0a2088
								
							
								
							
						 | 
						
							
							
								
								Don't look
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								da01703205
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #467 from BeaudanBrown/hide-delete
							
							
							
							
							
							
							
							Remove delete option from more info 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								a2cda31f1a
								
							
								
							
						 | 
						
							
							
								
								Remove delete option from more info
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f72e45ee86
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #465 from BeaudanBrown/beta4-bump
							
							
							
							
							
							
							
							Bump version number 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								6d76384acd
								
							
								
							
						 | 
						
							
							
								
								Bump version number
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								48b6bf54c1
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #461 from Mikunj/qr-code
							
							
							
							
							
							
							
							Pubkey QR code 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								58b0c5ef39
								
							
								
							
						 | 
						
							
							
								
								Removed a line
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								a6abcaf826
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #453 from Mikunj/profile-simplification
							
							
							
							
							
							
							
							Profile simplification 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3c6b374428
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #424 from Mikunj/timestamp-fix
							
							
							
							
							
							
							
							Don't show relative timestamp. 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								43bd167965
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #463 from loki-project/public-chat
							
							
							
							
							
							
							
							Public chat 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								21dad58537
								
							
								
							
						 | 
						
							
							
								
								Linting.
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3161551c8e
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #462 from BeaudanBrown/qol-fixes
							
							
							
							
							
							
							
							Lower default PoW and add export to build-release yarn call 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ea5c3e89b7
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #460 from BeaudanBrown/retain-position
							
							
							
							
							
							
							
							Save the last retrieved message for public chats on the conversation 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								cccf533abc
								
							
								
							
						 | 
						
							
							
								
								Save conversation after all messages are processed
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								38e81fd95a
								
							
								
							
						 | 
						
							
							
								
								Lower default PoW and add export to build-release yarn call
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								3d179909c7
								
							
								
							
						 | 
						
							
							
								
								Decrease the correctness level on the QR code.
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								27976a053c
								
							
								
							
						 | 
						
							
							
								
								Save the last retrieved message for public chats on the conversation
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								a89358676c
								
							
								
							
						 | 
						
							
							
								
								Update electron-context-menu.
							
							
							
							
							
							
							
							Only allow copying QR code since saving doesn't work. 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								1625a22053
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #459 from BeaudanBrown/fix-registration-load
							
							
							
							
							
							
							
							Fix loading during registration 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								ef8b515d70
								
							
								
							
						 | 
						
							
							
								
								Make sure we only initialise special conversations after both registration and storage load have complete
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								3380500a2d
								
							
								
							
						 | 
						
							
							
								
								Added QR code viewing.
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4c123ffb87
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #458 from BeaudanBrown/loading-fix
							
							
							
							
							
							
							
							Move initialisation of public and rss conversations to fix early load 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								8066affd2c
								
							
								
							
						 | 
						
							
							
								
								Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6387c9352a
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #387 from BeaudanBrown/copy-public-key
							
							
							
							
							
							
							
							Add right click option to public chat messages to copy pubkey of sender 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan
							
						 | 
						
							
							
							
							
								
							
								616e952f8e
								
							
								
							
						 | 
						
							
							
								
								Add right click option to public chat messages to copy pubkey of sender
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f4e76f0576
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #455 from neuroscr/public-delete
							
							
							
							
							
							
							
							Public delete 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								17c2817517
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #449 from BeaudanBrown/rss-fix
							
							
							
							
							
							
							
							Fix feed reader for single element results 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								56a4a31ca2
								
							
								
							
						 | 
						
							
							
								
								sendMessage(), getOrRefreshServerToken supports forceRefresh, make modStatus a property, additional comments
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								dfd6039c83
								
							
								
							
						 | 
						
							
							
								
								use LokiPublicChannelAPI
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								133f2a5656
								
							
								
							
						 | 
						
							
							
								
								replace publicSendData with LokiPublicChannelAPI instance
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								3178d67295
								
							
								
							
						 | 
						
							
							
								
								allow yourself to request deletion of messages
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								ba72f55b03
								
							
								
							
						 | 
						
							
							
								
								Fix missing react key error
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								95cca859e9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'deletion-final' of https://github.com/BeaudanBrown/loki-messenger into public-delete
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								8d77d6fd79
								
							
								
							
						 | 
						
							
							
								
								All the API updates, enable mod status retrieval and allow for message deletion
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								351fa09ad6
								
							
								
							
						 | 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								e4ecc5b389
								
							
								
							
						 | 
						
							
							
								
								A prepare for message deletion
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								1b4105a3d0
								
							
								
							
						 | 
						
							
							
								
								Fix db stuff and remove unneeded message function
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								33572cac1f
								
							
								
							
						 | 
						
							
							
								
								use newer delete system every 5s, deleteMessage(), store token in serverAPI, serverRequest refactor, registerChannel now returns the channel found/created, change baseChannelUrl base
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								807b32fac0
								
							
								
							
						 | 
						
							
							
								
								remove unneeded $ on badge
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								d5e6ffb1f9
								
							
								
							
						 | 
						
							
							
								
								rename deletePublicMessage => deleteLocalPublicMessage
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								83d198108c
								
							
								
							
						 | 
						
							
							
								
								Fix the ui bug where items would appear over the loki logo.
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								c4dd10a5cd
								
							
								
							
						 | 
						
							
							
								
								Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.
							
							
							
							
							
						 | 
						
							6 years ago |