fix: missing icons + updated versions

This commit is contained in:
NGPixel 2017-07-08 23:59:24 -04:00 committed by Nicolas Giard
parent 9231081624
commit 9d090ab392
5 changed files with 1354 additions and 18 deletions

View File

@ -1,6 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- '7' - '8'
branches: branches:
except: except:
- docker - docker
@ -18,11 +18,8 @@ env:
cache: yarn cache: yarn
before_script: before_script:
- yarn run build - yarn run build
- yarn global add snyk
- snyk auth $SNYK_TOKEN
before_deploy: before_deploy:
- tar -czf wiki-js.tar.gz * -X .build/.deployexclude - tar -czf wiki-js.tar.gz * -X .build/.deployexclude
- snyk monitor
deploy: deploy:
provider: releases provider: releases
api_key: api_key:
@ -35,7 +32,7 @@ deploy:
branch: master branch: master
repo: Requarks/wiki repo: Requarks/wiki
tags: true tags: true
node: '7' node: '8'
notifications: notifications:
webhooks: webhooks:
urls: urls:

View File

@ -209,7 +209,7 @@
this.$store.dispatch('editor/insert', textToInsert) this.$store.dispatch('editor/insert', textToInsert)
this.$store.dispatch('alert', { this.$store.dispatch('alert', {
style: 'blue', style: 'blue',
icon: 'paper', icon: 'ui-1_check-square-09',
msg: (this.mode === 'file') ? this.$t('editor.filesuccess') : this.$t('editor.imagesuccess') msg: (this.mode === 'file') ? this.$t('editor.filesuccess') : this.$t('editor.imagesuccess')
}) })
this.cancel() this.cancel()
@ -564,7 +564,7 @@
self.uploadSucceeded = true self.uploadSucceeded = true
self.$store.dispatch('alert', { self.$store.dispatch('alert', {
style: 'blue', style: 'blue',
icon: 'cloud-upload', icon: 'arrows-1_cloud-upload-96',
msg: self.$t('editor.fileuploadsuccess') msg: self.$t('editor.fileuploadsuccess')
}) })
} }

View File

@ -154,3 +154,14 @@ externalLogging:
rollbar: false rollbar: false
sentry: false sentry: false
# ---------------------------------------------------------------------
# Color Theme
# ---------------------------------------------------------------------
theme:
primary: indigo
alt: blue-grey
footer: blue-grey
code:
dark: true
colorize: true

1328
npm/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "wiki.js", "name": "wiki.js",
"version": "1.0.0-beta.12.13", "version": "1.0.0-beta.13.2",
"description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown", "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
"main": "install.js", "main": "install.js",
"scripts": { "scripts": {
@ -29,15 +29,15 @@
}, },
"homepage": "https://github.com/Requarks/wiki#readme", "homepage": "https://github.com/Requarks/wiki#readme",
"dependencies": { "dependencies": {
"bluebird": "^3.5.0", "bluebird": "~3.5.0",
"colors": "^1.1.2", "colors": "~1.1.2",
"execa": "^0.7.0", "execa": "~0.7.0",
"follow-redirects": "^1.2.3", "follow-redirects": "~1.2.4",
"fs-extra": "^3.0.1", "fs-extra": "~3.0.1",
"inquirer": "^3.1.0", "inquirer": "~3.1.1",
"lodash": "^4.17.4", "lodash": "~4.17.4",
"ora": "^1.2.0", "ora": "~1.3.0",
"pm2": "^2.5.0", "pm2": "~2.5.0",
"tar": "^3.1.5" "tar": "~3.1.5"
} }
} }