Skip to content
This repository has been archived by the owner on Oct 4, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
SimulatedGREG committed Mar 12, 2018
2 parents 7154db0 + 90d163f commit 1f7e397
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,8 @@ Take a look at some of the amazing projects built with electron-vue. Want to hav
* [**Opshell**](https://github.com/ricktbaker/opshell): Ops tool to make life easier working with AWS instances.
* [**GitHoard**](https://github.com/jojobyte/githoard): Hoard git repositories with ease.
* [**Data-curator**](https://github.com/ODIQueensland/data-curator): Share usable open data.
* [**Bookmark**](https://github.com/mrgodhani/bookmark): Desktop app to manage bookmarked links using Atom Electron and Vue.js
* [**Uber Run**](https://github.com/break-enter/uberrun): Simple automation desktop app to download and organize your tax invoices from Uber.
* [**Netsix**](https://github.com/pulsardev/netsix): Share videos with your friends in a real peer-to-peer manner using WebRTC.
* [**code-notes**](https://github.com/lauthieb/code-notes): A simple code snippet manager for developers built with Electron & Vue.js.
* [**Pomotroid**](https://github.com/Splode/pomotroid): A simple and visually-pleasing Pomodoro timer
10 changes: 5 additions & 5 deletions meta.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ module.exports = {
eslintConfig: {
when: 'eslint',
type: 'list',
message: 'Which eslint config would you like to use?',
message: 'Which ESLint config would you like to use?',
choices: [
{
name: 'Standard (https://github.com/feross/standard)',
value: 'standard',
short: 'Standard'
},
{
name: 'AirBNB (https://github.com/airbnb/javascript)',
name: 'Airbnb (https://github.com/airbnb/javascript)',
value: 'airbnb',
short: 'AirBNB'
short: 'Airbnb'
},
{
name: 'none (configure it yourself)',
Expand All @@ -94,12 +94,12 @@ module.exports = {
},
unit: {
type: 'confirm',
message: 'Setup unit testing with Karma + Mocha?',
message: 'Set up unit testing with Karma + Mocha?',
required: true
},
e2e: {
type: 'confirm',
message: 'Setup end-to-end testing with Spectron + Mocha?',
message: 'Set up end-to-end testing with Spectron + Mocha?',
require: true
},
builder: {
Expand Down

0 comments on commit 1f7e397

Please sign in to comment.