* 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
* 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
sachaaaaa
sachaaaaa
Beaudan Brown
Ryan Tharp
Mikunj
Scott Nonnenberg