Skip to content

Commit ba96688

Browse files
authored
Merge pull request #6290 from avalonmediasystem/staging
Release Avalon 8.0.1
2 parents 1ab561e + b4a6479 commit ba96688

File tree

696 files changed

+4591
-4270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

696 files changed

+4591
-4270
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- image: zookeeper:3.9
2525
environment:
2626
ZOO_ADMINSERVER_ENABLED: false
27-
- image: solr:9
27+
- image: solr:9.7
2828
environment:
2929
VERBOSE: yes
3030
SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ gem 'net-ldap'
7272
gem 'omniauth', '~> 2.0'
7373
gem 'omniauth-identity', '>= 2.0.0'
7474
gem 'omniauth-lti', git: "https://github.com/avalonmediasystem/omniauth-lti.git", tag: 'avalon-r4'
75-
gem "omniauth-saml", "~> 2.0", ">= 2.2.1"
75+
gem "omniauth-saml", "~> 2.0", ">= 2.2.3"
7676

7777
# Media Access & Transcoding
7878
gem 'active_encode', '~> 1.2'
7979
gem 'audio_waveform-ruby', '~> 1.0.7', require: 'audio_waveform'
80-
gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", tag: '1.4-avalon'
80+
gem 'browse-everything', git: "https://github.com/avalonmediasystem/browse-everything.git", branch: 'v1.4-avalon'
8181
gem 'fastimage'
8282
gem 'rest-client', '~> 2.0'
8383
gem 'roo'

Gemfile.lock

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ GIT
2323

