64996844ac 
								
							
								 
							
						 
						
							
							
								
								Updated references to hasModPerms to isModerator for code consistency  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0643c6836c 
								
							
								 
							
						 
						
							
							
								
								Cached constants for readability  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a7a2f9289c 
								
							
								 
							
						 
						
							
							
								
								Updated references to hasModPerms to isModerator for code consistency  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e9068d56ce 
								
							
								 
							
						 
						
							
							
								
								Updated isModerator to senderIsModerator and fixed logic of isModerator function  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								81bfa90943 
								
							
								 
							
						 
						
							
							
								
								Prompting the user to reset session on invalid ciphertext  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7ed103f286 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #651  from msgmaxim/original-message  
							
							... 
							
							
							
							Check again for quoted messages after a short timeout 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9992a3da1d 
								
							
								 
							
						 
						
							
							
								
								Add a showUserDetails modal to display user's details  
							
							... 
							
							
							
							Relates #655  
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								43a91ab672 
								
							
								 
							
						 
						
							
							
								
								Linted  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								bee5a89f14 
								
							
								 
							
						 
						
							
							
								
								Show toast on user ban  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2ab0d084f1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #645  from msgmaxim/group-invites  
							
							... 
							
							
							
							Public chat invitations 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d562a88583 
								
							
								 
							
						 
						
							
							
								
								Check again for quoted messages after a short timeout  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2bbc1ecf63 
								
							
								 
							
						 
						
							
							
								
								Make ban user; handle server request  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3d171884d 
								
							
								 
							
						 
						
							
							
								
								Added ban user right click functionality  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								89e5e919f2 
								
							
								 
							
						 
						
							
							
								
								Address more review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								56bb2ed792 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ea82b14e3 
								
							
								 
							
						 
						
							
							
								
								Add channel id field to invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a5fce17d8c 
								
							
								 
							
						 
						
							
							
								
								public chat invitations  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9d50c21b29 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #635  from msgmaxim/context-menu-select  
							
							... 
							
							
							
							Don't select messages when context menu is shown 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8b2876dadc 
								
							
								 
							
						 
						
							
							
								
								Disable context menu and message selection for RSS feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2262b41cd7 
								
							
								 
							
						 
						
							
							
								
								Prevent hiding the context menu by clicking away to also potentially select messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								4dd314c18f 
								
							
								 
							
						 
						
							
							
								
								Enable profile pictures  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6c28b1aa79 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #623  from loki-project/multi-device  
							
							... 
							
							
							
							Multi device 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d1c450a213 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #621  from msgmaxim/select-messages  
							
							... 
							
							
							
							Prevent clicking on quote from selecting the message 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								685ada5cc5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into prep-merge  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2e8e6480f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #539  from neuroscr/multidevice-publicchat  
							
							... 
							
							
							
							[multi-device] public chat 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6c4fa6986b 
								
							
								 
							
						 
						
							
							
								
								Prevent clicking on quote from selecting the message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f1c155b943 
								
							
								 
							
						 
						
							
							
								
								Stop sending sync messages to public chats and mark messages from any of our devices as outgoing  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								24a687c106 
								
							
								 
							
						 
						
							
							
								
								Throttle the refreshing of device mappings to once every minute  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								6611a10855 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #590  from BeaudanBrown/session-reset-on-fr  
							
							... 
							
							
							
							Session reset on fr 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0f74a002df 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #601  from BeaudanBrown/sync-messages  
							
							... 
							
							
							
							[multi-device] Sync messages 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								accd16cae1 
								
							
								 
							
						 
						
							
							
								
								Trigger friend request received update for the correct device conversation, throttle the sending of automated friend requests and don't send them to devices which sent *us* a friend request  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8677fb15a0 
								
							
								 
							
						 
						
							
							
								
								Select multiple messages and bulk deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f16b032056 
								
							
								 
							
						 
						
							
							
								
								Handle sync messages properly for some edge cases, ensure we always have a primaryDevicePubKey, send contact sync message  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								395daf3aba 
								
							
								 
							
						 
						
							
							
								
								Use Array.includes in place of Array.indexOf  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a2f836c690 
								
							
								 
							
						 
						
							
							
								
								Address review comments  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								7c05939f55 
								
							
								 
							
						 
						
							
							
								
								Add group admins and the ability to remove members from private groups  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9f81f67460 
								
							
								 
							
						 
						
							
							
								
								Can leave private group chats  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f5e9a870f7 
								
							
								 
							
						 
						
							
							
								
								Add support for mentions in 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  
				
					
						
							
							
								 
						
							
							
								e9dc3b531e 
								
							
								 
							
						 
						
							
							
								
								Simplify auto accept check  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8ccf62ed4e 
								
							
								 
							
						 
						
							
							
								
								Trigger endSession code if we receive a friend request from a friend  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								cc8277f54d 
								
							
								 
							
						 
						
							
							
								
								Better variable name and use it in more places  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								883feb668d 
								
							
								 
							
						 
						
							
							
								
								The rest of my multidevice work, send messages to all the correct devices and automatic friend request if not friends with a device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								d97eced37b 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a3019e12bf 
								
							
								 
							
						 
						
							
							
								
								Hide android friend request accepts and lint  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f538aeea50 
								
							
								 
							
						 
						
							
							
								
								Remove old link preview system  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								29e83cadbf 
								
							
								 
							
						 
						
							
							
								
								Check against null message body when detecting mentions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8d6fee4aec 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'clearnet' into multi-device  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								53bdf14321 
								
							
								 
							
						 
						
							
							
								
								refactor  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8be1c61f4c 
								
							
								 
							
						 
						
							
							
								
								Highlight conversations with unread mentions of the user  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1f3311bc5d 
								
							
								 
							
						 
						
							
							
								
								Save device mappings upon accepting friend request + various fixes  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								51f161a613 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #498  from Mikunj/mod-badges  
							
							... 
							
							
							
							Mod badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0acea50acb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #490  from BeaudanBrown/incoming-public  
							
							... 
							
							
							
							Fix duplicate detection for sent messages in public chat 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								0883b1b650 
								
							
								 
							
						 
						
							
							
								
								Updated styles.  
							
							... 
							
							
							
							Merge commit clearnet into mod-badges 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								72b3d02b52 
								
							
								 
							
						 
						
							
							
								
								Poll for moderators, store them on the conversation and use the list to determine our own mod status  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								e5eab74b1b 
								
							
								 
							
						 
						
							
							
								
								Fix   #355  Display timestamp for friend requests  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9fe613967a 
								
							
								 
							
						 
						
							
							
								
								Fix duplicate detection for sent messages in public chat  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								9beea2cbd3 
								
							
								 
							
						 
						
							
							
								
								Enforce curlies completely and lint with new settings  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								a6abcaf826 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #453  from Mikunj/profile-simplification  
							
							... 
							
							
							
							Profile simplification 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								831ae09576 
								
							
								 
							
						 
						
							
							
								
								Cherry pick "profile simplification" from Mik  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								8066affd2c 
								
							
								 
							
						 
						
							
							
								
								Move initialisation of public and rss conversations to fix early loading error. Rename function to be more readable  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								616e952f8e 
								
							
								 
							
						 
						
							
							
								
								Add right click option to public chat messages to copy pubkey of sender  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								3178d67295 
								
							
								 
							
						 
						
							
							
								
								allow yourself to request deletion of messages  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								351fa09ad6 
								
							
								 
							
						 
						
							
							
								
								Only show delete option if have mod status and show different modal for mod deletion  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								1b4105a3d0 
								
							
								 
							
						 
						
							
							
								
								Fix db stuff and remove unneeded message function  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c4dd10a5cd 
								
							
								 
							
						 
						
							
							
								
								Simplified profile setting. Renamed functions to be less confusing. Removed storing profile in local storage.  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								16cc1cb400 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #443  from sachaaaaa/show_secondary_pubkey_message_details  
							
							... 
							
							
							
							[multi-device] Format message details to show secondary pubkey properly 
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								dce8c8bcf7 
								
							
								 
							
						 
						
							
							
								
								Format message details to show secondary pubkey properly  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								2c052a65a2 
								
							
								 
							
						 
						
							
							
								
								Display incoming messages in the primary device conversation  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								c57571fdfd 
								
							
								 
							
						 
						
							
							
								
								loki.network rss feed  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								899bfc3b2b 
								
							
								 
							
						 
						
							
							
								
								Add channel id to message table and provide helper functions  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f857744e88 
								
							
								 
							
						 
						
							
							
								
								Revert sending id  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								406938cf59 
								
							
								 
							
						 
						
							
							
								
								Cleaner forceSave  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f7039080af 
								
							
								 
							
						 
						
							
							
								
								Remove accidental swapfile, save messages with the id given to them from public server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								f718bf15d2 
								
							
								 
							
						 
						
							
							
								
								Prepare to delete message, send message id to server  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								21f0149e22 
								
							
								 
							
						 
						
							
							
								
								Send profile and update it  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								014558d939 
								
							
								 
							
						 
						
							
							
								
								Squash and clean of old PRs, move towards sending cleartext again  
							
							
							
						 
						
							6 years ago  
				
					
						
							
							
								 
						
							
							
								63396669bc 
								
							
								 
							
						 
						
							
							
								
								Add eslint rule to enforce curlys, run eslint --fix to automatically apply this rule and add swapfiles to gitignore  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								53cbfb1f5c 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into fix-friend-request-logic  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								12cce8fe47 
								
							
								 
							
						 
						
							
							
								
								Auto accept friend request messages if we were already friends with the user.  
							
							... 
							
							
							
							Lint fixes for previous files. 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								3a8111020e 
								
							
								 
							
						 
						
							
							
								
								Merge v1.23.0  
							
							... 
							
							
							
							# Conflicts:
