9dae805017 
								
							
								 
							
						 
						
							
							
								
								Run lint  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								81de5f9a76 
								
							
								 
							
						 
						
							
							
								
								Introduce CTRL-E shortcut for archiving a conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0c69d725c3 
								
							
								 
							
						 
						
							
							
								
								Ensure that we have all conversations in redux store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e68367fe0d 
								
							
								 
							
						 
						
							
							
								
								Remove reference to nonexistent view  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								009c58749b 
								
							
								 
							
						 
						
							
							
								
								Don't continue to log if socket is returning unknown status  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d0d57ea8c7 
								
							
								 
							
						 
						
							
							
								
								Add more functionality to the conversation right click menu, add right click for messages, change some of the ways toasts/confirmation dialogs are created, auto focus text input for nickname, clean up some stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5c29c6cb1d 
								
							
								 
							
						 
						
							
							
								
								Search view now works with deleting contacts as well  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0c104e5a53 
								
							
								 
							
						 
						
							
							
								
								Small fix for the disconnected banner coming up when it shouldn't, just default to thinking we are connected and mock the onEmpty event. Will only get set to not connected if requests fail  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f92cc6cbd4 
								
							
								 
							
						 
						
							
							
								
								Added menu option to view seed.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a1255dd31e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #77  from Mikunj/password-protection  
							
							... 
							
							
							
							Password protection 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4a2c618803 
								
									
								
							
								 
							
						 
						
							
							
								
								Update js/views/inbox_view.js  
							
							... 
							
							
							
							Co-Authored-By: Mikunj <Mikunj@users.noreply.github.com> 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0cfabb5ffa 
								
							
								 
							
						 
						
							
							
								
								Added unread indicator in conversations sections.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0b87f13699 
								
							
								 
							
						 
						
							
							
								
								Added password dialog view.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								26ba553e6a 
								
							
								 
							
						 
						
							
							
								
								Added menu options to set, change and remove password.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1cb09cad2a 
								
							
								 
							
						 
						
							
							
								
								Add header options.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14ecbc3f35 
								
							
								 
							
						 
						
							
							
								
								Moved MainHeader into its own Backbone View.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cb3599eea8 
								
							
								 
							
						 
						
							
							
								
								Removed IdentityKeyHeader.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								961eb53915 
								
							
								 
							
						 
						
							
							
								
								Auto-generate profile images on conversations.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d6d71cb51e 
								
							
								 
							
						 
						
							
							
								
								Show all contacts.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3eb193cca2 
								
							
								 
							
						 
						
							
							
								
								Added accordian  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fbc3832cfb 
								
							
								 
							
						 
						
							
							
								
								Show friends in inbox.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14ee7fec65 
								
							
								 
							
						 
						
							
							
								
								Moved and nicknames into conversations.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								98c4b5d77b 
								
							
								 
							
						 
						
							
							
								
								Added editing own nickname.  
							
							... 
							
							
							
							Fix dark theme support.
Fix notification titles. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c583819ccf 
								
							
								 
							
						 
						
							
							
								
								Fixed view layouts after deleting a conversation.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9370e2b74a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							... 
							
							
							
							* 'master' of https://github.com/signalapp/Signal-Desktop : (38 commits)
  v1.17.0
  v1.17.0-beta.4
  Ensure that blue group avatars are preserved in dark theme
  Android theme: Incoming quotes take color from containing message
  Conversations have blue avatar backgrounds if no image provided
  Fix lint errors
  Add ca language
  inboxView: Ensure Conversation exists for our own number
  Ensure that file is not attached if we've filtered it
  v1.17.0-beta.3
  Localization updates
  v1.16.3
  Lint fixes
  Lint fixes
  Better handle large numbers of messages in cache on startup
  Keep object stores after conversations migrate to SQLCipher
  Longer timeout for orphaned file cleanup
  Tests and increase consistency for isFileDangerous calls
  Longer timeout for orphaned file cleanup
  v1.17.0-beta.2
  ...
# Conflicts:
#	background.html
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b9cc17b81a 
								
							
								 
							
						 
						
							
							
								
								inboxView: Ensure Conversation exists for our own number  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a8e12d0771 
								
							
								 
							
						 
						
							
							
								
								Add user's avatar to the top left of the screen  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f33419b52 
								
							
								 
							
						 
						
							
							
								
								Change pubkey representation to hex instead of base64  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								09a0c46637 
								
							
								 
							
						 
						
							
							
								
								added identity key above the conversation box  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5933a34a18 
								
							
								 
							
						 
						
							
							
								
								Use window.log in browser context, turn on console eslint rule  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								db91560990 
								
							
								 
							
						 
						
							
							
								
								Fixes for quotes/schema upgrade, optimize media gallery load  
							
							... 
							
							
							
							Also: Fix for contact detail page; didn't show back button 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								675e34fc8d 
								
							
								 
							
						 
						
							
							
								
								New React component: ConversationListItem, installed in left pane  
							
							... 
							
							
							
							When collecting a conversation's last message, we grab that message's
status as well (if outgoing) and show it. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3c69886320 
								
							
								 
							
						 
						
							
							
								
								Finish new Message component, integrate into application  
							
							... 
							
							
							
							Also:
- New schema version 8 with video/image thumbnails, screenshots, sizes
- Upgrade messages not at current schema version when loading messages
  to show in conversation
- New MessageDetail react component
- New ConversationHeader react component 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad4387803b 
								
							
								 
							
						 
						
							
							
								
								New media permission, show dialog when not enabled for voice msg  
							
							... 
							
							
							
							UI now in separate renderer:
  - the permissions popup
  - settings dialog
  - debug log dialog
  - about window
Couple bug fixes:
  - About Window: Fix 'escape' to close window
  - Remove outdated dist/copy tasks from Gruntfile
Eslintified settings_view.js 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1dd87ad197 
								
							
								 
							
						 
						
							
							
								
								Format all source code using Prettier  
							
							
							
						 
						
							8 years ago