Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								2aef1f3132 
								
									
								
							
								 
							
						 
						
							
							
								
								be sure blocked border is shown even with mention or unread  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								252c45f635 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into use-created-at-server-timestamp  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								71169a56fe 
								
									
								
							
								 
							
						 
						
							
							
								
								fix light theme attachment doc UI  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								cb911d4db1 
								
									
								
							
								 
							
						 
						
							
							
								
								fix members ui for light mode  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								055234ef53 
								
									
								
							
								 
							
						 
						
							
							
								
								add animation for highlighted messages  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f7d6da0ebc 
								
									
								
							
								 
							
						 
						
							
							
								
								remove useless css  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								8f78334d84 
								
									
								
							
								 
							
						 
						
							
							
								
								lint  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f8cf59a0bf 
								
									
								
							
								 
							
						 
						
							
							
								
								clean unused css  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								8ff53a434a 
								
									
								
							
								 
							
						 
						
							
							
								
								refactor quote styles  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								4070a7099f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/clearnet' into add-light-theme  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								b1e29cc89f 
								
									
								
							
								 
							
						 
						
							
							
								
								refactor scss  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								5f51573f53 
								
									
								
							
								 
							
						 
						
							
							
								
								remove unused templates  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								291982c2aa 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup css and themify missing stuff  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								9cbf21547b 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup scss and themify message view  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								f3a51cf2a6 
								
									
								
							
								 
							
						 
						
							
							
								
								add custon light/black scrollbar style  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								103962f1eb 
								
									
								
							
								 
							
						 
						
							
							
								
								cleanup ios theme unused  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								1f228fe6ee 
								
									
								
							
								 
							
						 
						
							
							
								
								reduce font size of expire app version alert  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								abc9456d14 
								
									
								
							
								 
							
						 
						
							
							
								
								add popup for disabling multi device  
							
							 
							
							
							
						 
						
							5 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								ed89f8c4b1 
								
							
								 
							
						 
						
							
							
								
								Update fonts and rework SASS  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj Varsani
							
						 
						
							 
							
							
								
								
							
							
								
							
								24a3e05154 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Revert "Clean up unused dependencies.""  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vince
							
						 
						
							 
							
							
								
								
							
							
								
							
								5ff7476359 
								
									
								
							
								 
							
						 
						
							
							
								
								Revert "Clean up unused dependencies."  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								828444aadc 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1cadb01e8d 
								
							
								 
							
						 
						
							
							
								
								Remove intl-tel-input  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								c5ff70c970 
								
							
								 
							
						 
						
							
							
								
								Message deletion fix  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vince
							
						 
						
							 
							
							
								
								
							
							
								
							
								5bbd136493 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #758  from neuroscr/version-check  
							
							 
							
							... 
							
							
							
							Version check, de-signal.org-ification 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								31af2b60f1 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' of  https://github.com/loki-project/loki-messenger  into clearnet  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								aeb04a3a44 
								
							
								 
							
						 
						
							
							
								
								onboarding messageview  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
								
								
							
							
								
							
								cc98cec72f 
								
									
								
							
								 
							
						 
						
							
							
								
								fix disabled state of message input on sent friendrequest  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Ryan Tharp
							
						 
						
							 
							
							
							
								
							
								c80a6e922c 
								
							
								 
							
						 
						
							
							
								
								make expired banner legible  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								d7dca5a9fb 
								
							
								 
							
						 
						
							
							
								
								remove button borders on dialog  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								8de2ce9e23 
								
							
								 
							
						 
						
							
							
								
								Theme toggle and settings abstraction  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Vincent
							
						 
						
							 
							
							
							
								
							
								bbf5f8a9f2 
								
							
								 
							
						 
						
							
							
								
								Bottom bar compose message area styling  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Audric Ackermann
							
						 
						
							 
							
							
							
								
							
								3014b7ccba 
								
							
								 
							
						 
						
							
							
								
								update conversation list item in messages view  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								f860076587 
								
							
								 
							
						 
						
							
							
								
								Modified colour of dark mod badge  
							
							 
							
							
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							 
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								f5af063191 
								
							
								 
							
						 
						
							
							
								
								Improve spinner colors on top of medium-brightness backgrounds  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								sachaaaaa
							
						 
						
							 
							
							
							
								
							
								a0f67c22da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'textsecure/master' into merge_1_21_0  
							
							 
							
							... 
							
							
							
							* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083 )
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss 
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								1a11c53a79 
								
							
								 
							
						 
						
							
							
								
								Dark Theme: Preserve blue background on app loading screen  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Mikunj
							
						 
						
							 
							
							
							
								
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							 
							
							
							
						 
						
							7 years ago  
						
					 
				
					
						
							
							
								 
								Scott Nonnenberg
							
						 
						
							 
							
							
							
								
							
								0de54e125c 
								
							
								 
							
						 
						
							
							
								
								Improve caption editor usability, new 'add attachment' affordance  
							
							 
							
							
							
						 
						
							7 years ago