Skip to content

Commit cea2217

Browse files
committed
disable "local store" feature toggle and bump 2.0.0-beta.6
1 parent f12a281 commit cea2217

File tree

8 files changed

+8
-14
lines changed

8 files changed

+8
-14
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
branches:
44
only:
55
- master
6+
- 2.0.0
67
language: node_js
78
node_js: 10
89
addons:

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
branches:
44
only:
55
- master
6+
- 2.0.0
67
skip_tags: true
78
os: unstable
89
platform:

electron-builder.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ artifactName: ${name}-${version}-${os}-${arch}.${ext}
33

44
publish: {provider: github, releaseType: draft, vPrefixedTagName: true}
55
forceCodeSigning: false
6+
generateUpdatesFilesForAllChannels: true
67

78
# TODO consider moving fully bundable "dependencies" to "devDependencies" to reduce final package size
89

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "email-securely-app",
33
"description": "Unofficial desktop app for E2E encrypted email providers",
4-
"version": "1.5.5",
4+
"version": "2.0.0-beta.6",
55
"author": "Vladimir Yakovlev <[email protected]>",
66
"license": "MIT",
77
"homepage": "https://github.com/vladimiry/email-securely-app",

src/electron-main/app-update.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import logger from "electron-log";
22
import {autoUpdater} from "electron-updater";
33

44
export function initAutoUpdate() {
5+
autoUpdater.channel = "beta";
6+
autoUpdater.allowDowngrade = false;
57
autoUpdater.logger = logger;
68
autoUpdater.checkForUpdatesAndNotify();
79
}

src/web/src/app/_accounts/account.component.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {ACCOUNTS_ACTIONS, NAVIGATION_ACTIONS} from "src/web/src/app/store/action
2323
import {APP_NAME, ONE_SECOND_MS} from "src/shared/constants";
2424
import {AccountConfig} from "src/shared/model/account";
2525
import {AccountsSelectors, OptionsSelectors} from "src/web/src/app/store/selectors";
26-
import {BuildEnvironment} from "src/shared/model/common";
2726
import {DbViewModuleResolve} from "./db-view-module-resolve.service";
2827
import {IPC_MAIN_API_NOTIFICATION_ACTIONS} from "src/shared/api/main";
2928
import {NgChangesObservableComponent} from "src/web/src/app/components/ng-changes-observable.component";
@@ -270,10 +269,6 @@ export class AccountComponent extends NgChangesObservableComponent implements On
270269
})),
271270
);
272271

273-
if ((process.env.NODE_ENV as BuildEnvironment) !== "development") {
274-
return;
275-
}
276-
277272
this.domReadySubscription.add(
278273
((state: { stopSyncingDeferred?: Deferred<void> } = {}) => {
279274
return this.account$

src/web/src/app/_options/account-edit.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<span *ngIf="account; else label">{{ account.login }}</span>
77
<ng-template #label>Add Account</ng-template>
88
</div>
9-
<div class="form-check float-md-right" *ngIf="typeControlDisplayable && controls.type.value == 'tutanota'">
9+
<div class="form-check float-md-right">
1010
<label class="form-check-label">
1111
<input type="checkbox" class="form-check-input" formControlName="database">
1212
Local store

src/web/src/app/_options/account-edit.component.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ export class AccountEditComponent implements OnInit, OnDestroy {
3636
mailPassword: new FormControl(null),
3737
};
3838
form = new FormGroup(this.controls);
39-
// TODO release: remove temporary "typeControlDisplayable" property
40-
typeControlDisplayable: boolean = false;
4139
// account
4240
account?: AccountConfig;
4341
account$: Observable<AccountConfig> = merge(this.activatedRoute.params, this.activatedRoute.queryParams).pipe(
@@ -61,11 +59,7 @@ export class AccountEditComponent implements OnInit, OnDestroy {
6159

6260
constructor(private optionsService: OptionsService,
6361
private store: Store<State>,
64-
private activatedRoute: ActivatedRoute) {
65-
if ((process.env.NODE_ENV/* as BuildEnvironment*/) === "development") {
66-
this.typeControlDisplayable = true;
67-
}
68-
}
62+
private activatedRoute: ActivatedRoute) {}
6963

7064
ngOnInit() {
7165
const {controls} = this;

0 commit comments

Comments
 (0)