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 #321

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
16db65c
GPII-4011: Showing the volume change on the screen.
stegru Jul 5, 2019
57324ac
GPII-4011: Putting line separators back to CRLF.
stegru Jul 5, 2019
5a5e957
GPII-4011: Putting line separators back to CRLF. (trying harder)
stegru Jul 5, 2019
871938e
Merge branch 'stegru/GPII-3830' into GPII-4214
javihernandez Nov 7, 2019
cbedbd8
Merge branch 'stegru/GPII-3811' into GPII-4214
javihernandez Nov 7, 2019
5ddaeb0
Merge branch 'stegru/GPII-2338' into GPII-4214
javihernandez Nov 7, 2019
4fe32f6
GPII-4214: Updated universal reference
javihernandez Nov 7, 2019
c308a91
Merge branch 'stegru/GPII-3853' into GPII-4214
javihernandez Nov 7, 2019
2187454
Merge branch 'origin/GPII-4033' into GPII-4214
javihernandez Nov 7, 2019
fb9dbd7
Merge branch 'stegru/GPII-4087' into GPII-4214
javihernandez Nov 7, 2019
bde545e
Merge branch 'stegru/GPII-4092.master' into GPII-4214
javihernandez Nov 7, 2019
ff7267e
Merge branch 'stegru/GPII-4186' into GPII-4214
javihernandez Nov 7, 2019
f671713
Merge branch 'stegru/GPII-4011' into GPII-4214
javihernandez Nov 8, 2019
0844cfa
Merge branch 'stegru/GPII-4016' into GPII-4214
javihernandez Nov 8, 2019
bb38ca3
Merge branch 'stegru/GPII-3853' into GPII-4214
javihernandez Nov 21, 2019
c05da02
Merge branch 'JavierJF/GPII-4231' into GPII-4214
javihernandez Nov 21, 2019
c5312fd
GPII-4214: Updated universal reference
javihernandez Nov 21, 2019
baa4da1
Merge branch 'stegru/GPII-3572' into GPII-4214.GPII-3572
javihernandez Dec 3, 2019
417e743
GPII-4214.GPII-3572: Updated universal reference
javihernandez Dec 3, 2019
b009752
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Dec 4, 2019
c2ce74c
GPII-4214.GPII-3572: Updated universal reference
javihernandez Dec 4, 2019
379b32e
Merge branch 'stegru/GPII-4244' into GPII-4214.GPII-3572
javihernandez Dec 4, 2019
6e3e06e
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Dec 5, 2019
2824c01
Merge branch 'stegru/GPII-4244' into GPII-4214.GPII-3572
javihernandez Dec 5, 2019
ec8fc7b
GPII-4214.GPII-3572: Updated universal reference
javihernandez Dec 5, 2019
2fcc5da
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Dec 19, 2019
c985942
GPII-4214.GPII-3572: Updated universal reference
javihernandez Dec 19, 2019
11473f0
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Jan 10, 2020
2c4d82a
GPII-4214.GPII-3572: Updated universal reference
javihernandez Jan 10, 2020
26b52d5
GPII-4214.GPII-3572: Removed disk filling error log
javihernandez Jan 17, 2020
9f9c0ca
Merge branch 'stegru/GPII-4244' into GPII-4214.GPII-3572
javihernandez Jan 22, 2020
14211ee
Merge branch 'stegru/GPII-4244' into GPII-4214.GPII-3572
javihernandez Jan 27, 2020
8cf1c6a
Merge branch 'stegru/GPII-3853' into GPII-4214.GPII-3572
javihernandez Jan 31, 2020
d809113
GPII-4370: Rejecting settings handler if the settings helper fails.
stegru Feb 28, 2020
6d7d078
GPII-4370: Getting gpiiKey via userIdSource site config option
stegru Mar 11, 2020
842dce1
GPII-4370: Resolving environment %variables% in the userIdSource site…
stegru Mar 11, 2020
d8cfdf9
NOJIRA: Updated package.json versions
stegru Mar 11, 2020
8e40244
GPII-4397: Setting the correct variable for the default registry loca…
stegru Mar 11, 2020
62529a8
GPII-4401: Generating gpiiKeys based on lowercase usernames.
stegru Mar 13, 2020
83af4e8
GPII-4403: Using the site secret for the hmac key to generate gpiiKeys.
stegru Mar 15, 2020
13a8dbb
NOJIRA: Updated gpii-windows/gpii-universal references.
stegru Mar 15, 2020
46fe848
NOJIRA: Updating universal reference
stegru Mar 21, 2020
747b343
Merge remote-tracking branch 'origin/GPII-4409' into morphic-1.3.x
stegru Mar 24, 2020
cee3522
NOJIRA: Updating gpii-windows reference
stegru Mar 24, 2020
47d22db
GPII-4289: Calculating QSS height, rather than using the window size.
stegru Mar 27, 2020
ed50a6d
GPII-4420: Only listing languages installed by a morphic language ins…
stegru Mar 29, 2020
0a25bea
NOJIRA: Updating gpii-universal reference
stegru Mar 29, 2020
687d336
GPII-4420: Handling the possibility of no installed language packs
stegru Mar 29, 2020
6321460
NOJIRA: Updating gpii-universal reference
stegru Mar 30, 2020
2d5edfb
Merge branch 'stegru/GPII-4428' into morphic-1.3.x
javihernandez Apr 14, 2020
07b1e81
GPII-4490: Merge remote-tracking branch 'upstream/master' into morphi…
javihernandez May 25, 2020
2442836
GPII-4490: Merge remote-tracking branch 'stegru/GPII-4244' into morph…
javihernandez May 25, 2020
1c322cb
GPII-4490: Merge remote-tracking branch 'stegru/GPII-4397' into morph…
javihernandez May 25, 2020
e08f25a
GPII-4490: Merge branch 'stegru/GPII-4428' into morphic-1.3.5
javihernandez May 25, 2020
c85ee99
GPII-4490: Merge branch 'stegru/GPII-3811' into morphic-1.3.5
javihernandez May 25, 2020
1ab65d9
GPII-4490: Merge branch 'stegru/GPII-4016' into morphic-1.3.5
javihernandez May 25, 2020
c835a69
GPII-4490: Merge branch 'stegru/GPII-4403' into morphic-1.3.5
javihernandez May 25, 2020
9ca8c6b
GPII-4490: Merge branch 'stegru/GPII-4289' into morphic-1.3.5
javihernandez May 25, 2020
1bc49df
GPII-4490: Merge branch 'stegru/GPII-3811' into morphic-1.3.5
javihernandez May 27, 2020
2fa63f9
GPII-4490: Removed redefinition of ExpandEnvironmentStringsW
javihernandez May 27, 2020
4a5a270
GPII-4490: Merge branch 'stegru/GPII-4428' into morphic-1.3.5
javihernandez May 29, 2020
2c765c6
GPII-4490: Merge branch 'upstream/master' into morphic-1.3.5
javihernandez May 29, 2020
b33d5e2
GPII-4490: Updated universal reference
javihernandez May 29, 2020
64f654e
GPII-4490: Merge branch 'upstream/master' into morphic-1.3.5
javihernandez Jun 10, 2020
af991df
GPII-4490: Updated universal reference
javihernandez Jun 10, 2020
0c1b23b
GPII-4490: Fixed typo from last update with master
javihernandez Jun 10, 2020
c538930
GPII-4490: Updated universal reference
javihernandez Jun 12, 2020
060f99d
GPII-4490: Updated universal reference
javihernandez Jun 15, 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
6 changes: 6 additions & 0 deletions gpii/node_modules/WindowsUtilities/WindowsUtilities.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"edge-js": "10.3.1",
"ffi-napi": "2.4.3",
"gpii-universal": "0.3.0-dev.20200604T131823Z.d6fed9a",
"gpii-universal": "javihernandez/universal#4b4f238858a3e0be0ab801703299676cbba1399a",
"@pokusew/pcsclite": "0.4.18",
"ref": "1.3.4",
"ref-struct": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion provisioning/NpmInstall.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Invoke-Command $msbuild "SettingsHelper.sln /p:Configuration=Release /p:Platform

# Build the volumeControl solution
$volumeControlDir = Join-Path $rootDir "gpii\node_modules\nativeSettingsHandler\nativeSolutions\VolumeControl"
Invoke-Command $msbuild "VolumeControl.sln /p:Configuration=Release /p:Platform=`"x86`" /p:FrameworkPathOverride=`"C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1`"" $volumeControlDir
Invoke-Command $msbuild "VolumeControl.sln /p:Configuration=Release /p:Platform=`"x86`"" $volumeControlDir

# Build the process test helper
$testProcessHandlingDir = Join-Path $rootDir "gpii\node_modules\processHandling\test"
Expand Down