Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 13 additions & 10 deletions .evergreen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,33 +181,33 @@ functions:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
local_file: "src/dist/${windows_setup_filename}"
remote_file: "${project}/${build_variant}/${revision}/${windows_setup_filename}"
remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.exe"
bucket: mciuploads
permissions: public-read
content_type: application/octet-stream
display_name: "${windows_setup_label}"
display_name: "${name}-${version}-${platform}-${arch}.exe"
# MSI
- command: s3.put
params:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
local_file: "src/dist/${windows_msi_filename}"
remote_file: "${project}/${build_variant}/${revision}/${windows_msi_filename}"
remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.msi"
bucket: mciuploads
permissions: public-read
content_type: application/octet-stream
display_name: "${windows_msi_label}"
display_name: "${name}-${version}-${platform}-${arch}.msi"
# ZIP
- command: s3.put
params:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
local_file: "src/dist/${windows_zip_filename}"
remote_file: "${project}/${build_variant}/${revision}/${windows_zip_filename}"
remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.zip"
bucket: mciuploads
permissions: public-read
content_type: application/zip
display_name: "${windows_zip_label}"
display_name: "${name}-${version}-${platform}-${arch}.zip"
# RELEASES file
- command: s3.put
params:
Expand Down Expand Up @@ -238,22 +238,22 @@ functions:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
local_file: "src/dist/${osx_dmg_filename}"
remote_file: "${project}/${build_variant}/${revision}/${osx_dmg_filename}"
remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.dmg"
bucket: mciuploads
permissions: public-read
content_type: "application/x-apple-diskimage"
display_name: "${osx_dmg_label}"
display_name: "${name}-${version}-${platform}-${arch}.dmg"
# .zip
- command: s3.put
params:
aws_key: ${aws_key}
aws_secret: ${aws_secret}
local_file: "src/dist/${osx_zip_filename}"
remote_file: "${project}/${build_variant}/${revision}/${osx_zip_filename}"
remote_file: "${project}/${build_variant}/${revision}/${name}-${version}-${platform}-${arch}.zip"
bucket: mciuploads
permissions: public-read
content_type: application/zip
display_name: "${osx_zip_label}"
display_name: "${name}-${version}-${platform}-${arch}.zip"

"save LICENSE":
command: s3.put
Expand Down Expand Up @@ -289,6 +289,9 @@ functions:
export PATH="${node_path}:$PATH"
export CI=1
export EVERGREEN=1
export GITHUB_TOKEN=${leafybot_github_token}
export DOWNLOAD_CENTER_AWS_ACCESS_KEY_ID=${aws_key_evergreen_integrations}
export DOWNLOAD_CENTER_AWS_SECRET_ACCESS_KEY=${aws_secret_evergreen_integrations}
test -n '${add_env_appdata|}' && export APPDATA='${add_env_appdata|}'
${npm|npm} run upload;

Expand Down
7 changes: 6 additions & 1 deletion src/app/network-optin/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
input(type='checkbox', name='trackUsageStatistics', data-hook='usage-stats-checkbox')
span Enable Usage Statistics
p.option-description Allow Compass to send anonymous usage statistics.

li
label
input(type='checkbox', name='autoUpdates', data-hook='auto-updates-checkbox')
span Enable Automatic Updates
p.option-description Allow Compass to periodically check for new updates.

p With any of these options, none of your personal information or stored data will be submitted.

.modal-footer
Expand Down
18 changes: 14 additions & 4 deletions src/app/network-optin/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ var NetworkOptInView = View.extend({
props: {
trackErrors: ['boolean', true, true],
enableFeedbackPanel: ['boolean', true, true],
trackUsageStatistics: ['boolean', true, true]
trackUsageStatistics: ['boolean', true, true],
autoUpdates: ['boolean', true, true]
},
session: {
preferences: 'state',
Expand All @@ -41,6 +42,11 @@ var NetworkOptInView = View.extend({
hook: 'product-feedback-checkbox',
name: 'checked'
},
autoUpdates: {
type: 'booleanAttribute',
hook: 'auto-updates-checkbox',
name: 'checked'
},
trackUsageStatistics: {
type: 'booleanAttribute',
hook: 'usage-stats-checkbox',
Expand All @@ -59,13 +65,14 @@ var NetworkOptInView = View.extend({
this.trackErrors = true;
this.enableFeedbackPanel = true;
this.trackUsageStatistics = true;
// this.autoUpdates = true;
this.autoUpdates = true;
} else {
debug('seen this dialog before, show the real settings');
this.buttonTitle = 'Close';
this.trackErrors = app.preferences.trackErrors;
this.enableFeedbackPanel = app.preferences.enableFeedbackPanel;
this.trackUsageStatistics = app.preferences.trackUsageStatistics;
this.autoUpdates = app.preferences.autoUpdates;
}
},
checkboxChanged: function(evt) {
Expand All @@ -76,7 +83,9 @@ var NetworkOptInView = View.extend({
buttonClicked: function() {
var features = [
'enableFeedbackPanel',
'trackUsageStatistics'
'trackUsageStatistics',
'trackErrors',
'autoUpdates'
];

this.preferences.set('showedNetworkOptIn', true);
Expand All @@ -94,7 +103,8 @@ var NetworkOptInView = View.extend({
var metadata = {
'track usage stats': settings.trackUsageStatistics,
'product feedback': settings.enableFeedbackPanel,
'track errors': settings.trackErrors
'track errors': settings.trackErrors,
'auto updates': settings.autoUpdates
};
metrics.track('Network Opt-in', 'used', metadata);
},
Expand Down
3 changes: 0 additions & 3 deletions src/auto-update/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ var NotificationUpdateAvailable = View.extend({
'click a[data-hook=install-update]': 'installUpdate'
},
initialize: function() {
if (!app.isFeatureEnabled('autoUpdates')) {
return debug('autoUpdates feature flag off');
}
ipc.on('app:checking-for-update', function() {
debug('checking for update');
metrics.track('Auto Update', 'checking-for-update');
Expand Down