#	background.html
#	package.json
#	yarn.lock 
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								57195017f9 
								
							
								 
							
						 
						
							
							
								
								Linting  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								62de2a229d 
								
							
								 
							
						 
						
							
							
								
								Add logging to track synchronization in message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								74cb808763 
								
							
								 
							
						 
						
							
							
								
								New MessageController as the single place for in-memory messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								274949b247 
								
							
								 
							
						 
						
							
							
								
								Enable long message send as an attachment  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d8fbe95ff 
								
							
								 
							
						 
						
							
							
								
								Retry send: Always remove all errors and recalculate recipients  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								32fa5cccde 
								
							
								 
							
						 
						
							
							
								
								Send sync sent messages properly in 1-member group  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b3ac1373fa 
								
							
								 
							
						 
						
							
							
								
								Move left pane entirely to React  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								768007a269 
								
							
								 
							
						 
						
							
							
								
								Message Detail: Ensure that quotes are not clickable  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6ffbc0ac06 
								
							
								 
							
						 
						
							
							
								
								Archive Conversation  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dcd16775c3 
								
							
								 
							
						 
						
							
							
								
								Note to Self: set expirationStartTimestamp before sending sync  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eb7ad48951 
								
							
								 
							
						 
						
							
							
								
								Only put nbsp before last token in msg body if token is <12 chars  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								06be1da40d 
								
							
								 
							
						 
						
							
							
								
								Added p2p message styling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								41ea9ee15b 
								
							
								 
							
						 
						
							
							
								
								Ensure that we show error'd recipients in message details screen  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad53423e0a 
								
							
								 
							
						 
						
							
							
								
								Queue quote reference handling per convo in handleDataMessage  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								af40ceda6c 
								
							
								 
							
						 
						
							
							
								
								Note to Self timer fixes for bugs reported by beta users  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5b54c9554e 
								
							
								 
							
						 
						
							
							
								
								Remove groups table, conversation is single source of truth  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a43a78731a 
								
							
								 
							
						 
						
							
							
								
								Note to Self  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								462fa712bc 
								
							
								 
							
						 
						
							
							
								
								Show members: Pull conversation from group table  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d30e950bf9 
								
							
								 
							
						 
						
							
							
								
								Changed hashing algorithm.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a989a1a818 
								
							
								 
							
						 
						
							
							
								
								Save previews locally.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7564e270f8 
								
							
								 
							
						 
						
							
							
								
								Lint and code cleanup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								27c6062351 
								
							
								 
							
						 
						
							
							
								
								Fix incoming messages not showing previews.  
							
							... 
							
							
							
							Linting. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ae695fe32f 
								
							
								 
							
						 
						
							
							
								
								Remove sending attachments.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8f8e25bb3e 
								
							
								 
							
						 
						
							
							
								
								Added local link preview  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
							
								0d7480bd92 
								
							
								 
							
						 
						
							
							
								
								A number of small fixes for Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1533fcc807 
								
							
								 
							
						 
						
							
							
								
								Fail over to all numbers in retry if errors don't have numbers  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dde63a552f 
								
							
								 
							
						 
						
							
							
								
								Fix bug with replayable errors, fix bug with set representation of swarmNodes not being handled properly  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								070d18b514 
								
							
								 
							
						 
						
							
							
								
								Updated function calls.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c0be4718fc 
								
							
								 
							
						 
						
							
							
								
								Update delivered_to for outgoing with earlier delivery receipts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bcb259919 
								
							
								 
							
						 
						
							
							
								
								Added PoW error.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f98fe910d5 
								
							
								 
							
						 
						
							
							
								
								Fix friend request retry not working.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2715e79268 
								
							
								 
							
						 
						
							
							
								
								Fix conversation status not being reset upon conversation messages deletion.  
							
							... 
							
							
							
							Fix incoming friend request not replacing old friend requests.
