diff options
-rw-r--r-- | .github/workflow/repo-sync.yml | 25 | ||||
-rw-r--r-- | .github/workflows/dependency-updates.yml | 6 | ||||
-rw-r--r-- | .github/workflows/ferdi-builds.yml | 7 | ||||
-rw-r--r-- | CHANGELOG.md | 37 | ||||
m--------- | recipes | 0 | ||||
-rw-r--r-- | src/electron/ipc-api/autoUpdate.js | 3 | ||||
m--------- | src/internal-server | 0 | ||||
-rw-r--r-- | src/stores/AppStore.js | 4 | ||||
-rw-r--r-- | src/webview/contextMenuBuilder.js | 7 |
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 @@ | |||
1 | name: Repo Sync | ||
2 | |||
3 | on: | ||
4 | schedule: | ||
5 | - cron: "*/15 * * * *" | ||
6 | |||
7 | jobs: | ||
8 | repo-sync: | ||
9 | name: Repo Sync | ||
10 | runs-on: ubuntu-latest | ||
11 | steps: | ||
12 | - uses: actions/checkout@v1 | ||
13 | - uses: repo-sync/github-sync@v2 | ||
14 | name: Sync repository to branch | ||
15 | with: | ||
16 | source_repo: ${{ secrets.SOURCE_REPO }} | ||
17 | source_branch: "master" | ||
18 | destination_branch: ${{ secrets.INTERMEDIATE_BRANCH }} | ||
19 | github_token: ${{ secrets.GITHUB_TOKEN }} | ||
20 | - uses: repo-sync/pull-request@v2 | ||
21 | name: Create pull request | ||
22 | with: | ||
23 | source_branch: ${{ secrets.INTERMEDIATE_BRANCH }} | ||
24 | destination_branch: "master" | ||
25 | 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: | |||
26 | uses: actions/checkout@v2 | 26 | uses: actions/checkout@v2 |
27 | with: | 27 | with: |
28 | submodules: recursive | 28 | submodules: recursive |
29 | fetch-depth: 0 | ||
30 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 29 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
31 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 30 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
32 | shell: bash | 31 | shell: bash |
@@ -63,8 +62,9 @@ jobs: | |||
63 | git config user.name github-actions | 62 | git config user.name github-actions |
64 | git config user.email github-actions@github.com | 63 | git config user.email github-actions@github.com |
65 | git commit -am "Update submodules, browserslist data updates and linter fixes [skip ci]" --no-verify || true | 64 | git commit -am "Update submodules, browserslist data updates and linter fixes [skip ci]" --no-verify || true |
66 | - 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 | 65 | echo "CHANGES_COUNT=$(git diff --shortstat origin/${{ env.GIT_BRANCH_NAME }} | wc -l)" |
67 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, 'version bump')) }} | 66 | - 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 |
67 | if: ${{ (github.event_name == 'schedule' && env.CHANGES_COUNT != '0') || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, 'version bump')) }} | ||
68 | run: npm version prerelease --preid=nightly | 68 | run: npm version prerelease --preid=nightly |
69 | - name: Push all changes | 69 | - name: Push all changes |
70 | run: git push origin ${{ env.GIT_BRANCH_NAME }} --no-verify | 70 | 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: | |||
45 | with: | 45 | with: |
46 | ref: nightly | 46 | ref: nightly |
47 | submodules: recursive | 47 | submodules: recursive |
48 | fetch-depth: 0 | ||
49 | - id: should_run | 48 | - id: should_run |
50 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output | 49 | name: Check whether there are any commits since this run was last triggered and push them and/or set the output |
51 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, 'nightly branch')) }} | 50 | if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, 'nightly branch')) }} |
@@ -86,13 +85,11 @@ jobs: | |||
86 | with: | 85 | with: |
87 | submodules: recursive | 86 | submodules: recursive |
88 | ref: nightly | 87 | ref: nightly |
89 | fetch-depth: 0 | ||
90 | - 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 | 88 | - 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 |
91 | uses: actions/checkout@v2 | 89 | uses: actions/checkout@v2 |
92 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} | 90 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} |
93 | with: | 91 | with: |
94 | submodules: recursive | 92 | submodules: recursive |
95 | fetch-depth: 0 | ||
96 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 93 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
97 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 94 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
98 | shell: bash | 95 | shell: bash |
@@ -185,13 +182,11 @@ jobs: | |||
185 | with: | 182 | with: |
186 | submodules: recursive | 183 | submodules: recursive |
187 | ref: nightly | 184 | ref: nightly |
188 | fetch-depth: 0 | ||
189 | - 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 | 185 | - 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 |
190 | uses: actions/checkout@v2 | 186 | uses: actions/checkout@v2 |
191 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} | 187 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} |
192 | with: | 188 | with: |
193 | submodules: recursive | 189 | submodules: recursive |
194 | fetch-depth: 0 | ||
195 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 190 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
196 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 191 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
197 | shell: bash | 192 | shell: bash |
@@ -276,13 +271,11 @@ jobs: | |||
276 | with: | 271 | with: |
277 | submodules: recursive | 272 | submodules: recursive |
278 | ref: nightly | 273 | ref: nightly |
279 | fetch-depth: 0 | ||
280 | - 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 | 274 | - 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 |
281 | uses: actions/checkout@v2 | 275 | uses: actions/checkout@v2 |
282 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} | 276 | if: ${{ github.event_name != 'schedule' && env.MANUAL_REBUILD_ON_NIGHTLY != 'true' }} |
283 | with: | 277 | with: |
284 | submodules: recursive | 278 | submodules: recursive |
285 | fetch-depth: 0 | ||
286 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) | 279 | - name: Extract Git branch name from the currently checked out branch (not from the branch where this run was kicked off) |
287 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV | 280 | run: echo "GIT_BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV |
288 | shell: bash | 281 | shell: bash |
diff --git a/CHANGELOG.md b/CHANGELOG.md index 58a1d6eea..e09bb2f5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,3 +1,32 @@ | |||
1 | # [5.6.0-beta.8](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.7...v5.6.0-beta.8) (2021-07-16) | ||
2 | |||
3 | - Upgraded electron to '13.1.7' 💖 @vraravam | ||
4 | - Turned on other h/w architectures (arm64, armv7l) for linux builds. (#1633) 💖 @vraravam | ||
5 | - chore: run security audit on node modules 💖 @mhatvan | ||
6 | - Upgraded nodejs to '14.17.3' 💖 @vraravam | ||
7 | - Use 'useragent-generator' to generate the user-agent string 💖 @vraravam | ||
8 | |||
9 | # [5.6.0-beta.7](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.6...v5.6.0-beta.7) (2021-07-07) | ||
10 | |||
11 | - Upgraded electron to '13.1.5'. 💖 @vraravam | ||
12 | - Adjust link opening behavior 💖 @stnkl | ||
13 | - Fix color adjustments in Settings screen 💖 @kris7t | ||
14 | - Expose Chrome version to todos webview (fix #1211) (#1478) 💖 @kris7t | ||
15 | - Added ability to turn off notifications for clipboard events generated from the context menu 💖 @vraravam | ||
16 | - Build Ferdi for freeBSD 💖 @vraravam | ||
17 | - CI Builds moved to using GitHub actions 💖 @vraravam | ||
18 | - Bump electron-builder to 22.11.7 (fix #1469) 💖 @kris7t, @vraravam | ||
19 | - Fix active Todos service behaviour (#1481) 💖 @kytwb, @kris7t | ||
20 | - Removed the cyclical dependency in workspaces and announcement 💖 @markandan | ||
21 | - Added ability to run specific OS builds for manual trigger 💖 @vraravam | ||
22 | - Exposed User agent as a user-preference both globally as well as per-service overrides (#1535) 💖 @vraravam, @kris7t | ||
23 | - Added new message when the user doesn't find a service (but that is present in the website) 💖 @vraravam | ||
24 | - Upgrade various dependencies to latest, remove unnecessary electron-hunspell 💖 @mhatvan, @vraravam | ||
25 | - Enforce strict adherence to node, npm and node-gyp versions (mainly for contributors) 💖 @vraravam | ||
26 | - Refactored all runtime configs: moved from 'config.js' into 'environment.js' 💖 @vraravam | ||
27 | - Removed references to png images since they were not being used anyways. Results in smaller installer file 💖 @vraravam | ||
28 | - Building ferdi on an ARM machine (#1611) 💖 @vraravam | ||
29 | |||
1 | # [5.6.0-beta.6](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.5...v5.6.0-beta.6) (2021-05-31) | 30 | # [5.6.0-beta.6](https://github.com/getferdi/ferdi/compare/v5.6.0-beta.5...v5.6.0-beta.6) (2021-05-31) |
2 | 31 | ||
3 | ### Features | 32 | ### Features |
@@ -142,7 +171,7 @@ | |||
142 | # [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26) | 171 | # [5.5.0](https://github.com/getferdi/ferdi/compare/v5.4.3...v5.5.0) (2020-04-26) |
143 | ### Features | 172 | ### Features |
144 | - Merge Franz 5.5.0-beta.2 | 173 | - Merge Franz 5.5.0-beta.2 |
145 | - Add modifyRequestHeaders, enable properly setting headers for services (#639), 💖 @mahadevans87 @sampathBlam | 174 | - Add modifyRequestHeaders, enable properly setting headers for services (#639), 💖 @mahadevans87 @sampathBlam |
146 | - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact | 175 | - Add dropdown list to choose Todo service (#418, #477), 💖 @yourcontact |
147 | - Add hotkey for darkmode (#530, #537), 💖 @Room4O4 & @mahadevans87 | 176 | - Add hotkey for darkmode (#530, #537), 💖 @Room4O4 & @mahadevans87 |
148 | - Add option to start Ferdi minimized (#490, #534) | 177 | - Add option to start Ferdi minimized (#490, #534) |
@@ -173,7 +202,7 @@ | |||
173 | - Improve navigation bar behaviour setting (#270) | 202 | - Improve navigation bar behaviour setting (#270) |
174 | - Ferdi is now available as Flatpak on Flathub (#323), 💖 @lhw | 203 | - Ferdi is now available as Flatpak on Flathub (#323), 💖 @lhw |
175 | - Add automatic local recipe updates | 204 | - Add automatic local recipe updates |
176 | - Add option to start Ferdi in system tray (#331), 💖 @jereksel | 205 | - Add option to start Ferdi in system tray (#331), 💖 @jereksel |
177 | - Add better support for macOS dark mode | 206 | - Add better support for macOS dark mode |
178 | - Add better seperation in settings | 207 | - Add better seperation in settings |
179 | - Change Sentry telemetry to be opt-in only (#160) | 208 | - Change Sentry telemetry to be opt-in only (#160) |
@@ -458,7 +487,7 @@ Merge Franz v5.3.1 into Ferdi. | |||
458 | * **App:** Added [Team Management](https://meetfranz.com/user/team) 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99)) | 487 | * **App:** Added [Team Management](https://meetfranz.com/user/team) 🎉 ([47c1c99](https://github.com/meetfranz/franz/commit/47c1c99)) |
459 | * **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)) | 488 | * **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)) |
460 | * **App:** Open changelog in app | 489 | * **App:** Open changelog in app |
461 | * **App:** Various small fixes and improvements | 490 | * **App:** Various small fixes and improvements |
462 | 491 | ||
463 | ### General | 492 | ### General |
464 | 493 | ||
@@ -609,7 +638,7 @@ Merge Franz v5.3.1 into Ferdi. | |||
609 | ### Features | 638 | ### Features |
610 | 639 | ||
611 | * **App:** 👉 Dark Mode 👈 ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) 🙌 [@guillecura](https://github.com/guillecura) | 640 | * **App:** 👉 Dark Mode 👈 ([fd7954f](https://github.com/meetfranz/franz/commit/fd7954f)) 🙌 [@guillecura](https://github.com/guillecura) |
612 | * **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274)) | 641 | * **App:** Add proxy support for services ([6297274](https://github.com/meetfranz/franz/commit/6297274)) |
613 | * **App:** New spell checker ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e)) | 642 | * **App:** New spell checker ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e)) |
614 | * **App:** New context menu ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e)) | 643 | * **App:** New context menu ([3d87c0e](https://github.com/meetfranz/franz/commit/3d87c0e)) |
615 | * **App:** Lay groundwork for general themeing support ([4ea044a](https://github.com/meetfranz/franz/commit/4ea044a)) | 644 | * **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) => { | |||
28 | } | 28 | } |
29 | 29 | ||
30 | if (args.action === 'check') { | 30 | if (args.action === 'check') { |
31 | debug('checking for update'); | ||
31 | autoUpdater.checkForUpdates(); | 32 | autoUpdater.checkForUpdates(); |
32 | } else if (args.action === 'install') { | 33 | } else if (args.action === 'install') { |
33 | debug('install update'); | 34 | debug('installing update'); |
34 | autoUpdater.quitAndInstall(); | 35 | autoUpdater.quitAndInstall(); |
35 | // we need to send a quit event | 36 | // we need to send a quit event |
36 | setTimeout(() => { | 37 | 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 { | |||
180 | } | 180 | } |
181 | }); | 181 | }); |
182 | 182 | ||
183 | // Handle deep linking (franz://) | 183 | // Handle deep linking (ferdi://) |
184 | ipcRenderer.on('navigateFromDeepLink', (event, data) => { | 184 | ipcRenderer.on('navigateFromDeepLink', (event, data) => { |
185 | debug('Navigate from deep link', data); | 185 | debug('Navigate from deep link', data); |
186 | let { | 186 | let { |
@@ -389,6 +389,7 @@ export default class AppStore extends Store { | |||
389 | 389 | ||
390 | @action _checkForUpdates() { | 390 | @action _checkForUpdates() { |
391 | if (this.isOnline) { | 391 | if (this.isOnline) { |
392 | debug('_checkForUpdates: sending event to autoUpdate:check'); | ||
392 | this.updateStatus = this.updateStatusTypes.CHECKING; | 393 | this.updateStatus = this.updateStatusTypes.CHECKING; |
393 | ipcRenderer.send('autoUpdate', { | 394 | ipcRenderer.send('autoUpdate', { |
394 | action: 'check', | 395 | action: 'check', |
@@ -399,6 +400,7 @@ export default class AppStore extends Store { | |||
399 | } | 400 | } |
400 | 401 | ||
401 | @action _installUpdate() { | 402 | @action _installUpdate() { |
403 | debug('_installUpdate: sending event to autoUpdate:install'); | ||
402 | ipcRenderer.send('autoUpdate', { | 404 | ipcRenderer.send('autoUpdate', { |
403 | action: 'install', | 405 | action: 'install', |
404 | }); | 406 | }); |
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) { | |||
22 | return string.match(regex); | 22 | return string.match(regex); |
23 | } | 23 | } |
24 | 24 | ||
25 | // TODO: Need to externalize for i18n | ||
25 | const contextMenuStringTable = { | 26 | const contextMenuStringTable = { |
26 | lookUpDefinition: ({ word }) => `Look Up "${word}"`, | 27 | lookUpDefinition: ({ word }) => `Look Up "${word}"`, |
27 | cut: () => 'Cut', | 28 | cut: () => 'Cut', |
@@ -217,7 +218,7 @@ module.exports = class ContextMenuBuilder { | |||
217 | this.addSeparator(menu); | 218 | this.addSeparator(menu); |
218 | this.goBack(menu); | 219 | this.goBack(menu); |
219 | this.goForward(menu); | 220 | this.goForward(menu); |
220 | this.copyPageUrl(menu); | 221 | this.copyPageUrl(menu, menuInfo); |
221 | this.goToHomePage(menu, menuInfo); | 222 | this.goToHomePage(menu, menuInfo); |
222 | this.openInBrowser(menu, menuInfo); | 223 | this.openInBrowser(menu, menuInfo); |
223 | 224 | ||
@@ -514,13 +515,13 @@ module.exports = class ContextMenuBuilder { | |||
514 | /** | 515 | /** |
515 | * Adds the 'copy page url' menu item. | 516 | * Adds the 'copy page url' menu item. |
516 | */ | 517 | */ |
517 | copyPageUrl(menu) { | 518 | copyPageUrl(menu, menuInfo) { |
518 | menu.append(new MenuItem({ | 519 | menu.append(new MenuItem({ |
519 | label: this.stringTable.copyPageUrl(), | 520 | label: this.stringTable.copyPageUrl(), |
520 | enabled: true, | 521 | enabled: true, |
521 | click: () => { | 522 | click: () => { |
522 | clipboard.writeText(window.location.href); | 523 | clipboard.writeText(window.location.href); |
523 | this._sendNotificationOnClipboardEvent(menu.clipboardNotifications, () => `Page URL copied: ${window.location.href}`); | 524 | this._sendNotificationOnClipboardEvent(menuInfo.clipboardNotifications, () => `Page URL copied: ${window.location.href}`); |
524 | }, | 525 | }, |
525 | })); | 526 | })); |
526 | 527 | ||