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 26, 2021
2 parents e12cc07 + 8b99f28 commit 86f9cd5
Show file tree
Hide file tree
Showing 247 changed files with 7,656 additions and 1,919 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ on:

jobs:
build:
if: "!(contains(github.event.head_commit.message, '[ci skip]') || contains(github.event.head_commit.message, '[skip ci]'))"
if: |
!(
contains(github.event.head_commit.message, '[ci skip]') ||
contains(github.event.head_commit.message, '[ci-skip]') ||
contains(github.event.head_commit.message, '[skip ci]') ||
contains(github.event.head_commit.message, '[skip-ci]')
)
env:
PGHOST: 127.0.0.1
PGUSER: postgres
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/deliver.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ on:

jobs:
deliver:
if: "!(contains(github.event.head_commit.message, '[ci skip]') || contains(github.event.head_commit.message, '[skip ci]'))"
if: |
!(
contains(github.event.head_commit.message, '[ci skip]') ||
contains(github.event.head_commit.message, '[ci-skip]') ||
contains(github.event.head_commit.message, '[skip ci]') ||
contains(github.event.head_commit.message, '[skip-ci]')
)
env:
REF_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
CACHE_PATH: ".github/.docker-cache"
Expand Down
86 changes: 85 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,91 @@ This project <em>does not yet</em> adheres to [Semantic Versioning](https://semv

\-

## [0.16.0] - 2021-01-25
### Added
- New collecting event task [#1530]
- "Quick" collection objects options from new collecting event task
- New WKT georeference inputs
- Auto-georeference and date Collecting Events by depicting images with pertinent EXIF data
- Route linting specs
- Generate label (alpha), pastes values into print label input
- Collecting event navigation options (next/previous with/out <many things>
- Nested_attributes for Labels
- Collection object/and collecting event navigation options/bridges
- `/collecting_events/preview?<filter_params>` a preview look for brief tables
- Subclasses for labels:`Label::QrCode`, `Label::Code128`
- Include `rqrcode`, `barby` for barcode rendering
- Add `label` attribute to Label JSON response that renders QR code
- Add accommodation for printing pages of barcode-based labels
- Add `Georeference::Wkt` an anonymous WKT based georeference assertion
- Add option to disable name-casing when Person is created from `/people/new` [#1967]
- Full CASTOR (taxon names batch load) example template, CASTOR preview notices
- New ICZN class added: NoDiagnosisAfter1930AndRejectedBefore2000 for family-group names
- Add image attributions, original citation and editor options in image viewer [#1978]
- Browse current OTU button in Browse OTU

### Changed
- Moved buttons in collecting event on comprehensive task [#1986]
- Improved collecting event status in smart selector on comprehensive digitization
- Some tasks route names were "malformed" and renamed
- ENV variable`TAXONWORKS_TEST_LINTING=true` must now be `true`, not anything, to trigger linting specs
- Setting `Identifier#cached` uses a build getter to enable Label building
- Georeference validation requires CollectingEvent (enabled by proper use of `:inverse_of`)
- Tweak to how `pinned?` is calculated trying to eliminate database calls
- Minor cleanup of batch preview layouts
- Changed softvalidation message for names being on Official ICZN lists
- Fetch codecov, seedback and closure_tree gems from RubyGems.
- Updated gems (`bundle update` without altering `Gemfile`).
- Remove `no_leaves`= true from taxon name on filter images task [#1953]
- Turn off autocomplete feature on vue autocomplete [#1956]
- Limited CoLDP exports runtime to 1 hour and 2 attemps.
- Turn off autocomplete on new taxon name task
- Replaced display name attribute for object_label in parent autocomplete on New taxon name task
- Filter task by name only [#1962]
- Search geographic area by verbatim coordinates on new collecting event
- Show coordinates from verbatim georeference
- Parsed verbatim label to fields
- Parsed EXIF coordinates to verbatim fields
- Changed autocomplete label [#1988]
- Using newer biodiversity gem from official source
- Updated gems (`bundle update` without altering `Gemfile`)

### Fixed
- Loan items reference proper housekeeping in table
- Line links of batch-preview results
- broken API download link for exported references [#1908]
- removed BASIS task stub [#1716]
- `/api/v1/notes` project scoping [#1958]
- `is_community?` reporting `false` for some models without `project_id`
- New source after cloning not display changes on authors / editors lists
- Edit taxon name firing multiple updates when updating gender [#1970]
- Correct image size on image viewer
- Save pages before clone person on new taxon name [#1977]
- Correct count display of attributions [#1979]
- Uncheck collecting event option [#1980]
- Trip Code/Identifier not visible in header of Edit collecting event [#1990]

[#1530]: https://github.com/SpeciesFileGroup/taxonworks/issues/1530
[#1716]: https://github.com/SpeciesFileGroup/taxonworks/issues/1716
[#1908]: https://github.com/SpeciesFileGroup/taxonworks/issues/1908
[#1949]: https://github.com/SpeciesFileGroup/taxonworks/issues/1949
[#1953]: https://github.com/SpeciesFileGroup/taxonworks/issues/1953
[#1956]: https://github.com/SpeciesFileGroup/taxonworks/issues/1956
[#1958]: https://github.com/SpeciesFileGroup/taxonworks/issues/1958
[#1963]: https://github.com/SpeciesFileGroup/taxonworks/issues/1963
[#1967]: https://github.com/SpeciesFileGroup/taxonworks/issues/1967
[#1970]: https://github.com/SpeciesFileGroup/taxonworks/issues/1970
[#1977]: https://github.com/SpeciesFileGroup/taxonworks/issues/1977
[#1978]: https://github.com/SpeciesFileGroup/taxonworks/issues/1978
[#1979]: https://github.com/SpeciesFileGroup/taxonworks/issues/1979
[#1980]: https://github.com/SpeciesFileGroup/taxonworks/issues/1980
[#1986]: https://github.com/SpeciesFileGroup/taxonworks/issues/1986
[#1988]: https://github.com/SpeciesFileGroup/taxonworks/issues/1988
[#1990]: https://github.com/SpeciesFileGroup/taxonworks/issues/1990

## [0.15.1] - 2020-12-14
### Added
- `Person` can not be active for > 119 years
- Show buffered values in `Task - Browse collection objects` [#1931]
- Default pin button on Uniquify people task
- Checkbox to Select/unselect all match people on Uniquify people task [#1921]
Expand Down Expand Up @@ -741,7 +824,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.15.1...development
[unreleased]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.16.0...development
[0.16.0]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.15.1...v0.16.0
[0.15.1]: https://github.com/SpeciesFileGroup/taxonworks/compare/v0.15.0...v0.15.1
[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
Expand Down
22 changes: 13 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gem 'rmagick', '~> 4.0'
# Geo
gem 'ffi-geos', '~> 2.1.0'
# gem 'rgeo-shapefile', '~> 0.4.2' # deprecated? not compatible- perhaps only used in
gem 'rgeo', '~> 2.1'
gem 'rgeo', '~> 2.2'
gem 'rgeo-geojson', '~> 2.1', '>= 2.1.1'
gem 'rgeo-proj4', '~> 2.0'
gem 'postgresql_cursor', '~> 0.6.1'
Expand All @@ -44,7 +44,7 @@ gem 'exception_notification', '~> 4.4'

# Models
gem 'bcrypt', '~> 3.1.11'
gem 'closure_tree', github: 'ClosureTree/closure_tree', ref: '15b253e' # '~> 7.0'
gem 'closure_tree', '~> 7.0'

gem 'delayed_job_active_record', '~> 4.1.3'
gem 'validates_timeliness', '~> 4.1', '>= 4.1.1'
Expand All @@ -59,7 +59,7 @@ gem 'shortener', '~> 0.8.0'
gem 'sprockets-rails', '~> 3.2.0'
gem 'sprockets', '~> 3.7.2' # TODO: Cannot use '~> 4.0' (app fails to initialize properly)
gem 'sprockets-es6', '~> 0.9.2', require: 'sprockets/es6'
gem 'webpacker', '>= 4.0.x'
gem 'webpacker', '~> 5.2', '>= 5.2.1'
gem 'uglifier', '~> 4.2'

gem 'jquery-rails', '~> 4.3.3'
Expand Down Expand Up @@ -87,13 +87,17 @@ gem 'best_in_place', '~> 3.1.1'
gem 'redcarpet', '~> 3.4'
gem 'sassc-rails', '~> 2.1.0'
gem 'waxy', '~> 0.1'
gem 'rgb'
gem 'rgb', '~> 0.1'

# Drawing
gem 'rqrcode', github:'mjy/rqrcode', branch: 'taxonworks'
gem 'barby', '~> 0.6.8'

# "Bio" and SFG gems
gem 'taxonifi', '~> 0.5.5'
gem 'sqed', '0.6.0'
gem 'dwc-archive', '~> 1.1.1'
gem 'biodiversity', github:'LocoDelAssembly/biodiversity', branch: 'ipc-mode-rc1'
gem 'dwc-archive', '~> 1.1', '>= 1.1.2'
gem 'biodiversity', '~> 5.1', '>= 5.1.1'
gem 'ruby-units', '~> 2.3.0', require: 'ruby_units/namespaced'

# Global Names
Expand Down Expand Up @@ -130,7 +134,7 @@ gem 'parallel_tests', group: [:development, :test]
group :development do
# gem 'tunemygc'
gem 'ruby-prof', '~> 1.2'
gem 'better_errors', '~> 2.4'
gem 'better_errors', '~> 2.9'
gem 'binding_of_caller'
gem 'spring-commands-rspec', '~> 1.0.4'
gem 'guard-rspec', '~> 4.7.3', require: false
Expand All @@ -141,7 +145,7 @@ group :development do
gem 'rubocop-rspec', '~>1.38'
gem 'rubocop-faker', '~> 0.2.0'
gem 'brakeman', '~> 4.6', '>= 4.6.1', require: false
gem 'seedbank', git: 'https://github.com/james2m/seedbank'
gem 'seedbank', '~> 0.5.0'
end

group :doc do
Expand All @@ -150,7 +154,7 @@ end

group :test do
gem 'rspec', '~> 3.6'
gem 'codecov', require: false, github: 'LocoDelAssembly/codecov-ruby', branch: 'github-actions-branch-detection-fix'
gem 'codecov', '~> 0.3.0'
gem 'simplecov', :require => false
gem 'capybara', '~> 3.18'
gem 'timecop', '~> 0.9.1'
Expand Down
Loading

0 comments on commit 86f9cd5

Please sign in to comment.