2424
GIT
2525
remote: https://github.com/avalonmediasystem/browse-everything.git
26-
revision: 73cc89eb263bf5669d7bf29b6da73e8dcf1184ef
27-
tag: 1.4-avalon
26+
revision: 99fc455cce84550a0efb994d305a9da48b0e5014
27+
branch: v1.4-avalon
2828
specs:
2929
browse-everything (1.4.0)
3030
addressable (~> 2.5)
@@ -78,29 +78,29 @@ GIT
7878
GEM
7979
remote: https://rubygems.org/
8080
specs:
81-
actioncable (7.2.2)
82-
actionpack (= 7.2.2)
83-
activesupport (= 7.2.2)
81+
actioncable (7.2.2.1)
82+
actionpack (= 7.2.2.1)
83+
activesupport (= 7.2.2.1)
8484
nio4r (~> 2.0)
8585
websocket-driver (>= 0.6.1)
8686
zeitwerk (~> 2.6)
87-
actionmailbox (7.2.2)
88-
actionpack (= 7.2.2)
89-
activejob (= 7.2.2)
90-
activerecord (= 7.2.2)
91-
activestorage (= 7.2.2)
92-
activesupport (= 7.2.2)
87+
actionmailbox (7.2.2.1)
88+
actionpack (= 7.2.2.1)
89+
activejob (= 7.2.2.1)
90+
activerecord (= 7.2.2.1)
91+
activestorage (= 7.2.2.1)
92+
activesupport (= 7.2.2.1)
9393
mail (>= 2.8.0)
94-
actionmailer (7.2.2)
95-
actionpack (= 7.2.2)
96-
actionview (= 7.2.2)
97-
activejob (= 7.2.2)
98-
activesupport (= 7.2.2)
94+
actionmailer (7.2.2.1)
95+
actionpack (= 7.2.2.1)
96+
actionview (= 7.2.2.1)
97+
activejob (= 7.2.2.1)
98+
activesupport (= 7.2.2.1)
9999
mail (>= 2.8.0)
100100
rails-dom-testing (~> 2.2)
101-
actionpack (7.2.2)
102-
actionview (= 7.2.2)
103-
activesupport (= 7.2.2)
101+
actionpack (7.2.2.1)
102+
actionview (= 7.2.2.1)
103+
activesupport (= 7.2.2.1)
104104
nokogiri (>= 1.8.5)
105105
racc
106106
rack (>= 2.2.4, < 3.2)
@@ -109,15 +109,15 @@ GEM
109109
rails-dom-testing (~> 2.2)
110110
rails-html-sanitizer (~> 1.6)
111111
useragent (~> 0.16)
112-
actiontext (7.2.2)
113-
actionpack (= 7.2.2)
114-
activerecord (= 7.2.2)
115-
activestorage (= 7.2.2)
116-
activesupport (= 7.2.2)
112+
actiontext (7.2.2.1)
113+
actionpack (= 7.2.2.1)
114+
activerecord (= 7.2.2.1)
115+
activestorage (= 7.2.2.1)
116+
activesupport (= 7.2.2.1)
117117
globalid (>= 0.6.0)
118118
nokogiri (>= 1.8.5)
119-
actionview (7.2.2)
120-
activesupport (= 7.2.2)
119+
actionview (7.2.2.1)
120+
activesupport (= 7.2.2.1)
121121
builder (~> 3.1)
122122
erubi (~> 1.11)
123123
rails-dom-testing (~> 2.2)
@@ -144,8 +144,8 @@ GEM
144144
om (~> 3.1)
145145
rdf (~> 3.2)
146146
rdf-rdfxml (~> 3.2)
147-
activejob (7.2.2)
148-
activesupport (= 7.2.2)
147+
activejob (7.2.2.1)
148+
activesupport (= 7.2.2.1)
149149
globalid (>= 0.3.6)
150150
activejob-traffic_control (0.1.3)
151151
activejob (>= 4.2)
@@ -154,11 +154,11 @@ GEM
154154
activejob-uniqueness (0.3.2)
155155
activejob (>= 4.2, < 7.3)
156156
redlock (>= 2.0, < 3)
157-
activemodel (7.2.2)
158-
activesupport (= 7.2.2)
159-
activerecord (7.2.2)
160-
activemodel (= 7.2.2)
161-
activesupport (= 7.2.2)
157+
activemodel (7.2.2.1)
158+
activesupport (= 7.2.2.1)
159+
activerecord (7.2.2.1)
160+
activemodel (= 7.2.2.1)
161+
activesupport (= 7.2.2.1)
162162
timeout (>= 0.4.0)
163163
activerecord-session_store (2.1.0)
164164
actionpack (>= 6.1)
@@ -167,13 +167,13 @@ GEM
167167
multi_json (~> 1.11, >= 1.11.2)
168168
rack (>= 2.0.8, < 4)
169169
railties (>= 6.1)
170-
activestorage (7.2.2)
171-
actionpack (= 7.2.2)
172-
activejob (= 7.2.2)
173-
activerecord (= 7.2.2)
174-
activesupport (= 7.2.2)
170+
activestorage (7.2.2.1)
171+
actionpack (= 7.2.2.1)
172+
activejob (= 7.2.2.1)
173+
activerecord (= 7.2.2.1)
174+
activesupport (= 7.2.2.1)
175175
marcel (~> 1.0)
176-
activesupport (7.2.2)
176+
activesupport (7.2.2.1)
177177
base64
178178
benchmark (>= 0.3)
179179
bigdecimal
@@ -325,7 +325,7 @@ GEM
325325
rack-test (>= 0.6.3)
326326
regexp_parser (>= 1.5, < 3.0)
327327
xpath (~> 3.2)
328-
cgi (0.4.1)
328+
cgi (0.4.2)
329329
childprocess (3.0.0)
330330
cloudfront-signer (3.0.2)
331331
codeclimate-test-reporter (1.0.7)
@@ -432,20 +432,20 @@ GEM
432432
globalid (1.2.1)
433433
activesupport (>= 6.1)
434434
google-analytics-rails (1.1.0)
435-
google-apis-core (0.15.1)
435+
google-apis-core (0.16.0)
436436
addressable (~> 2.5, >= 2.5.1)
437437
googleauth (~> 1.9)
438438
httpclient (>= 2.8.3, < 3.a)
439439
mini_mime (~> 1.0)
440440
mutex_m
441441
representable (~> 3.0)
442442
retriable (>= 2.0, < 4.a)
443-
google-apis-drive_v3 (0.60.0)
443+
google-apis-drive_v3 (0.61.0)
444444
google-apis-core (>= 0.15.0, < 2.a)
445445
google-cloud-env (2.2.1)
446446
faraday (>= 1.0, < 3.a)
447447
google-logging-utils (0.1.0)
448-
googleauth (1.12.0)
448+
googleauth (1.13.1)
449449
faraday (>= 1.0, < 3.a)
450450
google-cloud-env (~> 2.2)
451451
google-logging-utils (~> 0.1)
@@ -519,7 +519,7 @@ GEM
519519
rack (>= 2.2, < 4)
520520
rdf (~> 3.3)
521521
rexml (~> 3.2)
522-
jwt (2.9.3)
522+
jwt (2.10.1)
523523
base64
524524
kaminari (1.2.2)
525525
activesupport (>= 4.1.0)
@@ -611,7 +611,7 @@ GEM
611611
noid-rails (3.2.0)
612612
actionpack (>= 5.0.0, < 8)
613613
noid (~> 0.9)
614-
nokogiri (1.16.7)
614+
nokogiri (1.18.5)
615615
mini_portile2 (~> 2.8.2)
616616
racc (~> 1.4)
617617
nom-xml (1.2.0)
@@ -632,9 +632,9 @@ GEM
632632
omniauth-identity (3.0.9)
633633
bcrypt
634634
omniauth
635-
omniauth-saml (2.2.1)
635+
omniauth-saml (2.2.3)
636636
omniauth (~> 2.1)
637-
ruby-saml (~> 1.17)
637+
ruby-saml (~> 1.18)
638638
orm_adapter (0.5.0)
639639
os (1.1.4)
640640
ostruct (0.6.0)
@@ -663,7 +663,7 @@ GEM
663663
nio4r (~> 2.0)
664664
raabro (1.4.0)
665665
racc (1.8.1)
666-
rack (2.2.10)
666+
rack (2.2.13)
667667
rack-cors (2.0.2)
668668
rack (>= 2.0.0)
669669
rack-protection (3.2.0)
@@ -678,20 +678,20 @@ GEM
678678
rackup (1.0.0)
679679
rack (< 3)
680680
webrick
681-
rails (7.2.2)
682-
actioncable (= 7.2.2)
683-
actionmailbox (= 7.2.2)
684-
actionmailer (= 7.2.2)
685-
actionpack (= 7.2.2)
686-
actiontext (= 7.2.2)
687-
actionview (= 7.2.2)
688-
activejob (= 7.2.2)
689-
activemodel (= 7.2.2)
690-
activerecord (= 7.2.2)
691-
activestorage (= 7.2.2)
692-
activesupport (= 7.2.2)
681+
rails (7.2.2.1)
682+
actioncable (= 7.2.2.1)
683+
actionmailbox (= 7.2.2.1)
684+
actionmailer (= 7.2.2.1)
685+
actionpack (= 7.2.2.1)
686+
actiontext (= 7.2.2.1)
687+
actionview (= 7.2.2.1)
688+
activejob (= 7.2.2.1)
689+
activemodel (= 7.2.2.1)
690+
activerecord (= 7.2.2.1)
691+
activestorage (= 7.2.2.1)
692+
activesupport (= 7.2.2.1)
693693
bundler (>= 1.15.0)
694-
railties (= 7.2.2)
694+
railties (= 7.2.2.1)
695695
rails-controller-testing (1.0.5)
696696
actionpack (>= 5.0.1.rc1)
697697
actionview (>= 5.0.1.rc1)
@@ -706,9 +706,9 @@ GEM
706706
rails_same_site_cookie (0.1.9)
707707
rack (>= 1.5)
708708
user_agent_parser (~> 2.6)
709-
railties (7.2.2)
710-
actionpack (= 7.2.2)
711-
activesupport (= 7.2.2)
709+
railties (7.2.2.1)
710+
actionpack (= 7.2.2.1)
711+
activesupport (= 7.2.2.1)
712712
irb (~> 1.13)
713713
rackup (>= 1.0.0)
714714
rake (>= 12.2)
@@ -848,7 +848,7 @@ GEM
848848
multipart-post
849849
oauth2
850850
ruby-progressbar (1.13.0)
851-
ruby-saml (1.17.0)
851+
ruby-saml (1.18.0)
852852
nokogiri (>= 1.13.10)
853853
rexml
854854
rubyzip (1.3.0)
@@ -963,7 +963,7 @@ GEM
963963
unf (0.2.0)
964964
unicode-display_width (2.5.0)
965965
unicode-types (1.10.0)
966-
uri (0.13.1)
966+
uri (1.0.3)
967967
user_agent_parser (2.18.0)
968968
useragent (0.16.10)
969969
view_component (3.14.0)
@@ -1086,7 +1086,7 @@ DEPENDENCIES
10861086
omniauth (~> 2.0)
10871087
omniauth-identity (>= 2.0.0)
10881088
omniauth-lti!
1089-
omniauth-saml (~> 2.0, >= 2.2.1)
1089+
omniauth-saml (~> 2.0, >= 2.2.3)
10901090
parallel
10911091
pg
10921092
pry-byebug

