Skip to content

Commit 80a3fc0

Browse files
committed
Merge branch 'v0.2'
* v0.2: NOJIRA: reverting the build script to point to universal master. GPII-20: Fixed test names for screen readers. Removed check for two settings that arent expected to be set (and hence would rely on system defaults) GPII-20: Updated config file of integrations test reference proper config from universal GPII-177: Updated install script to checkout v0.2 of universal GPII-177: Updated install script to checkout v0.2 of universal GPII-20: Changed buildTest to runTest, according to change in acceptance testing framework GPII-177: Renamed SPI settingshandler functions from ?etOne to ?etImpl, fixed order of arguments to invoke settingshandler GPII-20: Added all acceptance tests for windows to ensure that pilot related functionality is working GPII-184: Updated settingshandlers according to proper GET API. fixed relevant invokers to have dynamic: true GPII-190: updated the default config name.
2 parents 3c6cb49 + 70bb8a0 commit 80a3fc0

File tree

10 files changed

+1037
-98
lines changed

10 files changed

+1037
-98
lines changed

gpii.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ fluid.require("./gpii/node_modules/registryResolver", require);
2020
fluid.require("./gpii/node_modules/spiSettingsHandler", require);
2121

2222
kettle.config.makeConfigLoader({
23-
nodeEnv: kettle.config.getNodeEnv("fm.ps.sr.dr.mm.os.development"),
23+
nodeEnv: kettle.config.getNodeEnv("fm.ps.sr.dr.mm.os.lms.development"),
2424
configPath: kettle.config.getConfigPath() || "../node_modules/universal/gpii/configs"
2525
});

gpii/node_modules/WindowsUtilities/WindowsUtilities.js

Lines changed: 43 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gpii/node_modules/registrySettingsHandler/src/RegistrySettingsHandler.js

Lines changed: 28 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)