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

GPII-3435: Simplify structure of "reset all" settings file using standard preferences #706

Merged
merged 12 commits into from Nov 26, 2018

Conversation

Projects
None yet
4 participants
@cindyli
Copy link
Contributor

cindyli commented Nov 5, 2018

No description provided.

cindyli added some commits Nov 5, 2018

GPII-3435: Renamed the directory that holds defaultSettings.json5 fro…
…m testData/snapshots to testData/defaultSettings.
@gpii-bot

This comment has been minimized.

Copy link
Collaborator

gpii-bot commented Nov 5, 2018

@gpii-bot

This comment has been minimized.

Copy link
Collaborator

gpii-bot commented Nov 5, 2018

@gpii-bot

This comment has been minimized.

Copy link
Collaborator

gpii-bot commented Nov 5, 2018

@cindyli cindyli requested a review from amb26 Nov 6, 2018

@gpii-bot

This comment has been minimized.

Copy link
Collaborator

gpii-bot commented Nov 9, 2018

@gpii-bot

This comment has been minimized.

Copy link
Collaborator

gpii-bot commented Nov 9, 2018

@gpii-bot

This comment has been minimized.

Copy link
Collaborator

gpii-bot commented Nov 19, 2018

@@ -219,7 +219,7 @@ gpii.settingsHandlers.changesToSettings = function (element) {
return element.type === "DELETE" ? undefined : element.path ? {
path: element.path,
value: element.value
} : element.value;
} : fluid.isPrimitive(element) ? element : element.value;

This comment has been minimized.

Copy link
@amb26

amb26 Nov 19, 2018

Member

Sorry I started reviewing before I realised the dependency between these pulls, please see comment in #708

@gpii-bot

This comment has been minimized.

Copy link
Collaborator

gpii-bot commented Nov 22, 2018

@cindyli

This comment has been minimized.

Copy link
Contributor Author

cindyli commented Nov 22, 2018

@amb26, your comment has been addressed. This pull request is ready for another look. Thanks.

@amb26 amb26 merged commit 60f9c16 into GPII:master Nov 26, 2018

1 check passed

default Build finished.
Details
@amb26

This comment has been minimized.

Copy link
Member

amb26 commented Nov 26, 2018

Really excellent improvement, thanks @cindyli

@cindyli

This comment has been minimized.

Copy link
Contributor Author

cindyli commented Nov 26, 2018

@javihernandez, with the merge of this pull request, please note that defaultSettings.win32.json5 has been moved from testData/snapshots directory to testData/defaultSettings directory. The old testData/snapshots no longer exists. You may like to change the installer script where this old directory is referred. Thanks.

@cindyli cindyli deleted the cindyli:GPII-3435 branch Nov 26, 2018

@cindyli

This comment has been minimized.

Copy link
Contributor Author

cindyli commented Nov 28, 2018

Merged at 481345e

@javihernandez

This comment has been minimized.

Copy link
Member

javihernandez commented Nov 28, 2018

@javihernandez, with the merge of this pull request, please note that defaultSettings.win32.json5 has been moved from testData/snapshots directory to testData/defaultSettings directory. The old testData/snapshots no longer exists. You may like to change the installer script where this old directory is referred. Thanks.

@cindyli thanks for the heads up!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.