Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								6e6428928c
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #479 from neuroscr/use-user-obj
							
							
							
							
							
							
							
							Make sure public chat timers can't be restarted / Channel name bug fix 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								d2dcd6c23d
								
							
								
							
						 | 
						
							
							
								
								Stop polling when you leave the public chat, clear up a bit
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								eb3d22f2b0
								
							
								
							
						 | 
						
							
							
								
								remove unneeded comment
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								c97f26465c
								
							
								
							
						 | 
						
							
							
								
								set correct name on conversation
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								eea6bac7e6
								
							
								
							
						 | 
						
							
							
								
								add setGroupName()
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								4836b74f60
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #478 from BeaudanBrown/clean-branches
							
							
							
							
							
							
							
							Clean up redundant repetition of successive code duplication one after the other 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								f9c7a6ff3d
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #475 from neuroscr/use-user-obj
							
							
							
							
							
							
							
							Use user obj / pull channel name/avatar from server 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								6d1c9700b1
								
							
								
							
						 | 
						
							
							
								
								this.stop guard on channelAPI
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								c4a95218fa
								
							
								
							
						 | 
						
							
							
								
								Make even smaller
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								e382afdf91
								
							
								
							
						 | 
						
							
							
								
								make timers stoppable, delete throw parameter, pollForChannel() pattern update
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								3894f2784e
								
							
								
							
						 | 
						
							
							
								
								Clean up redundant repetition
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								f093490bec
								
							
								
							
						 | 
						
							
							
								
								lint plus constant fix
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								2ca23db141
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'use-user-obj' of https://github.com/neuroscr/loki-messenger into use-user-obj
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								5b193b9e47
								
							
								
							
						 | 
						
							
							
								
								remove throw for now, squash ifs, some future avatar notes
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								35d059eae5
								
							
								
							
						 | 
						
							
							
								
								was getting some weird errors, going to try this
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Campbell-Brown
							
						 | 
						
							
							
							
								
								
							
							
								
							
								e70b875226
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge pull request #474 from BeaudanBrown/hide-menus
							
							
							
							
							
							
							
							Remove most of the right click and cog menu options for the public chats 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
								
								
							
							
								
							
								3f35170eae
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into use-user-obj
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								428a3b7077
								
							
								
							
						 | 
						
							
							
								
								add back conversationId
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								5247bc56b7
								
							
								
							
						 | 
						
							
							
								
								Address review
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								870dc7f904
								
							
								
							
						 | 
						
							
							
								
								Fix tests, refactor menu items to please linter and lint
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Beaudan Brown
							
						 | 
						
							
							
							
							
								
							
								66459ac4bd
								
							
								
							
						 | 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats
							
							
							
							
							
						 | 
						
							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 |