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

DO NOT MERGE: Morphic 1.3.5 #208

Open
wants to merge 194 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
194 commits
Select commit Hold shift + click to select a range
86a77aa
Merge branch 'upstream/master' into GPII-3744+GPII-2338
javihernandez Mar 7, 2019
6c23cba
Merge branch 'stegru/GPII-2338' into GPII-3744+GPII-2338
javihernandez Mar 7, 2019
b016a14
GPII-3744+GPII-2338: Updated windows reference
javihernandez Mar 7, 2019
e579fa2
GPII-3744+GPII-2338: Updated windows reference and added GPII_CLOUD_URL
javihernandez Mar 7, 2019
0fb78e5
Merge branch 'upstream/master' into GPII-3785
javihernandez Mar 10, 2019
8bcdd16
Merge branch 'upstream/master' into GPII-3785
javihernandez Mar 11, 2019
8ace45f
GPII-3789: Optionally include sharex module into the installer
javihernandez Mar 12, 2019
b48f99e
Merge branch 'upstream/master' into GPII-3789
javihernandez Mar 14, 2019
979c699
Merge branch 'upstream/master' into GPII-3789
javihernandez Mar 15, 2019
f949fe7
GPII-3819: on reset to standart use value from siteConfig to set defa…
krisYanachkov Mar 25, 2019
4070f9a
GPII-3819: code review changes
krisYanachkov Mar 25, 2019
7aefdbd
GPII-3819: Load default settings from a local file
krisYanachkov Mar 27, 2019
81f0d98
NOJIRA: removed forgotten log
krisYanachkov Mar 27, 2019
545ee45
GPII-3819: add function to check if the file exists
krisYanachkov Mar 27, 2019
2ae50c3
NOJIRA: some checks
krisYanachkov Mar 27, 2019
be96497
GPII-3819: Using %appdata% for the root part of the default setting's…
Karadaliev Apr 9, 2019
0b1245d
GPII-3819: Using path.join to created the path; added comments and logs
Karadaliev Apr 10, 2019
bc80b1b
NOJIRA: added the correct path for defaultSettings.json to tests
krisYanachkov Apr 14, 2019
b2d5d67
NOJIRA: Addressing code review comment
krisYanachkov Jun 24, 2019
0a16c58
GPII-3853: Logging tooltip show/hide
stegru Jun 24, 2019
0dfe4cb
GPII-3853: Logging "Learn more" link clicks
stegru Jun 24, 2019
0236a53
GPII-3853: Documentation for new metrics
stegru Jun 24, 2019
b9ba278
NOJIRA: Addressing code review comments
krisYanachkov Jun 25, 2019
fa90dd1
NOJIRA: Addressing code review comments
krisYanachkov Jun 25, 2019
e808f92
Merge branch 'master' into GPII-3819
Karadaliev Jun 25, 2019
3429f8d
GPII-3819: Clarifying the comments and lint
Karadaliev Jun 25, 2019
c096922
GPII-3853: Added calculation of duration between related events.
stegru Jun 25, 2019
f506b56
GPII-3853: Recording clicks of desktop icons
stegru Jun 26, 2019
f3f3e1b
GPII-3853: Updated metrics documentation
stegru Jun 26, 2019
1829ce3
GPII-3853: added widget shown duration
stegru Jun 26, 2019
eed1e8b
GPII-3997: Optionally include documorph merge module into the installer
javihernandez Jun 28, 2019
240a001
GPII-3997: Updated path to docuMorphExecutable in siteconfig.json5
javihernandez Jun 28, 2019
e602024
Merge branch 'GPII-3881' into GPII-3645-Word-and-Volume
Karadaliev Jul 1, 2019
80c49fc
GPII-3853: Recording tray icon clicks.
stegru Jul 1, 2019
ec0913c
GPII-3853: Recording the state of the QSS.
stegru Jul 1, 2019
55ec8f7
GPII-3853: Recording which qss button is focused and hovered over
stegru Jul 1, 2019
488c425
Merge branch 'GPII-3881' into GPII-3645-Word-and-Volume
Karadaliev Jul 2, 2019
1bfb64c
Merge branch 'GPII-3645-New' into GPII-3645-Word-and-Volume
Karadaliev Jul 2, 2019
a4bdf7f
GPII-3853: Disabling metrics via siteConfig
stegru Jul 2, 2019
5987ea1
GPII-3853: Added 'site' to siteConfig
stegru Jul 2, 2019
4eaf882
GPII-3853: Logging the site id
stegru Jul 2, 2019
7366d92
Merge remote-tracking branch 'upstream/master' into GPII-3853
stegru Jul 2, 2019
986c60b
GPII-3853: Updating package reference to related branch
stegru Jul 2, 2019
267600d
Merge branch 'master' into GPII-3819
Karadaliev Jul 2, 2019
0325f31
Merge branch 'krisYanachkov/GPII-3645-Word-and-Volume' into GPII-4004
javihernandez Jul 2, 2019
d5dbf19
Merge branch 'stegru/GPII-3705' into GPII-4004
javihernandez Jul 2, 2019
2755d75
Merge branch 'javihernandez/GPII-3997' into GPII-4004
javihernandez Jul 2, 2019
3f3a451
Merge branch 'javihernandez/GPII-3789' into GPII-4004
javihernandez Jul 2, 2019
8111b0f
Merge branch 'stegru/GPII-2338' into GPII-4004
javihernandez Jul 2, 2019
f3854af
GPII-4004: Updated windows reference
javihernandez Jul 2, 2019
e8a1fbc
GPII-4004: Updated service.json5 to use prd config and prd cloud
javihernandez Jul 3, 2019
0b67c88
GPII-4004: Updated gpii-wix-installer reference in Installer.ps1
javihernandez Jul 3, 2019
7a2b715
GPII-4004: Bumped version to 1.2.0
javihernandez Jul 3, 2019
da29866
Merge branch 'krisYanachkov/GPII-4008' into GPII-4004
javihernandez Jul 4, 2019
22e26bb
Merge branch 'stegru/GPII-3853' into GPII-4004
javihernandez Jul 4, 2019
d7c79e5
GPII-4004: Updated windows reference
javihernandez Jul 4, 2019
143f874
Merge branch 'krisYanachkov/GPII-3819' into GPII-4004
javihernandez Jul 4, 2019
4dc39d0
Merge branch 'upstream/master' into GPII-4004
javihernandez Jul 5, 2019
8e579e8
Merge branch 'krisYanachkov/GPII-4008' into GPII-4004
javihernandez Jul 5, 2019
1516c77
GPII-3853: Capturing focus/hover state of widget components.
stegru Jul 5, 2019
d919952
GPII-3853: Wrapped component ID into eventData object.
stegru Jul 5, 2019
e7ee23c
GPII-3853: Removed onLearnMoreClicked event (this is captured in anot…
stegru Jul 5, 2019
4270c84
GPII-3853: Updated comments.
stegru Jul 5, 2019
d0e8548
Merge remote-tracking branch 'upstream/master' into GPII-3853
stegru Jul 5, 2019
dee34b2
GPII-3853: Added required event to test component.
stegru Jul 5, 2019
7475e6b
GPII-4004: Updated windows reference
javihernandez Jul 5, 2019
736c1b6
Merge remote-tracking branch 'javihernandez/GPII-4004' into GPII-3853
stegru Jul 6, 2019
feabc10
Merge remote-tracking branch 'upstream/master' into GPII-3853
stegru Jul 8, 2019
f4e62a1
GPII-3853: Updated gpii-windows reference
stegru Jul 8, 2019
d8f6e42
GPII-3853: Added metrics for notification and error dialogs
stegru Jul 9, 2019
8ab8ed0
GPII-3853: Updated documentation
stegru Jul 9, 2019
aeb4e73
GPII-3819: Support new defaultSettings form
javihernandez Jul 12, 2019
4de45d0
Merge pull request #4 from javihernandez/GPII-3819-defaultSettingsFor…
krisYanachkov Jul 12, 2019
344b61b
Merge branch 'master' into GPII-3819
krisYanachkov Jul 14, 2019
0b6ba1d
NOJIRA: updated the defaultSettings.json used in tests
krisYanachkov Jul 14, 2019
76b8243
GPII-3853: Removed duplicate events
stegru Jul 16, 2019
851920a
GPII-3853: Capturing link clicks in tips (for translate tools)
stegru Jul 17, 2019
83d2594
Merge remote-tracking branch 'upstream/master' into GPII-3853
stegru Aug 6, 2019
2a7b8c3
GPII-3819: TEMPORARY added log on the loadDefaultSettings check (if c…
Karadaliev Aug 7, 2019
0475fac
Merge branch 'stegru/GPII-3705' into GPII-4214
javihernandez Nov 7, 2019
9b74041
GPII-4214: Updated windows reference
javihernandez Nov 7, 2019
1fc3504
Merge branch 'origin/GPII-3997' into GPII-4214
javihernandez Nov 7, 2019
abdbf6d
Merge branch 'origin/GPII-3789' into GPII-4214
javihernandez Nov 7, 2019
bef249a
GPII-4214: Updated gpii-wix-installer reference
javihernandez Nov 7, 2019
21b645b
Merge branch 'stegru/GPII-3853' into GPII-4214
javihernandez Nov 7, 2019
6b38d93
Merge branch 'krisYanachkov/GPII-3819' into GPII-4214
javihernandez Nov 7, 2019
40e73b9
Merge branch 'stegru/GPII-2338' into GPII-4214
javihernandez Nov 7, 2019
c546052
Merge branch 'amb26/GPII-3818' into GPII-4214
javihernandez Nov 7, 2019
f600c75
GPII-4214: Bumped to 1.3.0
javihernandez Nov 7, 2019
4b473b6
GPII-4214: Updated windows reference
javihernandez Nov 8, 2019
c476dcf
Merge branch 'krisYanachkov/GPII-3600' into GPII-4214
javihernandez Nov 8, 2019
3953e81
Merge branch 'upstream/master' into GPII-4214
javihernandez Nov 8, 2019
9303688
Merge branch 'krisYanachkov/GPII-4026' into GPII-4214
javihernandez Nov 8, 2019
bb2c2d4
Merge branch 'origin/GPII-4227' into GPII-4214
javihernandez Nov 8, 2019
668b349
Merge branch 'krisYanachkov/GPII-3600' into GPII-4214
javihernandez Nov 14, 2019
df25f0b
Merge branch 'GPII-3600' into Morphic-v1.3-candidate
krisYanachkov Nov 21, 2019
afc28ed
NOJIRA: resolved conflict
krisYanachkov Nov 21, 2019
cf91bf9
NOJIRA: resolved conflict
krisYanachkov Nov 21, 2019
e6c40a5
Merge branch 'GPII-4139' into Morphic-v1.3-candidate
krisYanachkov Nov 21, 2019
a6c0251
NOJIRA: removed an unused icon
krisYanachkov Nov 21, 2019
012b3d0
NOJIRA: Finishing touches
Karadaliev Nov 21, 2019
07724d8
Merge branch 'upstream/master' into GPII-4214
javihernandez Nov 21, 2019
daff9c9
Merge branch 'stegru/GPII-3853' into GPII-4214
javihernandez Nov 21, 2019
8feaa18
GPII-4214: Updated windows reference
javihernandez Nov 21, 2019
9cc20ca
Merge branch 'krisYanachkov/Morphic-v1.3-candidate' into GPII-4214
javihernandez Nov 21, 2019
c80b9d5
GPII-4214: Commented out channelNotifier component in qssMouseWidget
javihernandez Nov 22, 2019
bf2b72f
NOJIRA: show or hide error message dialog according to site config se…
krisYanachkov Nov 22, 2019
6fc1250
Merge branch 'krisYanachkov/Morphic-v1.3-candidate-notification' into…
javihernandez Nov 22, 2019
d26bcc6
NOJIRA: Added the proper footerTip for the Color Vision filter
Karadaliev Nov 25, 2019
1ac173b
Merge branch 'krisYanachkov/Morphic-v1.3-candidate' into GPII-4214
javihernandez Nov 25, 2019
bc331db
Merge branch 'stegru/GPII-3572' into GPII-4214.GPII-3572
javihernandez Dec 3, 2019
971abb6
GPII-4214.GPII-3572: Updated windows reference
javihernandez Dec 3, 2019
f53d486
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Dec 4, 2019
ceeab27
GPII-4214.GPII-3572: Updated windows reference
javihernandez Dec 4, 2019
f3a5fef
GPII-4214.GPII-3572: Updated universal reference
javihernandez Dec 4, 2019
4bd170a
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Dec 5, 2019
a48e0f7
GPII-4214.GPII-3572: Updated windows reference
javihernandez Dec 5, 2019
2699cbb
GPII-4214.GPII-3572: Enabled siteconfig autoUpdater
javihernandez Dec 5, 2019
a9478f4
GPII-4214.GPII-3572: Supplied url for the service to pull the siteconfig
javihernandez Dec 5, 2019
268bb94
GPII-4214.GPII-3572: Updated config values for the metricsSwitch
javihernandez Dec 5, 2019
c0b55a9
Merge branch 'upstream/master' into GPII-4214.GPII-3572
javihernandez Dec 19, 2019
76c2e10
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Dec 19, 2019
b78cea5
GPII-4214.GPII-3572: Updated windows reference
javihernandez Dec 19, 2019
4582d33
GPII-4214.GPII-3572: Show error dialogs by default
javihernandez Jan 9, 2020
2a7508c
Merge branch 'upstream/master' into GPII-4214.GPII-3572
javihernandez Jan 10, 2020
a6fdb47
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Jan 10, 2020
357b32f
GPII-4214.GPII-3572: Updated windows reference
javihernandez Jan 10, 2020
6d7460d
GPII-4214.GPII-3572: Fixed typo in message bundle
javihernandez Jan 10, 2020
f78d55d
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Jan 11, 2020
55e2f07
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Jan 13, 2020
f3b8419
Merge remote-tracking branch 'upstream/master' into GPII-4244
stegru Jan 16, 2020
24d177c
GPII-4214.GPII-3572: Updated windows reference
javihernandez Jan 17, 2020
b24bc19
GPII-4214.GPII-3572: Bumped to 1.3.1
javihernandez Jan 21, 2020
ed670a2
GPII-4214.GPII-3572: Updated windows reference
javihernandez Jan 22, 2020
32fd33d
Merge branch 'stegru/GPII-4244' into GPII-4214.GPII-3572
javihernandez Jan 27, 2020
3120296
GPII-4214.GPII-3572: Updated windows reference
javihernandez Jan 27, 2020
b1e4c6e
GPII-4214.GPII-3572: Updates windows reference
javihernandez Jan 31, 2020
12e8778
GPII-4214.GPII-3572: Bumped to 1.3.2
javihernandez Jan 31, 2020
c0a3147
GPII-4386: fix for duplicate custom buttons
krisYanachkov Mar 6, 2020
7a8a6f9
NOJIRA: Removed site config
stegru Mar 11, 2020
86a7fb3
NOJIRA: Updated package.json versions
stegru Mar 11, 2020
674dbb2
NOJIRA: Disabled site-config auto updates
stegru Mar 12, 2020
8a950fb
Revert "NOJIRA: Removed site config"
stegru Mar 13, 2020
16eb68e
NOJIRA: Updated Windows reference.
stegru Mar 13, 2020
8f44b97
NOJIRA: Updated Windows reference.
stegru Mar 13, 2020
b9bded2
NOJIRA: Updated gpii-windows/gpii-universal references.
stegru Mar 15, 2020
51c66e1
GPII-3853: Capturing customised button info
stegru Feb 11, 2020
93d232b
GPII-4408: Terminating if a signalling command line option is used.
stegru Mar 19, 2020
1b3f2eb
NOJIRA: Updating gpii-windows reference
stegru Mar 21, 2020
e524162
Merge remote-tracking branch 'krisYanachkov/GPII-4274' into morphic-1…
stegru Mar 23, 2020
d176313
Merge remote-tracking branch 'origin/GPII-4409' into morphic-1.3.x
stegru Mar 24, 2020
c6460ae
Merge remote-tracking branch 'krisYanachkov/GPII-3925' into morphic-1…
stegru Mar 24, 2020
82a9b61
NOJIRA: Updating gpii-windows reference
stegru Mar 24, 2020
755c72a
NOJIRA: Updating version
stegru Mar 24, 2020
559b7a9
Merge remote-tracking branch 'origin/GPII-4289' into morphic-1.3.x
stegru Mar 24, 2020
36b476d
NOJIRA: Updated versions
stegru Mar 25, 2020
dc27184
Merge remote-tracking branch 'GPII/morphic-1.3.x' into morphic-1.3.x
stegru Mar 25, 2020
a6c396d
GPII-4196: close the 'more panel' if a widget is opened outside.
krisYanachkov Mar 28, 2020
77e31f3
GPII-4289: Loading appBarQss from site config.
stegru Mar 26, 2020
ed1448f
GPII-4289: Calculating QSS height, rather than using the window size.
stegru Mar 27, 2020
e385e46
GPII-3730: Moving colour vision text to under the buttons
stegru Mar 29, 2020
d30a6cf
NOJIRA: Updating gpii-windows reference
stegru Mar 29, 2020
6e8a332
NOJIRA: Updating version
stegru Mar 30, 2020
14a3f11
GPII-4447: Updated gpii-windows reference
javihernandez Apr 14, 2020
e42b03d
GPII-4447: Bumped to 1.3.4-r3
javihernandez Apr 14, 2020
ac35836
Merge branch 'upstream/master' into GPII-3997
javihernandez May 11, 2020
984fec8
GPII-4490: Merge branch 'upstream/master' into morphic-1.3.5
javihernandez May 26, 2020
fd3cbd7
GPII-4490: Merge branch 'stegru/GPII-3572' into morphic-1.3.5
javihernandez May 26, 2020
853bb1c
GPII-4490: Merge branch 'stegru/GPII-4289' into morphic-1.3.5
javihernandez May 26, 2020
40a56ce
GPII-4490: Merge branch 'krisYanachkov/GPII-4274' into morphic-1.3.5
javihernandez May 26, 2020
37af282
GPII-4490: Merge branch 'amb26/GPII-3818' into morphic-1.3.5
javihernandez May 26, 2020
387d6d6
GPII-4490: Merge branch 'javihernandez/GPII-3997' into morphic-1.3.5
javihernandez May 26, 2020
c46e7ce
GPII-4490: Updated gpii-windows reference
javihernandez May 26, 2020
ee701bc
GPII-4490: Pointing to Javi's dev cluster
javihernandez May 26, 2020
98e1b41
GPII-4490: Updated gpii-windows reference
javihernandez May 29, 2020
c8862e7
GPII-4490: Bumped to 1.3.5-r1
javihernandez May 29, 2020
99bb908
GPII-4490: Merge branch 'upstream/master' into morphic-1.3.5
javihernandez Jun 10, 2020
a08121a
GPII-4490: Merge branch 'krisYanachkov/GPII-4384' into morphic-1.3.5
javihernandez Jun 10, 2020
a49ce94
GPII-4490: Updated mapOff and default value for cursorSize setting
javihernandez Jun 10, 2020
8c7622c
GPII-4490: Merge branch 'javihernandez/GPII-4498' into morphic-1.3.5
javihernandez Jun 10, 2020
d0c907f
GPII-4490: Merge branch 'sgithens/GPII-4494' into morphic-1.3.5
javihernandez Jun 10, 2020
a2b1b8a
GPII-4490: Updated windows reference
javihernandez Jun 10, 2020
e08bb0b
GPII-4490: Updated windows reference
javihernandez Jun 10, 2020
30bf265
GPII-4490: Merge branch 'upstream/master' into morphic-1.3.5
javihernandez Jun 12, 2020
bab06b8
GPII-4490: Removed references to defaultSettingsData
javihernandez Jun 12, 2020
aa270f7
GPII-4490: Updated windows reference
javihernandez Jun 12, 2020
dcc090a
GPII-4490: Removed screen-capture button
javihernandez Jun 12, 2020
816ccfd
GPII-4490: Removed tests/fixtures/defaultSettings.json5
javihernandez Jun 12, 2020
0b10e63
GPII-4490: Made linter happy
javihernandez Jun 12, 2020
0fe9c62
GPII-4490: Updated windows reference
javihernandez Jun 15, 2020
cda5c3e
GPII-4490: Bumped to 1.3.5-r2
javihernandez Jun 15, 2020
f8387a4
GPII-4489 Adding optional menu item generation to be able to selectiv…
sgithens Jun 23, 2020
584b1a6
GPII-4490: Merge branch 'sgithens/GPII-4489-enable-unable-capture' in…
javihernandez Jun 24, 2020
b860b4f
GPII-4490: Bumped to 1.3.5-r3
javihernandez Jun 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into GPII-3819
Karadaliev committed Jul 2, 2019
commit 267600d723dc248a42771e8b191e276cd85513ed
25 changes: 25 additions & 0 deletions src/main/common/utils.js
Original file line number Diff line number Diff line change
@@ -341,3 +341,28 @@ gpii.app.compileAppDataPath = function (fileLocation) {
var path = require("path");
return path.join(process.env.appdata, fileLocation);
};

/**
* Get the actual volume value. If there are an error or no value return the default
* volume value
* @param {Object} browserWindow - An Electron `BrowserWindow` object.
* @param {String} messageChannel - The channel to which the message should be sent.
* @return {Number} - The actual value of the volume
*/
gpii.app.getVolumeValue = function (browserWindow, messageChannel) {
var defaultVolumeValue = 0.5;
try {
var volumeValue = gpii.windows.nativeSettingsHandler.GetVolume().value;

if (isNaN(volumeValue)) {
gpii.app.notifyWindow(browserWindow, messageChannel, defaultVolumeValue);
return defaultVolumeValue;
} else {
gpii.app.notifyWindow(browserWindow, messageChannel, volumeValue);
return volumeValue;
}
} catch (err) {
fluid.log(fluid.logLevel.WARN, err);
return defaultVolumeValue;
}
};
You are viewing a condensed version of this merge commit. You can view the full changes here.