if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-27 01:11:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rc-1.53.0' into I18N-597

Browse Source 
# Conflicts:
#	installer/win/Symphony-x64.aip
#	package.json
This commit is contained in:
Vishwas Shashidhar 2018-11-27 19:37:18 -08:00
commit 67690be031
14 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
installer/mac/SymphonySettingsPlugin.bundle/Contents/Info.plist
View File

@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>17G65</string>
<string>18A391</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
@ -27,17 +27,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>9F2000</string>
<string>10B61</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>17E189</string>
<string>18B71</string>
<key>DTSDKName</key>
<string>macosx10.13</string>
<string>macosx10.14</string>
<key>DTXcode</key>
<string>0941</string>
<string>1010</string>
<key>DTXcodeBuild</key>
<string>9F2000</string>
<string>10B61</string>
<key>InstallerSectionTitle</key>
<string>Pod Settings</string>
<key>NSHumanReadableCopyright</key>

BIN
installer/mac/SymphonySettingsPlugin.bundle/Contents/MacOS/SymphonySettingsPlugin
View File

Binary file not shown.

BIN
installer/mac/SymphonySettingsPlugin.bundle/Contents/Resources/Base.lproj/MyInstallerPane.nib generated
View File

Binary file not shown.

6
installer/mac/SymphonySettingsPlugin.bundle/Contents/_CodeSignature/CodeResources
View File

@ -6,7 +6,7 @@
<dict>
<key>Resources/Base.lproj/MyInstallerPane.nib</key>
<data>
OgYKHn5VPNQJTTDsXQmSkvR7Yfw=
h6775LTCbH4GS52ODzPilHTzBos=
</data>
<key>Resources/InstallerSections.plist</key>
<data>
@ -37,11 +37,11 @@
<dict>
<key>hash</key>
<data>
OgYKHn5VPNQJTTDsXQmSkvR7Yfw=
h6775LTCbH4GS52ODzPilHTzBos=
</data>
<key>hash2</key>
<data>
A4OOdILVI+TufogMzXfdKrGb/q8ADLvJzQtA55BfFMc=
GrfIStoQUspnp1KqGRB6bVYZOJWnYrjPoM5nNQFX8f0=
</data>
</dict>
<key>Resources/InstallerSections.plist</key>

2
installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Base.lproj/MyInstallerPane.xib
View File

@ -52,7 +52,7 @@
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bt3-SN-uKp">
<rect key="frame" x="152" y="278" width="201" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="https://corporate.symphony.com" drawsBackground="YES" usesSingleLineMode="YES" id="4WS-yY-IPf">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" title="https://my.symphony.com" drawsBackground="YES" usesSingleLineMode="YES" id="4WS-yY-IPf">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>

2
installer/mac/SymphonySettingsPlugin/SymphonySettingsPlugin/Info.plist
View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>2.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>InstallerSectionTitle</key>

2
installer/mac/postinstall.sh
View File

@ -16,7 +16,7 @@ bring_to_front=$(sed -n '5p' ${settingsFilePath});
dev_tools_enabled=$(sed -n '6p' ${settingsFilePath});
if [ "$pod_url" == "" ]; then
pod_url="https://corporate.symphony.com"
pod_url="https://my.symphony.com"
fi
if [ "$minimize_on_close" == "" ]; then

2
installer/win/Symphony-x64.aip
View File

@ -43,7 +43,7 @@
<ROW Property="NOTIFICATIONS" Value="true"/>
<ROW Property="OPEN_EXTERNAL" Value="true"/>
<ROW Property="OPEN_EXTERNAL_CB" Value="true"/>
<ROW Property="POD_URL" Value="https://corporate.symphony.com" Type="4"/>
<ROW Property="POD_URL" Value="https://my.symphony.com" Type="4"/>
<ROW Property="POINTER_LOCK" Value="true"/>
<ROW Property="POINTER_LOCK_CB" Value="true"/>
<ROW Property="ProductCode" Value="1033:{F17EDEB4-A15F-46B9-83E9-8652CBC886B2} " Type="16"/>

2
installer/win/Symphony-x86.aip
View File

@ -43,7 +43,7 @@
<ROW Property="NOTIFICATIONS" Value="true"/>
<ROW Property="OPEN_EXTERNAL" Value="true"/>
<ROW Property="OPEN_EXTERNAL_CB" Value="true" Type="4"/>
<ROW Property="POD_URL" Value="https://corporate.symphony.com" Type="4"/>
<ROW Property="POD_URL" Value="https://my.symphony.com" Type="4"/>
<ROW Property="POINTER_LOCK" Value="true"/>
<ROW Property="POINTER_LOCK_CB" Value="true" Type="4"/>
<ROW Property="ProductCode" Value="1033:{F17EDEB4-A15F-46B9-83E9-8652CBC886B2} " Type="16"/>

