-
Notifications
You must be signed in to change notification settings - Fork 106
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Upgrade master to 6.x #795
Conversation
…778) * update mac build script * update mac packager * feat: ELECTRON-1462 (Combine more information into about app window) (#777) * ELECTRON-1462 - Merge more info window in to about app window * ELECTRON-1462 - Adjust window size * ELECTRON-1462 - Add line space * ELECTRON-1462 - Resize for windows * ELECTRON-1462 - Add translation for swift search * ELECTRON-1462 - Adjust width for Windows OS * ELECTRON-1462 - Add about app snapshots file * SDA-1347 - Group multiple processes into single task bar icon
# Conflicts: # package.json
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍
"jest": "23.6.0", | ||
"jest-html-reporter": "2.4.2", | ||
"less": "3.8.1", | ||
"node-abi": "^2.12.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please freeze the version number here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We always need the latest version of node-abi
when we upgrade the electron version for the native module to compile
src/common/logger.ts
Outdated
// Default log paths | ||
const MAC_LOGS_PATH = '/Library/Logs/Symphony/'; | ||
const LINUX_LOGS_PATH = '/.config/Symphony/'; | ||
const WINDOWS_LOGS_PATH = '\\AppData\\Roaming\\Symphony\\logs'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please change this to AppData\\Local
as we are making changes accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The default location for logs in 6.x
+ has defaulted to userData
path
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, understood. But, we need to override that now to point to local
rather than roaming
.
Electron by default picks roaming for user data path rather than local which we need to override now.
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Description
Merge 6.x branch into master
Fixes
electron-spellchecker
module to support 6.xelectron-builder
module to support 6.x