Skip to content

Commit

Permalink
Merge pull request #64 from bepitulaz/fix/1.7.1
Browse files Browse the repository at this point in the history
Update JS dependencies.
  • Loading branch information
bepitulaz authored Jun 1, 2019
2 parents 5811c07 + c28ec09 commit 3f11cf4
Show file tree
Hide file tree
Showing 3 changed files with 232 additions and 166 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<img src="https://opencollective.com/tania/tiers/backer/badge.svg?label=backer&color=brightgreen" />
<img src="https://opencollective.com/tania/tiers/sponsor/badge.svg?label=sponsor&color=brightgreen" />
<a href="https://t.me/usetania"><img src="https://img.shields.io/badge/Telegram-blue.svg?logo=telegram&style=flat&label=chat%20on" alt="telegram"></a>
<img src="https://img.shields.io/badge/semver-1.7.0-green.svg?maxAge=2592000" alt="semver">
<img src="https://img.shields.io/badge/semver-1.7.1-green.svg?maxAge=2592000" alt="semver">
<a href="https://travis-ci.com/Tanibox/tania-core">
<img src="https://travis-ci.com/Tanibox/tania-core.svg?branch=master" alt="Build Status">
</a>
Expand All @@ -14,7 +14,7 @@

**Tania** is a free and open source farm management software. You can manage your farm areas, farm reservoirs, farm tasks, inventories, and the crop growing progress. It is designed for any type of farms.

Download Tania for Windows x64 and Linux x64 on [the release page](https://github.com/Tanibox/tania-core/releases/tag/1.7.0).
Download Tania for Windows x64 and Linux x64 on [the release page](https://github.com/Tanibox/tania-core/releases/tag/1.7.1).

![Screenshot](screenshot.PNG)

Expand Down Expand Up @@ -47,7 +47,7 @@ If your OS is not listed on our releases page, you have to build Tania for your

### Building Instructions
1. Clone the repo using `git clone https://github.com/Tanibox/tania-core.git`
2. Checkout the current stable version by using `git checkout tags/1.7.0 -b v1.7.0`
2. Checkout the current stable version by using `git checkout tags/1.7.1 -b v1.7.1`
3. From the project root, call `go get` to install the Go dependencies.
4. Create a new file `conf.json` using the values from the `conf.json.example` and set it with your own values.
5. Issue `npm install` to install Vue.js dependencies.
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@storybook/addon-viewport": "^5.0.6",
"@underdogio/mocha-webpack": "^2.0.0",
"acorn": "^6.0.5",
"axios": "^0.17.1",
"axios": "^0.19.0",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.0.5",
"babel-plugin-istanbul": "^5.1.0",
Expand Down Expand Up @@ -57,7 +57,7 @@
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"inject-loader": "^4.0.1",
"jquery": "^3.3.1",
"jquery": "^3.4.0",
"jsdom": "^11.5.1",
"jsdom-global": "^3.0.2",
"local-storage": "^1.4.2",
Expand All @@ -84,7 +84,7 @@
"vue-template-compiler": "^2.5.13",
"vue-webpack-gettext": "^0.3.1",
"webpack": "^4.29.0",
"webpack-bundle-analyzer": "^2.9.1",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.2.1",
"webpack-node-externals": "^1.6.0"
},
Expand Down
Loading

0 comments on commit 3f11cf4

Please sign in to comment.