7867f4dceb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4a7e2dece7 
								
							
								 
							
						 
						
							
							
								
								Password lock screen and delete data screen  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d690768a6 
								
							
								 
							
						 
						
							
							
								
								Scrolling button updated and animations to modals  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								293eca0509 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'brand-redesign' into clearnet  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								37cbd3d2c0 
								
							
								 
							
						 
						
							
							
								
								fix SessionSettings not found as does not exist  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								25344685a2 
								
							
								 
							
						 
						
							
							
								
								merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								010cf045cb 
								
							
								 
							
						 
						
							
							
								
								optimisation of ternary & binary expr.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e065cc404f 
								
							
								 
							
						 
						
							
							
								
								Password set, change and remove complete  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								67262c7eaa 
								
							
								 
							
						 
						
							
							
								
								lint after merge and fix startup of app  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								43956709ad 
								
							
								 
							
						 
						
							
							
								
								include the channel settings panel on right of conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9b8ad976e3 
								
							
								 
							
						 
						
							
							
								
								remove not used AddServerDialog -> now on chanel section  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2b7af04587 
								
							
								 
							
						 
						
							
							
								
								Message selection fixed and optimised for speed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8c9854dd90 
								
							
								 
							
						 
						
							
							
								
								Settings onClick functionality  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2cf152b882 
								
									
								
							
								 
							
						 
						
							
							
								
								Update signal.js  
							
							... 
							
							
							
							Rmv old deps 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								74fd0159eb 
								
							
								 
							
						 
						
							
							
								
								Fix conflicts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2d01275ede 
								
							
								 
							
						 
						
							
							
								
								QR Code responds to theme changes  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ede557a74 
								
							
								 
							
						 
						
							
							
								
								Modal additions incl. QR fixup and Seed View  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2caffa9289 
								
							
								 
							
						 
						
							
							
								
								Dependencies resorted and modal adjustments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								b09ca5c751 
								
							
								 
							
						 
						
							
							
								
								remove not used headerview  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8074756dc2 
								
							
								 
							
						 
						
							
							
								
								Infinte duration toasts  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6ee5d041fb 
								
							
								 
							
						 
						
							
							
								
								Finishing up some modals  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								648cc2339c 
								
							
								 
							
						 
						
							
							
								
								Working with deps  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								659d4412bd 
								
							
								 
							
						 
						
							
							
								
								QR code completion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2419272608 
								
							
								 
							
						 
						
							
							
								
								Updated React dialogs to SessionModals  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								228e4ca81e 
								
							
								 
							
						 
						
							
							
								
								Adding session settings to utilise toggles  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8aac656107 
								
							
								 
							
						 
						
							
							
								
								Modals finished. Need to xfer all to React  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9afb8b4d5e 
								
							
								 
							
						 
						
							
							
								
								Major rework of context menus  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9d543fe4a 
								
							
								 
							
						 
						
							
							
								
								Dropdown generalisation and simplification  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								12011a30d4 
								
							
								 
							
						 
						
							
							
								
								Inital dropdown, modal and toggle  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9cd27abf31 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'brand-redesign' into brand-redesign  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4d463c659c 
								
							
								 
							
						 
						
							
							
								
								Filesize toast amend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc97d9284b 
								
							
								 
							
						 
						
							
							
								
								add first chunck of our SessionRegistrationView  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7a97736751 
								
							
								 
							
						 
						
							
							
								
								remove unused manageModerators dialog  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5730a88c18 
								
							
								 
							
						 
						
							
							
								
								add/remove moderator modal dialogs  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cf18572049 
								
							
								 
							
						 
						
							
							
								
								Adding new group members; establishing sessions between non-friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0d19b708f9 
								
							
								 
							
						 
						
							
							
								
								Creating private group chats between friends  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1496a368e9 
								
							
								 
							
						 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat  
							
							
							
						 
						
							6 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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a989a1a818 
								
							
								 
							
						 
						
							
							
								
								Save previews locally.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								92c071e083 
								
							
								 
							
						 
						
							
							
								
								Use the proper method for pulling attachments off disk for retry  
							
							
							
						 
						
							7 years ago