Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
LocoDelAssembly committed Jan 10, 2022
2 parents a732d85 + 8c1bcf4 commit 327e058
Show file tree
Hide file tree
Showing 36 changed files with 543 additions and 439 deletions.
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,26 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv

\-

## [0.22.6] - 2022-01-10

### Added
- Option to select all and quick tag in Filter image task [#2744]

### Changed
- Perform georeferences caching in background for faster DwC occurrences import [#2741]
- Permit use of Ruby 3.1
- Updated Ruby gems.
- DwC occurrences importer: When matching protonyms also consider their alternate gender names if there are no matches by exact name. [#2738]
- Allow import of specimens with empty `catalogNumber` even when `institutionCode` and/or `collectionCode` are set.

### Fixed
- Several batch loaders not working due to syntax incompatibility with currently used Ruby version. [#2739]

[#2739]: https://github.com/SpeciesFileGroup/taxonworks/pull/2739
[#2741]: https://github.com/SpeciesFileGroup/taxonworks/pull/2741
[#2738]: https://github.com/SpeciesFileGroup/taxonworks/issues/2738
[#2744]: https://github.com/SpeciesFileGroup/taxonworks/issues/2744

## [0.22.5] - 2021-12-22

### Fixed
Expand Down Expand Up @@ -2197,7 +2217,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.22.5...development
[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.6...development
[0.22.6]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.5...v0.22.6
[0.22.5]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.4...v0.22.5
[0.22.4]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.3...v0.22.4
[0.22.3]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.22.2...v0.22.3
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

gem 'rack-cors', '~> 1.1', require: 'rack/cors'

ruby '~> 3.0.0'
ruby '>= 3.0', '<= 3.1'

gem 'bundler', '~> 2.0'

Expand All @@ -26,6 +26,7 @@ gem 'psych', '~> 3.3'
gem 'rmagick', '~> 4.2', '>= 4.2.2'
gem 'roo', '~> 2.8', '>= 2.8.3'
gem 'roo-xls', '~> 1.2'
gem 'net-smtp', '~> 0.3.1'

# Geo
gem 'ffi-geos', '~> 2.2.0'
Expand Down
Loading

0 comments on commit 327e058

Please sign in to comment.