MERGE

2017-05-19 16:02:21 +02:00 · 2017-05-19 16:02:21 +02:00 · b30117ce6c
commit b30117ce6c
parent 373d9b2b2a 78b63daa37
47 changed files with 1 additions and 9 deletions
--- a/.babelrc
+++ b/.babelrc
--- a/.editorconfig
+++ b/.editorconfig
--- a/.eslintignore
+++ b/.eslintignore
--- a/.eslintrc.js
+++ b/.eslintrc.js
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,4 @@ yarn-error.log*
 test/unit/coverage
 test/e2e/reports
 selenium-debug.log
 firefox_root/
--- a/.postcssrc.js
+++ b/.postcssrc.js
--- a/README.md
+++ b/README.md
@ -26,5 +26,3 @@ npm run e2e
 # run all tests
 npm test
 ```
 For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
--- a/build/build.js
+++ b/build/build.js
--- a/build/check-versions.js
+++ b/build/check-versions.js
--- a/build/dev-client.js
+++ b/build/dev-client.js
--- a/build/dev-server.js
+++ b/build/dev-server.js
--- a/build/utils.js
+++ b/build/utils.js
--- a/build/vue-loader.conf.js
+++ b/build/vue-loader.conf.js
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
--- a/build/webpack.dev.conf.js
+++ b/build/webpack.dev.conf.js
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
--- a/build/webpack.test.conf.js
+++ b/build/webpack.test.conf.js
--- a/config/dev.env.js
+++ b/config/dev.env.js
--- a/config/index.js
+++ b/config/index.js
--- a/config/prod.env.js
+++ b/config/prod.env.js
--- a/config/test.env.js
+++ b/config/test.env.js
--- a/firefox_root/.parentlock
+++ b/firefox_root/.parentlock
--- a/index.html
+++ b/index.html
--- a/old/TODO.md
+++ b/old/TODO.md
@ -1,7 +0,0 @@
 # TODO
 - pdf's have black borders at right and bottom
 - tutorial for new fonts does not work
 - move `person.js` to main-folder
--- a/old/pdf/resume-material-dark.pdf
+++ b/old/pdf/resume-material-dark.pdf
--- a/old/public/preview/resume-material-blue.png
+++ b/old/public/preview/resume-material-blue.png
--- a/old/public/preview/resume-material-dark.png
+++ b/old/public/preview/resume-material-dark.png
--- a/old/public/styles/resume-material-blue0.min.css
+++ b/old/public/styles/resume-material-blue0.min.css
--- a/old/public/styles/resume-material-dark.min.css
+++ b/old/public/styles/resume-material-dark.min.css
--- a/old/public/styles/resume-material-violet.min.css
+++ b/old/public/styles/resume-material-violet.min.css
--- a/old/resumes/resume-material-dark/index.mustache
+++ b/old/resumes/resume-material-dark/index.mustache
--- a/old/resumes/resume-material-dark/style.less
+++ b/old/resumes/resume-material-dark/style.less
--- a/package.json
+++ b/package.json
--- a/src/App.vue
+++ b/src/App.vue
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/components/Hello.vue
+++ b/src/components/Hello.vue
--- a/src/main.js
+++ b/src/main.js
--- a/src/router/index.js
+++ b/src/router/index.js
--- a/static/.gitkeep
+++ b/static/.gitkeep
--- a/test/e2e/custom-assertions/elementCount.js
+++ b/test/e2e/custom-assertions/elementCount.js
--- a/test/e2e/nightwatch.conf.js
+++ b/test/e2e/nightwatch.conf.js
--- a/test/e2e/runner.js
+++ b/test/e2e/runner.js
--- a/test/e2e/specs/test.js
+++ b/test/e2e/specs/test.js
--- a/test/unit/.eslintrc
+++ b/test/unit/.eslintrc
--- a/test/unit/index.js
+++ b/test/unit/index.js
--- a/test/unit/karma.conf.js
+++ b/test/unit/karma.conf.js
--- a/test/unit/specs/Hello.spec.js
+++ b/test/unit/specs/Hello.spec.js