Merge remote-tracking branch 'origin/v3' into v3
# Conflicts: # app/app-detail.component.html # app/install.service.ts
Showing
{ | { | ||
"name": "mycard", | "name": "mycard", | ||
"version": "3.0.0-dev.10", | "version": "3.0.0-dev.12", | ||
"description": "mycard", | "description": "mycard", | ||
"keywords": [], | "keywords": [], | ||
"author": "zh99998 <zh99998@gmail.com>", | "author": "zh99998 <zh99998@gmail.com>", | ||
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
"pack": "tsc && build --dir", | "pack": "tsc && build --dir", | ||
"dist": "tsc && build", | "dist": "tsc && build", | ||
"tsc": "tsc", | "tsc": "tsc", | ||
"i18n": "ng-xi18n" | "i18n": "ng-xi18n && sed -i.bak 's/source-language=\"en\"/source-language=\"zh-CN\"/' messages.xlf" | ||
}, | }, | ||
"dependencies": { | "dependencies": { | ||
"@angular/common": "latest", | "@angular/common": "latest", | ||
... | @@ -24,22 +24,24 @@ | ... | @@ -24,22 +24,24 @@ |
"@angular/platform-browser-dynamic": "latest", | "@angular/platform-browser-dynamic": "latest", | ||
"@angular/router": "latest", | "@angular/router": "latest", | ||
"angular-in-memory-web-api": "latest", | "angular-in-memory-web-api": "latest", | ||
"systemjs": "latest", | "aria2": "latest", | ||
"bootstrap": "next", | |||
"core-js": "latest", | "core-js": "latest", | ||
"reflect-metadata": "latest", | |||
"rxjs": "5.0.0-beta.12", | |||
"zone.js": "^0.6.26", | |||
"electron-auto-updater": "latest", | "electron-auto-updater": "latest", | ||
"electron-cookies": "latest", | "electron-cookies": "latest", | ||
"electron-is-dev": "latest", | |||
"electron-sudo": "mycard/electron-sudo#mycard", | "electron-sudo": "mycard/electron-sudo#mycard", | ||
"jquery": "latest", | |||
"tether": "latest", | |||
"bootstrap": "next", | |||
"font-awesome": "latest", | "font-awesome": "latest", | ||
"aria2": "latest", | |||
"ini": "latest", | "ini": "latest", | ||
"jquery": "latest", | |||
"mkdirp": "latest", | "mkdirp": "latest", | ||
"raw-socket": "latest" | "raw-socket": "latest", | ||
"reflect-metadata": "latest", | |||
"rxjs": "5.0.0-beta.12", | |||
"systemjs": "mycard/systemjs#mycard", | |||
"systemjs-plugin-text": "latest", | |||
"tether": "latest", | |||
"zone.js": "^0.6.26" | |||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
"@angular/compiler-cli": "latest", | "@angular/compiler-cli": "latest", | ||
... | @@ -75,6 +77,7 @@ | ... | @@ -75,6 +77,7 @@ |
] | ] | ||
}, | }, | ||
"dmg": { | "dmg": { | ||
"format": "ULFO", | |||
"contents": [ | "contents": [ | ||
{ | { | ||
"x": 448, | "x": 448, | ||
... | ... |
Please register or sign in to comment