Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
LocoDelAssembly committed Nov 30, 2020
2 parents a0c0786 + fadf26f commit 11a7df9
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 92 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv

## [unreleased]

\-

## [0.15.0] - 2020-11-30

### Added
- Export project database task [#1868]
- Additional collecting methods recognized from the collecting event label
Expand Down Expand Up @@ -79,6 +83,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
- Autocomplete list style
- Edit button color on type material species task [#1898]
- GitHub Actions used as main CI/CD provider
- Updated vulnerable node packages [#1912]

[#1905]: https://github.com/SpeciesFileGroup/taxonworks/issues/1905
[#1662]: https://github.com/SpeciesFileGroup/taxonworks/issues/1662
Expand All @@ -101,6 +106,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
[#1897]: https://github.com/SpeciesFileGroup/taxonworks/issues/1897
[#1898]: https://github.com/SpeciesFileGroup/taxonworks/issues/1898
[#1899]: https://github.com/SpeciesFileGroup/taxonworks/issues/1899
[#1912]: https://github.com/SpeciesFileGroup/taxonworks/pull/1912

## [0.14.1] - 2020-10-22

Expand Down Expand Up @@ -694,7 +700,8 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv

[#1532]: https://github.com/SpeciesFileGroup/taxonworks/issues/1532

[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.14.1...development
[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.15.0...development
[0.15.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.14.1...v0.15.0
[0.14.1]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.14.0...v0.14.1
[0.14.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.13.0...v0.14.0
[0.13.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.17...v0.13.0
Expand Down
2 changes: 1 addition & 1 deletion lib/taxonworks/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Taxonworks
VERSION = "0.14.1"
VERSION = "0.15.0"
end
114 changes: 30 additions & 84 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,8 @@
"webpack-cli": "^3.3.12"
},
"devDependencies": {
"stylus": "^0.54.8",
"stylus-loader": "^4.1.1",
"resolve-url-loader": "^3.1.1",
"vue-loader": "^15.9.3",
"vue-template-compiler": "^2.6.12",
"babel-preset-stage-0": "^6.24.1",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-preset-stage-0": "^6.24.1",
"eslint": "^7.11.0",
"eslint-config-standard": "^14.1.1",
"eslint-plugin-import": "^2.22.1",
Expand All @@ -37,6 +32,11 @@
"eslint-plugin-vue": "^7.1.0",
"increase-memory-limit": "^1.0.7",
"raw-loader": "^4.0.2",
"resolve-url-loader": "^3.1.2",
"stylus": "^0.54.8",
"stylus-loader": "^4.1.1",
"vue-loader": "^15.9.3",
"vue-template-compiler": "^2.6.12",
"webpack-dev-server": "^3.11.0"
},
"scripts": {
Expand Down

0 comments on commit 11a7df9

Please sign in to comment.