c0a33a630f 
								
							
								 
							
						 
						
							
							
								
								Join channel generalisation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								02320334f0 
								
							
								 
							
						 
						
							
							
								
								Remove P2P  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7e6bbe9c54 
								
							
								 
							
						 
						
							
							
								
								do not make highlighted message different for now  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								98b4b18583 
								
							
								 
							
						 
						
							
							
								
								Added message selection inital functionality and added to buttons  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c2c084920a 
								
							
								 
							
						 
						
							
							
								
								Namespacing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c9887f7bc3 
								
							
								 
							
						 
						
							
							
								
								Exports simplification and message selection  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								10676f5573 
								
							
								 
							
						 
						
							
							
								
								Improved file structuring  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a17964beb7 
								
							
								 
							
						 
						
							
							
								
								Using singular enum names rather than plural  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								141c0135fb 
								
							
								 
							
						 
						
							
							
								
								Fixed styling  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d62f1c6e22 
								
							
								 
							
						 
						
							
							
								
								Inital conversation restructuring  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								44ff75cc88 
								
							
								 
							
						 
						
							
							
								
								Fixed multi select by preventing select on clicking audio element in message list.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1020f54b60 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #662  from Bilb/655-clickable-profile  
							
							... 
							
							
							
							clickable profile 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a7a2f9289c 
								
							
								 
							
						 
						
							
							
								
								Updated references to hasModPerms to isModerator for code consistency  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9068d56ce 
								
							
								 
							
						 
						
							
							
								
								Updated isModerator to senderIsModerator and fixed logic of isModerator function  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								acea116d4f 
								
							
								 
							
						 
						
							
							
								
								Revert "Message: click on avatar show userDetailModal"  
							
							... 
							
							
							
							This reverts commit 2c914c554d 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								be5f932c08 
								
							
								 
							
						 
						
							
							
								
								fix lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c61249e5e0 
								
							
								 
							
						 
						
							
							
								
								put event in the avatar element and trigger it in conversation header  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c914c554d 
								
							
								 
							
						 
						
							
							
								
								Message: click on avatar show userDetailModal  
							
							... 
							
							
							
							Disable the click on avatar because before it selected the message.
OnClick on avatar -> trigger event to show the UserDetails modal with this pubkey. 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								43a91ab672 
								
							
								 
							
						 
						
							
							
								
								Linted  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3d171884d 
								
							
								 
							
						 
						
							
							
								
								Added ban user right click functionality  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8b2876dadc 
								
							
								 
							
						 
						
							
							
								
								Disable context menu and message selection for RSS feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2262b41cd7 
								
							
								 
							
						 
						
							
							
								
								Prevent hiding the context menu by clicking away to also potentially select messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2990c95e40 
								
							
								 
							
						 
						
							
							
								
								Fix incorrect margins for public messages and friend request bubbles  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c96990119 
								
							
								 
							
						 
						
							
							
								
								Correctly handle server errors in multi-deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f5e9a870f7 
								
							
								 
							
						 
						
							
							
								
								Add support for mentions in private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e64ccbdd2b 
								
							
								 
							
						 
						
							
							
								
								Clean up RSS conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								687e9db77b 
								
							
								 
							
						 
						
							
							
								
								Custom message rendering of mentions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d9e4bbf45 
								
							
								 
							
						 
						
							
							
								
								Only shorten pubkeys if name is present  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								08cab426c5 
								
							
								 
							
						 
						
							
							
								
								Shorten pubkeys in quotations too  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0b898612d9 
								
							
								 
							
						 
						
							
							
								
								Linting.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9a2b57d37 
								
							
								 
							
						 
						
							
							
								
								Show crown icon for moderators  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								72b3d02b52 
								
							
								 
							
						 
						
							
							
								
								Poll for moderators, store them on the conversation and use the list to determine our own mod status  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								616e952f8e 
								
							
								 
							
						 
						
							
							
								
								Add right click option to public chat messages to copy pubkey of sender  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								351fa09ad6 
								
							
								 
							
						 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e4ecc5b389 
								
							
								 
							
						 
						
							
							
								
								A prepare for message deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c57571fdfd 
								
							
								 
							
						 
						
							
							
								
								loki.network rss feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								fce4d0ce79 
								
							
								 
							
						 
						
							
							
								
								Review cleanup  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								86e55e5dc6 
								
							
								 
							
						 
						
							
							
								
								Clean up bold check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3ea3a394e7 
								
							
								 
							
						 
						
							
							
								
								Only bold the profile name for messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								958766dc65 
								
							
								 
							
						 
						
							
							
								
								Bold the profile name and truncate the pubkey  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1d0067e6e5 
								
							
								 
							
						 
						
							
							
								
								Forgot to add this part  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								e343a04eea 
								
							
								 
							
						 
						
							
							
								
								Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	background.html
#	config/default.json
#	js/background.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/modules/data.js
#	js/signal_protocol_store.js
#	js/views/conversation_search_view.js
#	libtextsecure/message_receiver.js
#	libtextsecure/sendmessage.js
#	main.js
#	package.json
#	preload.js
#	test/index.html
#	ts/components/Avatar.tsx
#	ts/components/conversation/ConversationHeader.md
#	ts/components/conversation/ConversationHeader.tsx 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c4d90df07 
								
							
								 
							
						 
						
							
							
								
								Send long text as an attachment instead of inline  
							
							... 
							
							
							
							Remove Android length warning
Handle incoming long message attachments
Show long download pending status in message bubble
Fix the width of the smallest spinner
Remove Android length warning from HTML templates 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14367620d9 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							7 years ago