Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@LocoDelAssembly
LocoDelAssembly committed Aug 1, 2024
2 parents 5f28ed1 + aeae405 commit 6b8278b
Show file tree
Hide file tree
Showing 89 changed files with 2,471 additions and 1,804 deletions.
44 changes: 43 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,50 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv

\-

## [0.43.0] - 2024-07-31

### Added

- Task to add image and as depictions to the objects identified in their filename [#3986]
- PDF version of styled/formatted source download [#3996]
- Type checking pattern for integers sent to `*_id` params in the API
- Radial annotator: Pagination to depictions slice
- Comprehensive: Pagination to depictions panel
- Browse collection objects Pagination to depictions panel
- Filter source: add ID to list [#3984]
- TW_DISABLE_DEPLOY_UPDATE_DATABASE env var to disable DB backup and migration at deploy time.

### Changed

- `repositories/autocomplete` label [#3981]
- Updated Ruby gems

### Fixed

- TaxonName filter Original combination with/out facet (both with and without)
- Removed deprecated GoogleMap georeference form [#3991]
- Print label generation [#3992]
- Generating a TaxonWorks Download for a bibtex result failing [#3997]
- Removed bad foreign-key constraint on BiocurationClassifications, TaxonDeterminations
- Content autocomplete not scoped to projects
- Some hotkeys don't work on Firefox on Linux [#3988]
- Cancel previous autocomplete requests [#3982]

[#3984]: https://github.com/SpeciesFileGroup/taxonworks/issues/3984
[#3991]: https://github.com/SpeciesFileGroup/taxonworks/issues/3991
[#3981]: https://github.com/SpeciesFileGroup/taxonworks/issues/3981
[#3982]: https://github.com/SpeciesFileGroup/taxonworks/issues/3982
[#3986]: https://github.com/SpeciesFileGroup/taxonworks/issues/3986
[#3988]: https://github.com/SpeciesFileGroup/taxonworks/issues/3988
[#3992]: https://github.com/SpeciesFileGroup/taxonworks/issues/3992
[#3996]: https://github.com/SpeciesFileGroup/taxonworks/issues/3996
[#3997]: https://github.com/SpeciesFileGroup/taxonworks/issues/3997

## [0.42.0] - 2024-06-28

### Added

- Nexus file import [#2029]
- POST `/annotations/move?from_global_id=<>&to_global_id=<>&only[]=&except[]=`
- Clone CollectingEvent can include annotations, incremented identifiers
- Model Identifier::Local::Event in part: [#3800]
Expand Down Expand Up @@ -56,6 +96,7 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv
- Updated Ruby gems
- Georeference `error_radius` rounded to nearest meter before save [#3946]

[#2029]: https://github.com/SpeciesFileGroup/taxonworks/issues/2029
[#3800]: https://github.com/SpeciesFileGroup/taxonworks/issues/3800
[#3819]: https://github.com/SpeciesFileGroup/taxonworks/pull/3819/
[#3837]: https://github.com/SpeciesFileGroup/taxonworks/pull/3837/
Expand Down Expand Up @@ -4671,7 +4712,8 @@ _Special thanks to Tom Klein for his amazing open-source contributions on this r
- Loosing input page numbers when switching tabs on New Taxon Name task

[#1532]: https://github.com/SpeciesFileGroup/taxonworks/issues/1532
[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.42.0..development
[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.43.0..development
[0.43.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.42.0...v0.43.0
[0.42.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.41.1...v0.42.0
[0.41.1]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.41.0...v0.41.1
[0.41.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.40.6...v0.41.0
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem 'zip_tricks', '~> 5.6'
gem 'daemons', '~> 1.4.1'
gem 'tzinfo-data', '~> 1.2019' # , '>= 1.2019.3'
gem 'psych', '~> 5.1'
gem 'rmagick', '~> 5.1' # , '>= 4.2.2'
gem 'rmagick', '~> 6.0'
gem 'roo', '~> 2.8', '>= 2.8.3'
gem 'roo-xls', '~> 1.2'

Expand Down Expand Up @@ -100,12 +100,12 @@ gem 'terser', '~> 1.2'

gem 'jquery-rails', '~> 4.4'
# gem 'jquery-ui-rails', '~> 6.0.1'
gem "jquery-ui-rails", :git => 'https://github.com/jquery-ui-rails/jquery-ui-rails.git'
gem 'jquery-ui-rails', git: 'https://github.com/jquery-ui-rails/jquery-ui-rails.git'
gem 'rails-jquery-autocomplete', '~> 1.0.3'

gem 'turbolinks', '~> 5.2.0'
gem 'jquery-turbolinks', '~> 2.1'
gem 'shakapacker', '8.0.0'
gem 'shakapacker', '8.0.1'

# BibTeX handling
gem 'csl', '~> 2.0'
Expand Down Expand Up @@ -134,7 +134,7 @@ gem 'ruby-graphviz', '~> 1.2.5', require: false

# "Bio" and SFG gems
gem 'taxonifi', '~> 0.6.0'
gem 'sqed', '~>0.8.1'
gem 'sqed', '~>0.8.3'
gem 'dwc_agent', '~> 3.0'
gem 'dwc-archive', github: 'LocoDelAssembly/dwc-archive', branch: 'overhaul', require: 'dwc_archive' # '~> 1.1', '>= 1.1.2'
gem 'biodiversity', github: 'GlobalNamesArchitecture/biodiversity', branch: 'pipe_approach' # '~> 5.1', '>= 5.1.1'
Expand Down Expand Up @@ -179,7 +179,7 @@ group :test, :development do
gem 'byebug', '~> 11.1', {}.merge(ENV['RM_INFO'] ? {require: false} : {})
gem 'factory_bot_rails', '~> 6.2'
gem 'selenium-webdriver', '~> 4.6', '>= 4.6.1'
gem 'prawn', '~> 2.4.0'
gem 'prawn', '~> 2.5.0'
gem 'puma', '~> 6.3'
end

Expand Down
78 changes: 41 additions & 37 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ GEM
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
acts_as_list (1.2.1)
acts_as_list (1.2.2)
activerecord (>= 6.1)
activesupport (>= 6.1)
addressable (2.8.7)
Expand Down Expand Up @@ -240,7 +240,7 @@ GEM
daemons (1.4.1)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.1.0)
database_cleaner-active_record (2.2.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
Expand All @@ -257,24 +257,25 @@ GEM
drb (2.2.1)
dropzonejs-rails (0.8.5)
rails (> 3.1)
dwc_agent (3.1.2.0)
dwc_agent (3.1.4.0)
namae (~> 1)
namecase (~> 2)
erubi (1.13.0)
exception_notification (4.5.0)
actionmailer (>= 5.2, < 8)
activesupport (>= 5.2, < 8)
excon (0.110.0)
excon (0.111.0)
execjs (2.8.1)
factory_bot (6.4.6)
activesupport (>= 5.0.0)
factory_bot_rails (6.4.3)
factory_bot (~> 6.4)
railties (>= 5.0.0)
faker (3.4.1)
faker (3.4.2)
i18n (>= 1.8.11, < 2)
faraday (2.9.2)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
logger
faraday-excon (2.1.0)
excon (>= 0.27.4)
faraday (~> 2.0)
Expand Down Expand Up @@ -323,7 +324,7 @@ GEM
indefinite_article (0.2.5)
activesupport
io-console (0.7.2)
irb (1.13.2)
irb (1.14.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jbuilder (2.12.0)
Expand Down Expand Up @@ -380,9 +381,9 @@ GEM
method_source (1.1.0)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0604)
mime-types-data (3.2024.0702)
mini_mime (1.1.5)
minitest (5.24.0)
minitest (5.24.1)
modularity (3.0.1)
msgpack (1.7.2)
multi_json (1.15.0)
Expand Down Expand Up @@ -427,14 +428,14 @@ GEM
parallel (1.25.1)
parallel_tests (4.7.1)
parallel
parser (3.3.3.0)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
parslet (2.0.0)
passenger (6.0.22)
rack
rake (>= 0.8.1)
pdf-core (0.9.0)
pdf-core (0.10.0)
pdf-reader (2.12.0)
Ascii85 (~> 1.0)
afm (~> 0.2.1)
Expand All @@ -446,15 +447,16 @@ GEM
polyglot (0.3.5)
postgresql_cursor (0.6.9)
activerecord (>= 6.0)
prawn (2.4.0)
pdf-core (~> 0.9.0)
ttfunk (~> 1.7)
prawn (2.5.0)
matrix (~> 0.4)
pdf-core (~> 0.10.0)
ttfunk (~> 1.8)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
psych (5.1.2)
stringio
public_suffix (6.0.0)
public_suffix (6.0.1)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
Expand Down Expand Up @@ -512,8 +514,9 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdf (3.3.1)
rdf (3.3.2)
bcp47_spec (~> 0.2)
bigdecimal (~> 3.1, >= 3.1.5)
link_header (~> 0.0, >= 0.0.8)
rdoc (6.7.0)
psych (>= 4.0.0)
Expand All @@ -533,18 +536,19 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.1)
rexml (3.3.2)
strscan
rgb (0.1.2)
rgeo (3.0.1)
rgeo-activerecord (7.0.1)
activerecord (>= 5.0)
rgeo (>= 1.0.0)
rgeo-geojson (2.1.1)
rgeo-geojson (2.2.0)
multi_json (~> 1.15)
rgeo (>= 1.0.0)
rgeo-proj4 (4.0.0)
rgeo (~> 3.0.0)
rmagick (5.5.0)
rmagick (6.0.1)
observer (~> 0.1)
pkg-config (~> 1.4)
roo (2.10.1)
Expand Down Expand Up @@ -582,13 +586,13 @@ GEM
rspec-support (~> 3.13)
rspec-support (3.13.1)
rtesseract (3.1.3)
rubocop (1.64.1)
rubocop (1.65.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
Expand All @@ -605,7 +609,7 @@ GEM
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rails (2.25.0)
rubocop-rails (2.25.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
Expand Down Expand Up @@ -637,14 +641,14 @@ GEM
rdoc (>= 5.0)
seedbank (0.5.0)
rake (>= 10.0)
selenium-webdriver (4.22.0)
selenium-webdriver (4.23.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semantic_range (3.0.0)
shakapacker (8.0.0)
shakapacker (8.0.1)
activesupport (>= 5.2)
package_json
rack-proxy (>= 0.6.1)
Expand Down Expand Up @@ -676,9 +680,9 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqed (0.8.2)
sqed (0.8.3)
rake (~> 13.0)
rmagick (~> 5.2)
rmagick (~> 6.0)
rtesseract (~> 3.1)
stringio (3.1.1)
strscan (3.1.0)
Expand All @@ -689,11 +693,11 @@ GEM
terser (1.2.3)
execjs (>= 0.3.0, < 3)
thor (1.2.2)
thruster (0.1.4)
thruster (0.1.4-aarch64-linux)
thruster (0.1.4-arm64-darwin)
thruster (0.1.4-x86_64-darwin)
thruster (0.1.4-x86_64-linux)
thruster (0.1.7)
thruster (0.1.7-aarch64-linux)
thruster (0.1.7-arm64-darwin)
thruster (0.1.7-x86_64-darwin)
thruster (0.1.7-x86_64-linux)
tilt (2.4.0)
timecop (0.9.10)
timeliness (0.4.5)
Expand Down Expand Up @@ -727,7 +731,7 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket (1.2.10)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -822,7 +826,7 @@ DEPENDENCIES
pdf-reader (~> 2.2)
pg (~> 1.1)
postgresql_cursor (~> 0.6.1)
prawn (~> 2.4.0)
prawn (~> 2.5.0)
psych (~> 5.1)
puma (~> 6.3)
rack-cors (~> 2.0)
Expand All @@ -840,7 +844,7 @@ DEPENDENCIES
rgeo (~> 3.0)
rgeo-geojson (~> 2.1, >= 2.1.1)
rgeo-proj4 (~> 4.0)
rmagick (~> 5.1)
rmagick (~> 6.0)
roo (~> 2.8, >= 2.8.3)
roo-xls (~> 1.2)
rqrcode!
Expand All @@ -862,14 +866,14 @@ DEPENDENCIES
seedbank (~> 0.5.0)
selenium-webdriver (~> 4.6, >= 4.6.1)
serrano!
shakapacker (= 8.0.0)
shakapacker (= 8.0.1)
shortener (~> 1.0)
simplecov
spring-commands-rspec (~> 1.0.4)
sprockets (~> 4.2)
sprockets-es6 (~> 0.9.2)
sprockets-rails (~> 3.4.0)
sqed (~> 0.8.1)
sqed (~> 0.8.3)
taxonifi (~> 0.6.0)
terser (~> 1.2)
thor (~> 1.2)
Expand All @@ -891,4 +895,4 @@ RUBY VERSION
ruby 3.3.0p0

BUNDLED WITH
2.5.4
2.5.11
Loading

0 comments on commit 6b8278b

Please sign in to comment.