* clearnet: (35 commits)
yarn lint
return early if signature is not a string
lint pass 2
lint pass 1
make sure versioning on write can't get out of sync
Update js/modules/loki_public_chat_api.js
Handle annotations omit correctly
fix typo CI found
refactor
pollOnceForMessages() move lastGot up, address Sacha's review
Update js/modules/loki_public_chat_api.js
address review
address reviews
Custom message rendering of mentions
fix method
separate out new/open, more lint/cleanup
separate out note to self
create window.mixpanel here
use window.mixpanel, remove eventEmitter
lint and remove unneeded params
...
Added friends section in search.
This is because contacts is now used in signal for something else and we don't want to clash meanings.
Styling fixes
Add dropdown options into mainheader
Updated styling
Restore StartNewConversation to the old ui style of loki messenger.
Fix friend search display.
Fix header expand animation.
Hooked up menu actions.
Linting.
More styling changes.
Fix tests.
Added back in the loki logo below the gutter.
Fix toast positioning.
Fix context menu showing incorrectly on virtual lists.
Added tabs.
Linting
* 'master' of https://github.com/signalapp/Signal-Desktop: (38 commits)
v1.17.0
v1.17.0-beta.4
Ensure that blue group avatars are preserved in dark theme
Android theme: Incoming quotes take color from containing message
Conversations have blue avatar backgrounds if no image provided
Fix lint errors
Add ca language
inboxView: Ensure Conversation exists for our own number
Ensure that file is not attached if we've filtered it
v1.17.0-beta.3
Localization updates
v1.16.3
Lint fixes
Lint fixes
Better handle large numbers of messages in cache on startup
Keep object stores after conversations migrate to SQLCipher
Longer timeout for orphaned file cleanup
Tests and increase consistency for isFileDangerous calls
Longer timeout for orphaned file cleanup
v1.17.0-beta.2
...
# Conflicts:
# background.html
# package.json
sachaaaaa
Ryan Tharp
Mikunj
Beaudan
Scott Nonnenberg
sachaaaaa