Skip to content
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

Merged
merged 14 commits into from
Oct 30, 2019
Merged

fix: Upgrade master to 6.x #795

merged 14 commits into from
Oct 30, 2019

Conversation

KiranNiranjan
Copy link
Member

Description

Merge 6.x branch into master

Fixes

  • Update activity detection API
  • Bump electron-spellchecker module to support 6.x
  • Update electron-builder module to support 6.x
  • Update electron API changes w.r.t (dialogs, menu role, shell)

KiranNiranjan and others added 11 commits September 4, 2019 18:35
…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
Copy link
Contributor

@keerthi16 keerthi16 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

package.json Show resolved Hide resolved
"jest": "23.6.0",
"jest-html-reporter": "2.4.2",
"less": "3.8.1",
"node-abi": "^2.12.0",
Copy link
Contributor

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.

Copy link
Member Author

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

// Default log paths
const MAC_LOGS_PATH = '/Library/Logs/Symphony/';
const LINUX_LOGS_PATH = '/.config/Symphony/';
const WINDOWS_LOGS_PATH = '\\AppData\\Roaming\\Symphony\\logs';
Copy link
Contributor

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.

Copy link
Member Author

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

Copy link
Contributor

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.

@KiranNiranjan KiranNiranjan changed the title Upgrade master to 6.x fix: Upgrade master to 6.x Oct 30, 2019
@VishwasShashidhar VishwasShashidhar merged commit 0431a9f into master Oct 30, 2019
@lock
Copy link

lock bot commented May 5, 2020

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.

@lock lock bot locked as resolved and limited conversation to collaborators May 5, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants