b13a4f3e56 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #520  from msgmaxim/mentions2  
							
							... 
							
							
							
							Custom message rendering of mentions 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								16692696e0 
								
							
								 
							
						 
						
							
							
								
								address reviews  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								155a3b8f17 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #512  from neuroscr/desktop-analytics  
							
							... 
							
							
							
							Desktop Analytics 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								687e9db77b 
								
							
								 
							
						 
						
							
							
								
								Custom message rendering of mentions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db8ac66118 
								
							
								 
							
						 
						
							
							
								
								fix method  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3150a6ce11 
								
							
								 
							
						 
						
							
							
								
								separate out new/open, more lint/cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d4ca49ae95 
								
							
								 
							
						 
						
							
							
								
								separate out note to self  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c54979bb41 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6c57346af0 
								
							
								 
							
						 
						
							
							
								
								Add missing file in tests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1496a368e9 
								
							
								 
							
						 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								88b44390bf 
								
							
								 
							
						 
						
							
							
								
								Desktop Analytics  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9beea2cbd3 
								
							
								 
							
						 
						
							
							
								
								Enforce curlies completely and lint with new settings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4a95218fa 
								
							
								 
							
						 
						
							
							
								
								Make even smaller  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3894f2784e 
								
							
								 
							
						 
						
							
							
								
								Clean up redundant repetition  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								66459ac4bd 
								
							
								 
							
						 
						
							
							
								
								Remove most of the right click and cog menu options for the public chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								48b6bf54c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #461  from Mikunj/qr-code  
							
							... 
							
							
							
							Pubkey QR code 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								58b0c5ef39 
								
							
								 
							
						 
						
							
							
								
								Removed a line  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a6abcaf826 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #453  from Mikunj/profile-simplification  
							
							... 
							
							
							
							Profile simplification 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								43bd167965 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #463  from loki-project/public-chat  
							
							... 
							
							
							
							Public chat 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								21dad58537 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3d179909c7 
								
							
								 
							
						 
						
							
							
								
								Decrease the correctness level on the QR code.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								351fa09ad6 
								
							
								 
							
						 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4dd10a5cd 
								
							
								 
							
						 
						
							
							
								
								Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								662c64f347 
								
							
								 
							
						 
						
							
							
								
								Remove ability to delete some rss conversations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a7f999aeb1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #391  from sachaaaaa/show_seed_errors  
							
							... 
							
							
							
							Report mnemonic errors instead of silent failure 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f3f63dcc6 
								
							
								 
							
						 
						
							
							
								
								Report mnemonic error in a toast instead of silently fail  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								701f6be00c 
								
							
								 
							
						 
						
							
							
								
								Add missing mnemonic languages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f7039080af 
								
							
								 
							
						 
						
							
							
								
								Remove accidental swapfile, save messages with the id given to them from public server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ccfc9046b4 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7dd155eb16 
								
							
								 
							
						 
						
							
							
								
								Remove empty event trigger, doesn't seem to be required any more but could be wrong  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9dae805017 
								
							
								 
							
						 
						
							
							
								
								Run lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dd7bf1b2bb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #370  from msgmaxim/clipboard  
							
							... 
							
							
							
							Add a button to paste pubkey from clipboard if valid 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b76f84acc5 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #377  from msgmaxim/typing-indicators  
							
							... 
							
							
							
							Add a toggle option for typing indicators; use short ttl for them 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cdd374a4b2 
								
							
								 
							
						 
						
							
							
								
								Add a toggle option for typing indicators; use short ttl for them  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6a3062860d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #365  from sachaaaaa/beta-disclaimer  
							
							... 
							
							
							
							Add one-time disclaimer at startup for beta release 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d0e73ed7f8 
								
							
								 
							
						 
						
							
							
								
								Add a button to paste pubkey from clipboard if valid  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								63396669bc 
								
							
								 
							
						 
						
							
							
								
								Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5cb7703ae5 
								
							
								 
							
						 
						
							
							
								
								Add one-time disclaimer at startup for beta release  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								96aaa7851d 
								
							
								 
							
						 
						
							
							
								
								Send broadcast message instead of empty message to trigger things like session reset and disappearing messages. Also fix small bug where deleting a contact kept the (now removed) conversation open  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b8ef6c2cc6 
								
							
								 
							
						 
						
							
							
								
								Loki changes  
							
							... 
							
							
							
							Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								61b862b021 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.24.1  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8808100796 
								
							
								 
							
						 
						
							
							
								
								Merge signal-1.24.0  
							
							... 
							
							
							
							# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	background.html
#	config/default.json
#	config/production.json
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_view.js
#	js/views/inbox_view.js
#	js/views/settings_view.js
#	main.js
#	package.json
#	test/index.html
#	ts/components/conversation/ContactName.tsx
#	yarn.lock 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3152f92e30 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.23.2  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	js/conversation_controller.js
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ef670bec3f 
								
							
								 
							
						 
						
							
							
								
								Ensure that we have all conversations in redux store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1f03e04d8c 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'c75a756b2a58bd4a79890e34673d95d9f17f3f01' into signal-1.23  
							
							... 
							
							
							
							# Conflicts:
#	js/views/conversation_view.js
#	package.json
#	ts/components/ConversationListItem.tsx
#	ts/components/conversation/ConversationHeader.tsx 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fca40cb548 
								
							
								 
							
						 
						
							
							
								
								Disable keyboard shortcut for conversation archive  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								12ce0140de 
								
							
								 
							
						 
						
							
							
								
								Left pane changes.  
							
							... 
							
							
							
							Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23
# Conflicts:
#	_locales/en/messages.json
#	background.html
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_list_item_view.js
#	js/views/conversation_list_view.js
#	js/views/conversation_search_view.js
#	js/views/inbox_view.js
#	libtextsecure/account_manager.js
#	package.json
#	stylesheets/_global.scss
#	stylesheets/_index.scss
#	stylesheets/_modules.scss
#	test/_test.js
#	test/index.html
#	test/models/conversations_test.js
#	test/views/conversation_search_view_test.js
#	ts/components/ConversationListItem.tsx
#	ts/components/MainHeader.tsx
#	ts/components/conversation/ConversationHeader.tsx
#	ts/components/conversation/ResetSessionNotification.tsx 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								48c4ed1a29 
								
							
								 
							
						 
						
							
							
								
								Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23  
							
							... 
							
							
							
							# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js 
							
						 
						
							7 years ago