Commit 8c17e7e

committed

Merge branch 'dependabot/npm_and_yarn/electron-7.2.4' of github.com:halfrost/vue-objccn into dependabot/npm_and_yarn/electron-7.2.4

2 parents 70fb01b + 6b78c7b commit 8c17e7eCopy full SHA for 8c17e7e

File tree

+2073

-2055

lines changed

+2073

-2055

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,14 @@`
`10`	`10`	`<a href="https://github.com/halfrost/vue-objccn/pulls"><img src="https://img.shields.io/badge/PR-Welcome-brightgreen.svg"></a>`
`11`	`11`	`<a href="http://weibo.com/halfrost"><img src="https://img.shields.io/badge/weibo-@halfrost-red.svg?style=flat"></a>`
`12`	`12`	`<img src="https://img.shields.io/badge/made%20with-%3C3-red.svg">`
	`13`	`+<img src="https://visitor-badge.laobi.icu/badge?page_id=halfrost.vue-objccn">`
`13`	`14`	`</p>`
`14`	`15`
`15`	`16`	`Use Vue.js to develop a cross-platform full stack application of [Objc china](https://objccn.io/).`
`16`	`17`
`17`	`18`	`- [x] ✅ Desktop application available for three platforms, Mac, Linux and Windows`
`18`	`19`	`- [x] ✅ Web application supports desktop browsers and mobile browsers`
`19`		`-- [x] ✅ Mobile App which uses the Cordova framework, supports iOS,Androi,Windows Phone and BlackBerry platforms`
	`20`	`+- [x] ✅ Mobile App which uses the Cordova framework, supports iOS, Android, Windows Phone and BlackBerry platforms`
`20`	`21`	`- [ ] ❌ Native Mobile App, which can use Weex framework to support both iOS and Android`
`21`	`22`
`22`	`23`	`> Note: This project is just a bit of fun and purely for learning purpose, please support [喵神(@onevcat)](https://github.com/onevcat) and [Objc china](https://objccn.io/).`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`<a href="https://github.com/halfrost/vue-objccn/pulls"><img src="https://img.shields.io/badge/PR-Welcome-brightgreen.svg"></a>`
`11`	`11`	`<a href="http://weibo.com/halfrost"><img src="https://img.shields.io/badge/weibo-@halfrost-red.svg?style=flat"></a>`
`12`	`12`	`<img src="https://img.shields.io/badge/made%20with-%3C3-red.svg">`
	`13`	`+<img src="https://visitor-badge.laobi.icu/badge?page_id=halfrost.vue-objccn">`
`13`	`14`	`</p>`
`14`	`15`
`15`	`16`	`利用 Vue.js 实现 [Objc中国](https://objccn.io/) 的跨平台全栈应用`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ module.exports = {`
`44`	`44`	`{`
`45`	`45`	`test: /\.js$/,`
`46`	`46`	`loader: 'babel-loader',`
`47`		`- include: [resolve('src'), resolve('test')]`
	`47`	`+ include: [resolve('src'), resolve('test'),resolve('node_modules/markdown-it-highlightjs/index.js'),]`
`48`	`48`	`},`
`49`	`49`	`{`
`50`	`50`	`test: /\.(png\|jpe?g\|gif\|svg)(\?.*)?$/,`

Comments

(0)