Mikunj Varsani
							
						 | 
						
							
							
							
								
								
							
							
								
							
								24a3e05154
								
									
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "Clean up unused dependencies.""
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								5ff7476359
								
									
								
							
								
							
						 | 
						
							
							
								
								Revert "Clean up unused dependencies."
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Mikunj
							
						 | 
						
							
							
							
							
								
							
								9d2417c2f6
								
							
								
							
						 | 
						
							
							
								
								Removed proxy-agent and web-socket.
							
							
							
							
							
							
							
							Trimmed down web_api.js to most basic functions we are using. This needs to be completely removed in the future. 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								ff10637a5a
								
									
								
							
								
							
						 | 
						
							
							
								
								separate update group name and group members dialog
							
							
							
							
							
							
							
							(add and remove members are separated) 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
								
								
							
							
								
							
								7867f4dceb
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'clearnet' into brand-redesign
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								4a7e2dece7
								
							
								
							
						 | 
						
							
							
								
								Password lock screen and delete data screen
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								4d690768a6
								
							
								
							
						 | 
						
							
							
								
								Scrolling button updated and animations to modals
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								293eca0509
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'brand-redesign' into clearnet
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								37cbd3d2c0
								
							
								
							
						 | 
						
							
							
								
								fix SessionSettings not found as does not exist
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								25344685a2
								
							
								
							
						 | 
						
							
							
								
								merge
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								010cf045cb
								
							
								
							
						 | 
						
							
							
								
								optimisation of ternary & binary expr.
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								e065cc404f
								
							
								
							
						 | 
						
							
							
								
								Password set, change and remove complete
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								67262c7eaa
								
							
								
							
						 | 
						
							
							
								
								lint after merge and fix startup of app
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								43956709ad
								
							
								
							
						 | 
						
							
							
								
								include the channel settings panel on right of conversation
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								9b8ad976e3
								
							
								
							
						 | 
						
							
							
								
								remove not used AddServerDialog -> now on chanel section
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								2b7af04587
								
							
								
							
						 | 
						
							
							
								
								Message selection fixed and optimised for speed
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								8c9854dd90
								
							
								
							
						 | 
						
							
							
								
								Settings onClick functionality
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								2cf152b882
								
									
								
							
								
							
						 | 
						
							
							
								
								Update signal.js
							
							
							
							
							
							
							
							Rmv old deps 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								74fd0159eb
								
							
								
							
						 | 
						
							
							
								
								Fix conflicts
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								2d01275ede
								
							
								
							
						 | 
						
							
							
								
								QR Code responds to theme changes
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								2ede557a74
								
							
								
							
						 | 
						
							
							
								
								Modal additions incl. QR fixup and Seed View
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								2caffa9289
								
							
								
							
						 | 
						
							
							
								
								Dependencies resorted and modal adjustments
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								b09ca5c751
								
							
								
							
						 | 
						
							
							
								
								remove not used headerview
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								8074756dc2
								
							
								
							
						 | 
						
							
							
								
								Infinte duration toasts
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								6ee5d041fb
								
							
								
							
						 | 
						
							
							
								
								Finishing up some modals
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								648cc2339c
								
							
								
							
						 | 
						
							
							
								
								Working with deps
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								659d4412bd
								
							
								
							
						 | 
						
							
							
								
								QR code completion
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								2419272608
								
							
								
							
						 | 
						
							
							
								
								Updated React dialogs to SessionModals
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								228e4ca81e
								
							
								
							
						 | 
						
							
							
								
								Adding session settings to utilise toggles
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								8aac656107
								
							
								
							
						 | 
						
							
							
								
								Modals finished. Need to xfer all to React
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								9afb8b4d5e
								
							
								
							
						 | 
						
							
							
								
								Major rework of context menus
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								e9d543fe4a
								
							
								
							
						 | 
						
							
							
								
								Dropdown generalisation and simplification
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								12011a30d4
								
							
								
							
						 | 
						
							
							
								
								Inital dropdown, modal and toggle
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vince
							
						 | 
						
							
							
							
								
								
							
							
								
							
								9cd27abf31
								
									
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'brand-redesign' into brand-redesign
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Vincent
							
						 | 
						
							
							
							
							
								
							
								4d463c659c
								
							
								
							
						 | 
						
							
							
								
								Filesize toast amend
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								cc97d9284b
								
							
								
							
						 | 
						
							
							
								
								add first chunck of our SessionRegistrationView
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								7a97736751
								
							
								
							
						 | 
						
							
							
								
								remove unused manageModerators dialog
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Ryan Tharp
							
						 | 
						
							
							
							
							
								
							
								5730a88c18
								
							
								
							
						 | 
						
							
							
								
								add/remove moderator modal dialogs
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Audric Ackermann
							
						 | 
						
							
							
							
							
								
							
								9992a3da1d
								
							
								
							
						 | 
						
							
							
								
								Add a showUserDetails modal to display user's details
							
							
							
							
							
							
							
							Relates #655 
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								a5fce17d8c
								
							
								
							
						 | 
						
							
							
								
								public chat invitations
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								4dd314c18f
								
							
								
							
						 | 
						
							
							
								
								Enable profile pictures
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								8677fb15a0
								
							
								
							
						 | 
						
							
							
								
								Select multiple messages and bulk deletion
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								9f81f67460
								
							
								
							
						 | 
						
							
							
								
								Can leave private group chats
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								cf18572049
								
							
								
							
						 | 
						
							
							
								
								Adding new group members; establishing sessions between non-friends
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								0d19b708f9
								
							
								
							
						 | 
						
							
							
								
								Creating private group chats between friends
							
							
							
							
							
						 | 
						
							6 years ago | 
						
					
				
					
						
							
							
								 
								Maxim Shishmarev
							
						 | 
						
							
							
							
							
								
							
								1496a368e9
								
							
								
							
						 | 
						
							
							
								
								Add UI elements for searching and selecting members in a group chat
							
							
							
							
							
						 | 
						
							6 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
							
						 | 
						
							
							
							
							
								
							
								b3ac1373fa
								
							
								
							
						 | 
						
							
							
								
								Move left pane entirely to React
							
							
							
							
							
						 | 
						
							7 years ago |