Merge remote-tracking branch 'origin/nightly' into release

9 files changed, 45 insertions, 44 deletions

diff --git a/.github/workflow/repo-sync.yml b/.github/workflow/repo-sync.yml
deleted file mode 100644
index fce0721c7..000000000
--- a/.github/workflow/repo-sync.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Repo Sync
-
-on:
-  schedule:
-    - cron: "*/15 * * * *"
-
-jobs:
-  repo-sync:
-    name: Repo Sync
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: repo-sync/github-sync@v2
-        name: Sync repository to branch
-        with:
-          source_repo: ${{ secrets.SOURCE_REPO }}
-          source_branch: "master"
-          destination_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: repo-sync/pull-request@v2
-        name: Create pull request
-        with:
-          source_branch: ${{ secrets.INTERMEDIATE_BRANCH }}
-          destination_branch: "master"
-          github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml
index cd06b8392..1d04a14c2 100644
--- a/.github/workflows/dependency-updates.yml
+++ b/.github/workflows/dependency-updates.yml
@@ -26,7 +26,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: recursive
-          fetch-depth: 0
       - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off)
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
@@ -63,8 +62,9 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git commit -am "Update submodules, browserslist data updates and linter fixes [skip ci]" --no-verify || true
-      - name: Bump version number if this is a scheduled build or has been manually triggered with 'version bump' in the text, then bump the version number
-        if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, 'version bump')) }}
+          echo "CHANGES_COUNT=$(git diff --shortstat origin/${{ env.GIT_BRANCH_NAME }} | wc -l)"
+      - name: Bump version number if this is a scheduled build with changes or has been manually triggered with 'version bump' in the text, then bump the version number
+        if: ${{ (github.event_name == 'schedule' && env.CHANGES_COUNT != '0') || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, 'version bump')) }}
         run: npm version prerelease --preid=nightly
       - name: Push all changes
         run: git push origin ${{ env.GIT_BRANCH_NAME }} --no-verify
diff --git a/.github/workflows/ferdi-builds.yml b/.github/workflows/ferdi-builds.yml
index 6f89fbe25..f326abfd5 100644
--- a/.github/workflows/ferdi-builds.yml
+++ b/.github/workflows/ferdi-builds.yml
@@ -45,7 +45,6 @@ jobs:
         with:
           ref: nightly
           submodules: recursive
-          fetch-depth: 0
       - id: should_run
         name: Check whether there are any commits since this run was last triggered and push them and/or set the output
         if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, 'nightly branch')) }}
@@ -86,13 +85,11 @@ jobs:
         with:
           submodules: recursive
           ref: nightly
-          fetch-depth: 0
       - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch
         uses: actions/checkout@v2
         if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }}
         with:
           submodules: recursive
-          fetch-depth: 0
       - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off)
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
@@ -185,13 +182,11 @@ jobs:
         with:
           submodules: recursive
           ref: nightly
-          fetch-depth: 0
       - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch
         uses: actions/checkout@v2
         if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }}
         with:
           submodules: recursive
-          fetch-depth: 0
       - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off)
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
@@ -276,13 +271,11 @@ jobs:
         with:
           submodules: recursive
           ref: nightly
-          fetch-depth: 0
       - name: Checkout code along with submodules for any branch if the trigger event is NOT 'scheduled' and this is NOT a forced rebuild on the nightly branch
         uses: actions/checkout@v2
         if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }}
         with:
           submodules: recursive
-          fetch-depth: 0
       - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off)
         run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV
         shell: bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58a1d6eea..e09bb2f5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,32 @@