Fixed incorrect function name. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e62c661ed9 
								
							
								 
							
						 
						
							
							
								
								Treat session reset success messages as incoming, handle failure differently  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								df80249cba 
								
							
								 
							
						 
						
							
							
								
								fix missing awaits  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								28fc5793a7 
								
							
								 
							
						 
						
							
							
								
								More explicit function names, shifted friend request sent logic to more sensible place  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2de01d0343 
								
							
								 
							
						 
						
							
							
								
								Back to multiple pending states, fix some notification bugs and friend requests should now work for all cases besides message sending interruption  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								99252702e1 
								
							
								 
							
						 
						
							
							
								
								Support receiving multiple images in one messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b65d6a6d2c 
								
							
								 
							
						 
						
							
							
								
								Refactor friend request status to use a state enum variable  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbdd52b4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from Mikunj/fix/friend-request  
							
							... 
							
							
							
							Friend request fixes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fb8b0e1d40 
								
							
								 
							
						 
						
							
							
								
								Auto accept friend request if we have both incoming and outgoing friend requests.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7d8719f250 
								
							
								 
							
						 
						
							
							
								
								Fix incoming friend request messages being deleted.  
							
							... 
							
							
							
							Set pending outgoing friend requests to declined if we receive an incoming friend request.
Fix text input not blocking. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dba6a36e83 
								
							
								 
							
						 
						
							
							
								
								removed old unused code.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a3a7f4a621 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'ef44a123ed4ada70489d78fde16a86c60ced34a8' into feature/blocking  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								489ec8fc65 
								
							
								 
							
						 
						
							
							
								
								Heap of linting, eslint warning/error removal, and fixed a couple small bugs found along the way  
							
							... 
							
							
							
							Created new table to store the received message hashes. Checking this table when receiving messages to look for duplicates. Should be cleared of expired messages on app start and every hour after
Removed id which was not needed for seen messages. Refactored filter logic into function and found function name error
create unique index for contact prekeys (to allow using REPLACE)
Fixed lint stuff that merge brought back 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a82999818a 
								
							
								 
							
						 
						
							
							
								
								Added blocking/unblocking from friend request.  
							
							... 
							
							
							
							Fixed incoming messages being deleted. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								78d39ac177 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #41  from Mikunj/fix/friend-notification  
							
							... 
							
							
							
							Friend Notifications 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								17e5c861a1 
								
							
								 
							
						 
						
							
							
								
								Fixed review issues.  
							
							... 
							
							
							
							Fixed lint error. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a9e3a64888 
								
							
								 
							
						 
						
							
							
								
								removed unused default param.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4148628e70 
								
							
								 
							
						 
						
							
							
								
								Remove any unsent messages when app is started.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ece266fffd 
								
							
								 
							
						 
						
							
							
								
								Added showing pow icon.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dfae580ffa 
								
							
								 
							
						 
						
							
							
								
								Added notification when receiving a friend request and when a friend request was accepted.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d3fb17e61 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sig-development' into merge/signal  
							
							
							
						 
						
							7 years ago