5
js/aboutApp/index.js
View File

@ -9,6 +9,7 @@ const logLevels = require('../enums/logLevels.js');
const { version, clientVersion, buildNumber } = require('../../package.json');
const { initCrashReporterMain, initCrashReporterRenderer } = require('../crashReporter.js');
const i18n = require('../translation/i18n');
const { isMac } = require('../utils/misc');
let aboutWindow;
@ -88,6 +89,10 @@ function openAboutWindow(windowName) {
initCrashReporterMain({ process: 'about app window' });
initCrashReporterRenderer(aboutWindow, { process: 'render | about app window' });
aboutWindow.webContents.send('versionInfo', { version, clientVersion, buildNumber });
if (!isMac) {
// prevents from displaying menu items when "alt" key is pressed
aboutWindow.setMenu(null);
}
});
aboutWindow.webContents.on('crashed', function () {

4
js/basicAuth/index.js
View File

@ -105,6 +105,10 @@ function openBasicAuthWindow(windowName, hostname, isValidCredentials, clearSett
initCrashReporterRenderer(basicAuthWindow, { process: 'render | basic auth window' });
basicAuthWindow.webContents.send('hostname', hostname);
basicAuthWindow.webContents.send('isValidCredentials', isValidCredentials);
if (!isMac) {
// prevents from displaying menu items when "alt" key is pressed
basicAuthWindow.setMenu(null);
}
});
basicAuthWindow.webContents.on('crashed', function () {

5
js/notify/settings/configure-notification-position.js
View File

@ -12,6 +12,7 @@ const notify = require('./../electron-notify');
const eventEmitter = require('./../../eventEmitter');
const { updateConfigField } = require('../../config');
const i18n = require('../../translation/i18n');
const { isMac } = require('../../utils/misc');
let configurationWindow;
let screens;
@ -129,6 +130,10 @@ function openConfigurationWindow(windowName) {
configurationWindow.webContents.send('screens', screens);
}
configurationWindow.webContents.send('notificationSettings', {position: position, display: display});
if (!isMac) {
// prevents from displaying menu items when "alt" key is pressed
configurationWindow.setMenu(null);
}
});
configurationWindow.on('close', () => {

3
js/windowMgr.js
View File

@ -1186,7 +1186,8 @@ function cleanUpChildWindows() {
function popupMenu() {
const focusedWindow = BrowserWindow.getFocusedWindow();
if (mainWindow && !mainWindow.isDestroyed() && isMainWindow(focusedWindow)) {
const popupOpts = { browserWin: mainWindow, x: 10, y: -20 };
const { x, y } = mainWindow.isFullScreen() ? { x: 0, y: 0 } : { x: 10, y: -20 };
const popupOpts = { browserWin: mainWindow, x, y };
getMenu().popup(popupOpts);
}
}

8
package.json
View File

@ -1,7 +1,7 @@
{
"name": "Symphony",
"productName": "Symphony",
"version": "3.4.0",
"version": "3.5.0",
"clientVersion": "1.53",
"buildNumber": "0",
"description": "Symphony desktop app (Foundation ODP)",
@ -86,7 +86,7 @@
"browserify": "16.2.3",
"chromedriver": "2.42.0",
"cross-env": "5.2.0",
"electron": "3.0.5",
"electron": "3.0.9",
"electron-builder": "20.28.4",
"electron-builder-squirrel-windows": "12.3.0",
"electron-chromedriver": "3.0.0-beta.1",
@ -114,7 +114,7 @@
"auto-launch": "5.0.5",
"electron-dl": "1.12.0",
"electron-log": "2.2.17",
"electron-spellchecker": "git+https://github.com/KiranNiranjan/electron-spellchecker.git#v3.0.5",
"electron-spellchecker": "git+https://github.com/KiranNiranjan/electron-spellchecker.git#v3.0.6",
"ffi": "git+https://github.com/keerthi16/node-ffi.git#v1.2.8",
"filesize": "3.6.1",
"keymirror": "0.1.1",
@ -129,6 +129,6 @@
},
"optionalDependencies": {
"screen-snippet": "git+https://github.com/symphonyoss/ScreenSnippet.git#v1.0.3",
"swift-search": "2.0.1-r53"
"swift-search": "2.0.2"
}
}