Merge branch 'master' of github.com:ssbc/patchwork into font-family

Author: christianbundy

.dockerignore

@@ -0,0 +1 @@
+node_modules

.github/stale.yml

@@ -0,0 +1 @@
+_extends: .github

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+dist
 
 # Mac OS metadata file
 .DS_Store

.travis.yml

@@ -1,19 +1,44 @@
-sudo: false
+matrix: 
+  include:
+    - os: osx
+      osx_image: xcode9.4
+      language: node_js
+      node_js: 10
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+  
+    - os: linux
+      language: node_js
+      node_js: 10
 
-language: node_js
+    - os: windows
+      language: node_js
+      node_js: 10
+      filter_secrets: false
+
+cache:
+  directories:
+    - $HOME/.npm
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
 
 before_install:
-  - npm install -g npm@latest
-  - sudo apt-get -qq update
-  - sudo apt-get install -y g++ m4 libtool automake libgconf-2-4    # build tools
-  - sudo apt-get install -y libxext-dev libxtst-dev libxkbfile-dev  # spellchecker headers
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      sudo apt-get install \
+        automake \
+        libgconf-2-4 \
+        libtool \
+        libxext-dev \
+        libxkbfile-dev \
+        libxtst-dev
+    else
+      npm uninstall --save mouse-forward-back
+    fi
 
-node_js:
-  - 4
-  - 5
-  - 6
-  - 7
-  - stable
+script: npm test && npm run dist
 
-script:
-  - pwd   # run no-op to prevent failure from no tests
+branches:
+  except:
+    - "/^v\\d+\\.\\d+\\.\\d+$/"

.vscode/settings.json

@@ -0,0 +1,21 @@
+{
+    "cSpell.words": [
+        "abortable",
+        "abouts",
+        "backlinks",
+        "depnest",
+        "emojilib",
+        "flatpickr",
+        "msgs",
+        "paramap",
+        "pickr",
+        "realtime",
+        "recp",
+        "recps",
+        "spacetime",
+        "struct",
+        "ungroup"
+    ],
+    "standard.autoFixOnSave": true,
+    "editor.tabSize": 2
+}

CHANGELOG.md

@@ -0,0 +1,47 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+<!--
+## [Unreleased]
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+-->
+
+## [Unreleased]
+
+### Fixed
+- Fixed emoji not rendering on Windows.
+
+## v3.12.0 - 2019-05-21
+
+### Added
+- Explanation when messages in a thread are hidden because the author is blocked by the author of the thread.
+- Confirmation dialog when clearing message drafts.
+- Ctrl/Cmd+L keyboard shortcut which selects the search field.
+- Read-only mode, which doesn't allow users to publish new messages until indexes are up-to-date. This resolves issues where Patchwork seems unresponsive so users repeatedly post the same message.
+- Greek translation.
+- Support for clicking magnet links.
+- Auto-build with Travis CI (now supporting Snappy and Debian).
+- Changelog.
+
+### Changed
+- Made legacy block handling easier to understand with new options on the profile page.
+- Switched to a new module, ssb-suggest, to take care of @mention suggestions.
+- Replaced "Search with Google" with "Search with DuckDuckGo" in the context menu.
+- Started using an experimental branch of ssb-config that automatically configures multiple network interfaces so that they can be broadcast correctly by multiserver.
+- Updated and deduplicated some npm dependencies.
+
+### Removed
+- Irrelevant prebuilds from build artifacts, which were bloating the size of releases.
+
+### Fixed
+- Problem where Patchwork would prompt user to add a name and description even when it wasn't their first time opening the application.
+- Pagination bug that wasn't correctly showing messages on private, public, and profile feeds.
+- EXIF stripping, which only works on JPG, TIF, and WAV files. Images that were converted from JPG/TIF/WAV may still have EXIF metadata embedded somewhere in the file, so it's important to know that Patchwork only rmeoves EXIF metadata from JPG/TIF/WAV.

README.md

@@ -46,7 +46,7 @@ It's better than Twitter and Facebook because:
 
 In order to gossip outside your local network, you'll need to connect to a [Pub](https://www.scuttlebutt.nz/concepts/pub.html).
 
-You can find an invite to an available pub at the [Pub servers registry](https://github.com/ssbc/scuttlebot/wiki/Pub-Servers).
+You can find an invite to an available pub at the [Pub servers registry](https://github.com/ssbc/ssb-server/wiki/Pub-Servers).
 
 Get an invite, then in `patchwork`: click "+ Join Pub" and paste the invite code.
 
@@ -100,5 +100,4 @@ Please read the [Patchwork Contribution Guidelines](contributing.md) before open
 
 ## Docs
 
-- [scuttlebutt.nz](https://www.scuttlebutt.nz)
-- [scuttlebot.io](https://scuttlebot.io)
+- [scuttlebutt.nz](https://www.scuttlebutt.nz)