+# [5.6.0-beta.8](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.7...v5.6.0-beta.8) (2021-07-16)
+
+- Upgraded electron to '13.1.7' 💖 @vraravam
+- Turned on other h/w architectures (arm64, armv7l) for linux builds. (#1633) 💖 @vraravam
+- chore: run security audit on node modules 💖 @mhatvan
+- Upgraded nodejs to '14.17.3' 💖 @vraravam
+- Use 'useragent-generator' to generate the user-agent string 💖 @vraravam
+
+# [5.6.0-beta.7](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.6...v5.6.0-beta.7) (2021-07-07)
+
+- Upgraded electron to '13.1.5'. 💖 @vraravam
+- Adjust link opening behavior 💖 @stnkl
+- Fix color adjustments in Settings screen 💖 @kris7t
+- Expose Chrome version to todos webview (fix #1211) (#1478) 💖 @kris7t
+- Added ability to turn off notifications for clipboard events generated from the context menu 💖 @vraravam
+- Build Ferdi for freeBSD 💖 @vraravam
+- CI Builds moved to using GitHub actions 💖 @vraravam
+- Bump electron-builder to 22.11.7 (fix #1469) 💖 @kris7t, @vraravam
+- Fix active Todos service behaviour (#1481) 💖 @kytwb, @kris7t
+- Removed the cyclical dependency in workspaces and announcement 💖 @markandan
+- Added ability to run specific OS builds for manual trigger 💖 @vraravam
+- Exposed User agent as a user-preference both globally as well as per-service overrides (#1535) 💖 @vraravam, @kris7t
+- Added new message when the user doesn't find a service (but that is present in the website) 💖 @vraravam
+- Upgrade various dependencies to latest, remove unnecessary electron-hunspell 💖 @mhatvan, @vraravam
+- Enforce strict adherence to node, npm and node-gyp versions (mainly for contributors) 💖 @vraravam
+- Refactored all runtime configs: moved from 'config.js' into 'environment.js' 💖 @vraravam
+- Removed references to png images since they were not being used anyways. Results in smaller installer file 💖 @vraravam
+- Building ferdi on an ARM machine (#1611) 💖 @vraravam
+
 # [5.6.0-beta.6](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.5...v5.6.0-beta.6) (2021-05-31)
 
 ### Features
@@ -142,7 +171,7 @@
 # [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26)
 ### Features
 - Merge Franz 5.5.0-beta.2
-- Add modifyRequestHeaders, enable properly setting headers for services (#639), 💖 @mahadevans87 @sampathBlam 
+- Add modifyRequestHeaders, enable properly setting headers for services (#639), 💖 @mahadevans87 @sampathBlam
 - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact
 - Add hotkey for darkmode (#530, #537), 💖 @Room4O4 & @mahadevans87
 - Add option to start Ferdi minimized (#490, #534)
@@ -173,7 +202,7 @@
 - Improve navigation bar behaviour setting (#270)
 - Ferdi is now available as Flatpak on Flathub (#323), 💖 @lhw
 - Add automatic local recipe updates
-- Add option to start Ferdi in system tray (#331), 💖 @jereksel 
+- Add option to start Ferdi in system tray (#331), 💖 @jereksel
 - Add better support for macOS dark mode
 - Add better seperation in settings
 - Change Sentry telemetry to be opt-in only (#160)
@@ -458,7 +487,7 @@ Merge Franz v5.3.1 into Ferdi.
 * **App:** Added [Team Management](https://meetfranz.com/user/team) 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99))
 * **App:** Added Kerberos Support via Command Line Switches ([#1331](https://github.com/meetfranz/franz/issues/1331)) ([@frumania](https://github.com/frumania)) ([a1950d7](https://github.com/meetfranz/franz/commit/a1950d7))
 * **App:** Open changelog in app
-* **App:** Various small fixes and improvements 
+* **App:** Various small fixes and improvements
 
 ### General
 
@@ -609,7 +638,7 @@ Merge Franz v5.3.1 into Ferdi.
 ### Features
 
 * **App:** 👉 Dark Mode 👈 ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) 🙌 [@guillecura](https://github.com/guillecura)
-* **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274)) 
+* **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274))
 * **App:** New spell checker ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
 * **App:** New context menu ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e))
 * **App:** Lay groundwork for general themeing support ([4ea044a](https://github.com/meetfranz/franz/commit/4ea044a))
diff --git a/recipes b/recipes
-Subproject ea77d33daaf8d9ee8e96163bd15f47701220114
+Subproject ebb2cc3c68f74ce1d8b8a61d128078753d9a039
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js
index 603049c4e..5305d5618 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.js
@@ -28,9 +28,10 @@ export default (params) => {
           }
 
           if (args.action === 'check') {
+            debug('checking for update');
             autoUpdater.checkForUpdates();
           } else if (args.action === 'install') {
-            debug('install update');
+            debug('installing update');
             autoUpdater.quitAndInstall();
             // we need to send a quit event
             setTimeout(() => {
diff --git a/src/internal-server b/src/internal-server
-Subproject e4fc9c6c3666eadc26a472b9b1c2a701dd3464b
+Subproject 71d77a3776946a46acad03a8484f8fa3c4b42bf
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index ac6ca6d2d..bbb5e6305 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -180,7 +180,7 @@ export default class AppStore extends Store {
       }
     });
 
-    // Handle deep linking (franz://)
+    // Handle deep linking (ferdi://)
     ipcRenderer.on('navigateFromDeepLink', (event, data) => {
       debug('Navigate from deep link', data);
       let {
@@ -389,6 +389,7 @@ export default class AppStore extends Store {
 
   @action _checkForUpdates() {
     if (this.isOnline) {
+      debug('_checkForUpdates: sending event to autoUpdate:check');
       this.updateStatus = this.updateStatusTypes.CHECKING;
       ipcRenderer.send('autoUpdate', {
         action: 'check',
@@ -399,6 +400,7 @@ export default class AppStore extends Store {
   }
 
   @action _installUpdate() {
+    debug('_installUpdate: sending event to autoUpdate:install');
     ipcRenderer.send('autoUpdate', {
       action: 'install',
     });
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js
index 500a1a653..63eed2ebe 100644
--- a/src/webview/contextMenuBuilder.js
+++ b/src/webview/contextMenuBuilder.js
@@ -22,6 +22,7 @@ function matchesWord(string) {
   return string.match(regex);
 }
 
+// TODO: Need to externalize for i18n
 const contextMenuStringTable = {
   lookUpDefinition: ({ word }) => `Look Up "${word}"`,
   cut: () => 'Cut',
@@ -217,7 +218,7 @@ module.exports = class ContextMenuBuilder {
     this.addSeparator(menu);
     this.goBack(menu);
     this.goForward(menu);
-    this.copyPageUrl(menu);
+    this.copyPageUrl(menu, menuInfo);
     this.goToHomePage(menu, menuInfo);
     this.openInBrowser(menu, menuInfo);
 
@@ -514,13 +515,13 @@ module.exports = class ContextMenuBuilder {
   /**
    * Adds the 'copy page url' menu item.
    */
-  copyPageUrl(menu) {
+  copyPageUrl(menu, menuInfo) {
     menu.append(new MenuItem({
       label: this.stringTable.copyPageUrl(),
       enabled: true,
       click: () => {
         clipboard.writeText(window.location.href);
-        this._sendNotificationOnClipboardEvent(menu.clipboardNotifications, () => `Page URL copied: ${window.location.href}`);
+        this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Page URL copied: ${window.location.href}`);
       },
     }));