diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c4188c73d..23c1e3b1a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,18 @@ This project does not yet adheres to [Semantic Versioning](https://semv \- +## [0.12.11] - 2020-07-14 + +### Changed +- Type material designations are now grouped by collection object in Browse OTUs (refs [#1614]) + +### Fixed +- Protonym parent priority soft validation [#1613] +- Type specimens count in Browse OTUs task + +[#1613]: https://github.com/SpeciesFileGroup/taxonworks/issues/1613 +[#1614]: https://github.com/SpeciesFileGroup/taxonworks/issues/1614 + ## [0.12.10] - 2020-07-07 ### Added @@ -224,7 +236,8 @@ This project does not yet adheres to [Semantic Versioning](https://semv [#1532]: https://github.com/SpeciesFileGroup/taxonworks/issues/1532 -[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.10...development +[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.11...development +[0.12.11]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.10...v0.12.11 [0.12.10]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.9...v0.12.10 [0.12.9]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.8...v0.12.9 [0.12.8]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.12.7...v0.12.8 diff --git a/app/javascript/vue/routes/routes.js b/app/javascript/vue/routes/routes.js index 44a639c42e..a955d61ce0 100644 --- a/app/javascript/vue/routes/routes.js +++ b/app/javascript/vue/routes/routes.js @@ -7,7 +7,8 @@ const RouteNames = { ImageMatrix: '/tasks/matrix_image/matrix_image/index', MatrixRowCoder: '/tasks/observation_matrices/row_coder/index', BrowseNomenclature: '/tasks/nomenclature/browse', - NomenclatureStats: '/tasks/nomenclature/stats' + NomenclatureStats: '/tasks/nomenclature/stats', + TypeMaterial: '/tasks/type_material/edit_type_material' } export { diff --git a/app/javascript/vue/tasks/otu/browse/app.vue b/app/javascript/vue/tasks/otu/browse/app.vue index 3baa5e70cc..1f937bd386 100644 --- a/app/javascript/vue/tasks/otu/browse/app.vue +++ b/app/javascript/vue/tasks/otu/browse/app.vue @@ -91,8 +91,6 @@ import { GetterNames } from './store/getters/getters' import { MutationNames } from './store/mutations/mutations' import COMPONENT_NAMES from './const/componentNames' -import showForThisGroup from '../../nomenclature/new_taxon_name/helpers/showForThisGroup' - export default { components: { SearchOtu, @@ -207,5 +205,18 @@ export default { color: #888; font-size: 14px; } + .expand-box { + width: 18px; + height: 18px; + padding: 0px; + background-size: 10px; + background-position: center; + } + + .mark-box { + width: 10px; + height: 10px; + padding: 0px; + } } - \ No newline at end of file + diff --git a/app/javascript/vue/tasks/otu/browse/components/specimens/Information.vue b/app/javascript/vue/tasks/otu/browse/components/specimens/Information.vue index 1afbb26da1..81b0d333af 100644 --- a/app/javascript/vue/tasks/otu/browse/components/specimens/Information.vue +++ b/app/javascript/vue/tasks/otu/browse/components/specimens/Information.vue @@ -5,14 +5,14 @@ class="inline cursor-pointer">
{{ ceLabel }} () + class="expand-box button-default separate-right"/> {{ ceLabel }}
- Specimen | Edit + Specimen | Edit