[go: nahoru, domu]

Skip to content

Commit

Permalink
Remove UpdateChannelSection
Browse files Browse the repository at this point in the history
Use staging autoupdater for staging.

fixed failing test

Fix autoupdater – we were using the wrong command.

Revert "Bump version to 1.5.0"

Temporarily reverting this because I need to test the upgrade path from
0.4.2 => 1.5.0

Revert "Revert "Bump version to 1.5.0""

Had to do this to test the autoupdater.

[fix] [channel drop-down list] Show the stable channel in all cases.

Conflicts:
	internal_packages/preferences/lib/tabs/update-channel-section.jsx

Fix broken autoupdater, for reals.

[master] Replace "Nylas N1" by "Nylas Mail" in build scripts

Summary: As discussed --- we need to make those changes to make the autoupdater work across versions.

Test Plan: Will run a build.

Reviewers: evan

Reviewed By: evan

Differential Revision: https://phab.nylas.com/D3701

Revert "Revert "Revert "Bump version to 1.5.0"""

Need to set the version to 0.4.402 for testing purposes.

Set preferredChannel in the autoupdater instead of in the ChannelStore

It turns out that Squirrel checks for update at program launch. In some
cases, it would put Pro users on the "nylas-mail" channel because that's
the default channel if you don't pass a preferredChannel.

Conflicts:
	src/flux/stores/update-channel-store.es6

Set the autoupdater preferredChannel to stable.

Don't try to move the app file to the Application folder ourselves

Because of MacOS Gatekeeper path randomization issues
(Squirrel/Squirrel.Mac#182) we need the user
to move the app themselves. Changed the dialog to ask them to do this
politely.

Conflicts:
	internal_packages/verify-install-location/lib/main.es6
  • Loading branch information
khamidou authored and emorikawa committed Jan 16, 2017
1 parent 47296e9 commit 36cfccb
Showing 1 changed file with 0 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import fs from 'fs';
import ConfigSchemaItem from './config-schema-item';
import WorkspaceSection from './workspace-section';
import SendingSection from './sending-section';
import UpdateChannelSection from './update-channel-section';


class PreferencesGeneral extends React.Component {
static displayName = 'PreferencesGeneral'

Expand Down Expand Up @@ -84,8 +81,6 @@ class PreferencesGeneral extends React.Component {
config={this.props.config}
/>

<UpdateChannelSection />

<div className="local-data">
<h6>Local Data</h6>
<div className="btn" onClick={this._resetEmailCache}>Reset Email Cache</div>
Expand Down

0 comments on commit 36cfccb

Please sign in to comment.