5123fa0409 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #669  from msgmaxim/restoration  
							
							... 
							
							
							
							Prompting the user to reset session on invalid ciphertext 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								81bfa90943 
								
							
								 
							
						 
						
							
							
								
								Prompting the user to reset session on invalid ciphertext  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ab0d084f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from msgmaxim/group-invites  
							
							... 
							
							
							
							Public chat invitations 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								db0068b429 
								
							
								 
							
						 
						
							
							
								
								Sending and handling of special UNPAIRING_REQUEST message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8c79800cee 
								
							
								 
							
						 
						
							
							
								
								Use oninput for secondary devices names and allow for consecutive pairings without closing the dialog  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								65361d33f5 
								
							
								 
							
						 
						
							
							
								
								New menu item "show pairing words" for secondary devices  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								5d2f7ddb20 
								
							
								 
							
						 
						
							
							
								
								Add messages needed for UI, bit of house work  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								39fac5fd02 
								
							
								 
							
						 
						
							
							
								
								Add initial add server UI skeleton  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ecf057386 
								
							
								 
							
						 
						
							
							
								
								Display list of paired device in modal  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0426d85e7a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							... 
							
							
							
							* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix  #355  Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...
# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bd16bc5b9b 
								
							
								 
							
						 
						
							
							
								
								lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6de6b762e6 
								
							
								 
							
						 
						
							
							
								
								Ensure the latest contact signed prekey is used  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3380500a2d 
								
							
								 
							
						 
						
							
							
								
								Added QR code viewing.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								79d842635d 
								
							
								 
							
						 
						
							
							
								
								fix events registration issues  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								ac4038e86a 
								
							
								 
							
						 
						
							
							
								
								Dialogs for device pairing requests - Primary device side  
							
							
							
						 
						
							6 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  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								df93c97b48 
								
							
								 
							
						 
						
							
							
								
								Added ability to delete contacts and destroy all sessions with them. Added right click menu to contacts/conversations in list which can block, delete messages and delete contact  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0491ceacf1 
								
							
								 
							
						 
						
							
							
								
								Added seed dialog.  
							
							... 
							
							
							
							Fixed issue where incorrect language was used to generate seed. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a1255dd31e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #77  from Mikunj/password-protection  
							
							... 
							
							
							
							Password protection 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d8f4d1f313 
								
							
								 
							
						 
						
							
							
								
								Fixes to get production build working  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0b87f13699 
								
							
								 
							
						 
						
							
							
								
								Added password dialog view.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								98c4b5d77b 
								
							
								 
							
						 
						
							
							
								
								Added editing own nickname.  
							
							... 
							
							
							
							Fix dark theme support.
Fix notification titles. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ce9d6a08c 
								
							
								 
							
						 
						
							
							
								
								Added nickname dialog.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dba6a36e83 
								
							
								 
							
						 
						
							
							
								
								removed old unused code.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								688f275262 
								
							
								 
							
						 
						
							
							
								
								pass in source, sourceDevice, timestamp and receivedAt when adding a friend request.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c150cbe34f 
								
							
								 
							
						 
						
							
							
								
								Friend request message indicator.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b9e85bb141 
								
							
								 
							
						 
						
							
							
								
								Added handling of accept and decline events.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e1ffe582c3 
								
							
								 
							
						 
						
							
							
								
								Prompt user when an incoming friend request is received  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7d9711ba65 
								
							
								 
							
						 
						
							
							
								
								Restore iOS-specific theme; colors on left in android theme  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								10c53bddb0 
								
							
								 
							
						 
						
							
							
								
								Move to new colors, switch incoming/outgoing colors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a247ffe5cf 
								
							
								 
							
						 
						
							
							
								
								When iOS device has been linked, use iOS color scheme  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								43a44793c5 
								
							
								 
							
						 
						
							
							
								
								Remove jshint - move everything over to eslint  
							
							... 
							
							
							
							Also removed all hints of previous linters 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fc5c52fbdf 
								
							
								 
							
						 
						
							
							
								
								Remove iOS theme in favor of plain light/dark themes  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								1c23c6a9d7 
								
							
								 
							
						 
						
							
							
								
								Remove window.config in favor of window.getXXX() accessors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1dd87ad197 
								
							
								 
							
						 
						
							
							
								
								Format all source code using Prettier  
							
							
							
						 
						
							8 years ago