LICENSE_HEADER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2011-2024, The Trustees of Indiana University and Northwestern
1+
Copyright 2011-2025, The Trustees of Indiana University and Northwestern
22
University. Licensed under the Apache License, Version 2.0 (the "License");
33
you may not use this file except in compliance with the License.
44

app/assets/javascripts/access_control_step.js.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Copyright 2011-2024, The Trustees of Indiana University and Northwestern
1+
# Copyright 2011-2025, The Trustees of Indiana University and Northwestern
22
# University. Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
4-
#
4+
#
55
# You may obtain a copy of the License at
6-
#
6+
#
77
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
8+
#
99
# Unless required by applicable law or agreed to in writing, software distributed
1010
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
1111
# CONDITIONS OF ANY KIND, either express or implied. See the License for the

app/assets/javascripts/add-playlist-option.js.coffee

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Copyright 2011-2024, The Trustees of Indiana University and Northwestern
1+
# Copyright 2011-2025, The Trustees of Indiana University and Northwestern
22
# University. Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
4-
#
4+
#
55
# You may obtain a copy of the License at
6-
#
6+
#
77
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
8+
#
99
# Unless required by applicable law or agreed to in writing, software distributed
1010
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
1111
# CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -35,7 +35,7 @@ $ ->
3535
select_element.append(new Option(addnew))
3636

