Skip to content

Commit

Permalink
chore(release): 1.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
MathieuNls committed May 19, 2017
1 parent f9ecb94 commit 121a5f3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="toolwatch.toolwatch" version="1.3.7" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="toolwatch.toolwatch" version="1.3.9" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Toolwatch - Watch accuracy app</name>
<description>Measure and track the accuracy of your mechanical watches. Toolwatch is a free watch accuracy app trusted by the watchmaking industry's leaders and 15 000+ monthly users. Is your watch accurate? Should it be serviced? How does it compare versus other watches? Find out now by measuring the accuracy of your watch!</description>
<author email="[email protected]" href="https://toolwatch.io/">Mathieu Nayrolles</author>
Expand Down
5 changes: 2 additions & 3 deletions ionic.config.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"name": "Toolwatch",
"app_id": "7d78873d",
"v2": true,
"typescript": true,
"proxies": [
{
"path": "/api/",
"proxyUrl": "https://toolwatch.io/api/"
}
]
],
"type": "ionic-angular"
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "toolwatch-mobile",
"author": "Mathieu Nayrolles",
"homepage": "https://toolwatch.io/",
"version": "1.3.7",
"version": "1.3.9",
"private": true,
"scripts": {
"build": "npm run assets && ionic-app-scripts build",
Expand Down Expand Up @@ -51,6 +51,7 @@
},
"devDependencies": {
"@ionic/app-scripts": "1.3.7",
"@ionic/cli-plugin-cordova": "1.1.2",
"@ionic/cli-plugin-ionic-angular": "1.0.0",
"@types/jasmine": "^2.5.41",
"@types/node": "^7.0.8",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function HttpLoaderFactory(http: Http) {
}

export function ConfigurationFactory() {
return configurationProvider("https://toolwatch.io/api/", "b");
return configurationProvider("https://toolwatch.io/api/", "./assets/");
}

export class MyMissingTranslationHandler implements MissingTranslationHandler {
Expand Down
5 changes: 3 additions & 2 deletions src/pages/login/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ export class LogInPage extends LoginComponent {
onSignup() {

this.nav.push('SignupPage', {
email: this.loginForm.controls["email"].value,
password: this.loginForm.controls["password"].value
email: this.loginForm.controls["email"].value,
password: this.loginForm.controls["password"].value
});
}

Expand All @@ -159,6 +159,7 @@ export class LogInPage extends LoginComponent {
* @param {boolean} attempt
*/
private onLoggingAttempt(attempt: boolean) {

if (attempt === true) {
/**
* We can't present a loader twice. Seams like dismiss() destroys it.
Expand Down

0 comments on commit 121a5f3

Please sign in to comment.