Skip to content

Commit

Permalink
Merge branch 'feature/remove-result-clusters' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ewlarson committed Oct 13, 2022
2 parents 898fc58 + 59defb0 commit ed84a5b
Show file tree
Hide file tree
Showing 27 changed files with 859 additions and 112 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ group :development do
gem 'letter_opener'
end

gem 'blacklight', '~> 7.29.0'
gem 'blacklight_advanced_search', git: 'https://github.com/projectblacklight/blacklight_advanced_search.git', :branch => 'master'
gem 'blacklight', '~> 7.30.0'
gem 'blacklight_advanced_search', '~> 7.0.0'
gem 'blacklight_range_limit', '~> 7.0.0'
gem 'chosen-rails' # jquery multiselect plugin for advanced search
gem 'bootstrap', '~> 4.0'
Expand Down
26 changes: 10 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@ GIT
specs:
geoblacklight-icons (1.3.1)

GIT
remote: https://github.com/projectblacklight/blacklight_advanced_search.git
revision: 9c04e3770c137d1958f43aa260bc302ab5cfb63b
branch: master
specs:
blacklight_advanced_search (7.0.0)
blacklight (~> 7.0)
parslet

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -101,7 +92,7 @@ GEM
awesome_print (1.9.2)
bcrypt (3.1.18)
bindex (0.8.1)
blacklight (7.29.0)
blacklight (7.30.0)
deprecation
globalid
hashdiff
Expand All @@ -111,6 +102,9 @@ GEM
ostruct (>= 0.3.2)
rails (>= 5.1, < 7.1)
view_component (~> 2.43)
blacklight_advanced_search (7.0.0)
blacklight (~> 7.0)
parslet
blacklight_range_limit (7.0.1)
blacklight
jquery-rails
Expand Down Expand Up @@ -495,7 +489,7 @@ GEM
sprockets-rails
tilt
sd_notify (0.1.1)
selenium-webdriver (4.4.0)
selenium-webdriver (4.5.0)
childprocess (>= 0.5, < 5.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
Expand Down Expand Up @@ -542,7 +536,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
view_component (2.72.0)
view_component (2.74.1)
activesupport (>= 5.0.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand All @@ -553,7 +547,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webdrivers (5.0.0)
webdrivers (5.2.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0)
Expand All @@ -569,7 +563,7 @@ GEM
chronic (>= 0.6.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.0)
zeitwerk (2.6.1)

PLATFORMS
ruby
Expand All @@ -578,8 +572,8 @@ DEPENDENCIES
addressable (~> 2.5.0)
appsignal
awesome_print
blacklight (~> 7.29.0)
blacklight_advanced_search!
blacklight (~> 7.30.0)
blacklight_advanced_search (~> 7.0.0)
blacklight_range_limit (~> 7.0.0)
bootsnap (~> 1.9.3)
bootstrap (~> 4.0)
Expand Down
Binary file added app/assets/images/markers_default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/markers_default@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/markers_shadow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/markers_shadow@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

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

Loading

0 comments on commit ed84a5b

Please sign in to comment.