3737
getSearchTerm = () ->
38-
return $('span.select2-search--dropdown input').val()
38+
return $('span.select2-search--dropdown input').attr('data-testid', 'media-object-playlist-search-input').val()
3939

4040
matchWithNew = (params, data) ->
4141
term = params.term || ''

app/assets/javascripts/application.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
* Copyright 2011-2024, The Trustees of Indiana University and Northwestern
2+
* Copyright 2011-2025, The Trustees of Indiana University and Northwestern
33
* University. Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
5-
*
5+
*
66
* You may obtain a copy of the License at
7-
*
7+
*
88
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
9+
*
1010
* Unless required by applicable law or agreed to in writing, software distributed
1111
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
1212
* CONDITIONS OF ANY KIND, either express or implied. See the License for the

app/assets/javascripts/autocomplete.js.coffee

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Copyright 2011-2024, The Trustees of Indiana University and Northwestern
1+
# Copyright 2011-2025, The Trustees of Indiana University and Northwestern
22
# University. Licensed under the Apache License, Version 2.0 (the "License");
33
# you may not use this file except in compliance with the License.
4-
#
4+
#
55
# You may obtain a copy of the License at
6-
#
6+
#
77
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
8+
#
99
# Unless required by applicable law or agreed to in writing, software distributed
1010
# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
1111
# CONDITIONS OF ANY KIND, either express or implied. See the License for the

app/assets/javascripts/avalon.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
2-
* Copyright 2011-2024, The Trustees of Indiana University and Northwestern
2+
* Copyright 2011-2025, The Trustees of Indiana University and Northwestern
33
* University. Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
5-
*
5+
*
66
* You may obtain a copy of the License at
7-
*
7+
*
88
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
9+
*
1010
* Unless required by applicable law or agreed to in writing, software distributed
1111
* under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
1212
* CONDITIONS OF ANY KIND, either express or implied. See the License for the

0 commit comments

Comments
 (0)