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

November 2024 Release #8053

Merged
merged 196 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
196 commits
Select commit Hold shift + click to select a range
4525475
Enable protocol template renaming [SCI-10851]
rekonder Jul 30, 2024
9cb9f07
Merge pull request #7764 from rekonder/aj_SCI_10851
rekonder Jul 30, 2024
5841fbd
Add basic support for custom templates docx [SCI-10967]
aignatov-bio Aug 9, 2024
2f9bd1f
Merge pull request #7795 from aignatov-bio/ai-sci-10967-prepare-custo…
aignatov-bio Aug 13, 2024
b4bcd69
Add exclude metadata from reports [SCI-10978]
aignatov-bio Aug 13, 2024
6d76966
Merge branch 'develop' into features/custom-docx-reports
aignatov-bio Aug 13, 2024
5105079
Add exclude metadata settings [SCI-10978]
aignatov-bio Aug 14, 2024
36821c6
Merge pull request #7799 from aignatov-bio/ai-sci-10978-checkbox-to-h…
aignatov-bio Aug 19, 2024
dddf2be
Update caracal version [SCI-10985]
rekonder Aug 20, 2024
9cc72e0
Merge branch 'develop' into features/custom-docx-reports
rekonder Aug 27, 2024
f912f6b
Fix docx templates [SCI-10988]
rekonder Aug 27, 2024
df6e417
Merge pull request #7817 from rekonder/aj_SCI_10988
rekonder Aug 27, 2024
dddffc1
Improve report wizards [SCI-10989]
rekonder Aug 28, 2024
d3bd293
Merge pull request #7822 from rekonder/aj_SCI_10989
rekonder Aug 28, 2024
a9ec213
Merge pull request #7806 from rekonder/aj_SCI_10985
rekonder Aug 28, 2024
0e662d5
Fix caracal library version [SCI-10985]
rekonder Aug 30, 2024
454c395
Merge pull request #7825 from rekonder/aj_SCI_10985
rekonder Sep 2, 2024
b2539d1
Fix repositories component for docx [SCI-10988]
rekonder Sep 3, 2024
39717ed
Merge pull request #7828 from rekonder/aj_SCI_10988
rekonder Sep 4, 2024
cb4675c
Fix moving of dropdowns on report wizard [SCI-11016]
rekonder Sep 4, 2024
93dbdca
Merge pull request #7830 from rekonder/aj_SCI_11016
rekonder Sep 4, 2024
08bb1c9
Implement report template loader [SCI-10999]
artoscinote Sep 5, 2024
e00def3
Merge pull request #7832 from artoscinote/ma_SCI_10999
artoscinote Sep 5, 2024
cce140d
Update exclude metadata setting [SCI-11017]
rekonder Sep 5, 2024
ff20519
Merge pull request #7833 from rekonder/aj_SCI_11017
rekonder Sep 5, 2024
c128f2f
Check presence of template zip URL [SCI-10999]
artoscinote Sep 5, 2024
2ccf1ab
Remove tag for attached files in docx [SCI-11027]
rekonder Sep 5, 2024
1f6adcb
Merge pull request #7835 from rekonder/aj_SCI_11027
rekonder Sep 5, 2024
a05c885
Require docx template files on initialization [SCI-10999]
artoscinote Sep 5, 2024
940befb
Merge pull request #7836 from artoscinote/ma_SCI_10999
artoscinote Sep 6, 2024
8095b07
Move template loading to a script [SCI-10999]
artoscinote Sep 6, 2024
936a5c0
Merge pull request #7837 from artoscinote/ma_SCI_10999
artoscinote Sep 6, 2024
9d7a0c2
Exclude timestamps for docx reports for task results [SCI-11017]
rekonder Sep 9, 2024
9138e91
Merge pull request #7838 from rekonder/aj_SCI_11017
rekonder Sep 9, 2024
388926e
Add versioned file attachments to assets [SCI-10774]
artoscinote Jul 29, 2024
445f25e
Merge pull request #7652 from artoscinote/ma_SCI_10774
artoscinote Sep 16, 2024
157a23d
Fix viewable scope for sharable models [SCI-11057]
artoscinote Sep 16, 2024
444b561
Implement file versions modal [SCI-11039]
artoscinote Sep 17, 2024
f1eea58
Merge pull request #7860 from artoscinote/ma_SCI_11039
artoscinote Sep 17, 2024
48fb68c
Implement restore functionality in file versions modal [SCI-11042]
artoscinote Sep 17, 2024
4ddbe53
Merge branch 'develop' into features/custom-docx-reports
rekonder Sep 18, 2024
9aa43f4
Add restore file permission check [SCI-11042]
artoscinote Sep 18, 2024
2ec13cd
Merge pull request #7862 from artoscinote/ma_SCI_11042
artoscinote Sep 18, 2024
6c2c416
Implement disabled file versioning state [SCI-11040]
artoscinote Sep 18, 2024
8fd1c52
Merge pull request #7863 from artoscinote/ma_SCI_11040
artoscinote Sep 18, 2024
401f1d7
Merge branch 'develop' into features/file-versioning
artoscinote Sep 18, 2024
294eef1
Fix file versioning disclamer load [SCI-11040]
artoscinote Sep 18, 2024
8bc8ccb
Improve rendering of docx tables [SCI-11056]
rekonder Sep 18, 2024
10d5025
Merge pull request #7866 from rekonder/aj_SCI_11056
rekonder Sep 19, 2024
d8c3d9a
Merge branch 'develop' into features/custom-docx-reports
rekonder Sep 20, 2024
737d12f
Merge branch 'develop' into features/custom-docx-reports
rekonder Sep 26, 2024
e53ea89
Fix carcal version [SCI-11024]
rekonder Sep 27, 2024
67f8049
Merge pull request #7899 from rekonder/aj_SCI_11024
rekonder Sep 30, 2024
5d7195a
Merge branch 'develop' into features/file-versioning
artoscinote Sep 30, 2024
a3d5494
Fix adding backgroung color to docx tables [SCI-11119]
rekonder Oct 1, 2024
36192e8
Merge pull request #7903 from rekonder/aj_SCI_11119
rekonder Oct 1, 2024
1a04e24
Add support for inventory columns selection for docx report [SCI-11095]
rekonder Oct 1, 2024
6948f79
Merge pull request #7904 from rekonder/aj_SCI_11095
rekonder Oct 1, 2024
0223d77
Merge branch 'develop' into features/file-versioning
artoscinote Oct 2, 2024
104825a
Change how asset sync conflict resolution works with file versioning …
artoscinote Oct 2, 2024
52c0159
Merge pull request #7911 from artoscinote/ma_SCI_11043
artoscinote Oct 2, 2024
74f3ea2
Add file editing & versioning to inventories [SCI-11043]
artoscinote Oct 2, 2024
98d70d6
Merge pull request #7915 from artoscinote/ma_SCI_11043
artoscinote Oct 2, 2024
6fc694a
Add missing serializer
artoscinote Oct 2, 2024
6805025
Fix caracal version [SCI-11124]
rekonder Oct 3, 2024
13ee967
Merge pull request #7917 from rekonder/aj_SCI_11124
rekonder Oct 3, 2024
2f0303b
Revert "Revert "Timeout slow libreoffice preview generation [SCI-1080…
artoscinote Oct 4, 2024
f7dde1b
Merge branch 'develop' into features/file-versioning
artoscinote Oct 8, 2024
e2c49c7
Remove some empty in docx reports [SCI-11056]
rekonder Oct 7, 2024
bf723cd
Merge pull request #7941 from rekonder/aj_SCI_11056
rekonder Oct 8, 2024
c902c22
Enable file versioning for WOPI [SCI-11049]
artoscinote Oct 8, 2024
a5551b4
Merge pull request #7942 from artoscinote/ma_SCI_11049
artoscinote Oct 8, 2024
fb94790
Fix file versioning for WOPI [SCI-11049]
artoscinote Oct 8, 2024
100c847
Fix WOPI file creation [SCI-11049]
artoscinote Oct 8, 2024
c71366a
Update notifications flyout [SCI-10735]
aignatov-bio Oct 14, 2024
8e0f0e2
Merge pull request #7960 from aignatov-bio/ai-sci-10735-update-notifi…
aignatov-bio Oct 14, 2024
8c356f7
Merge branch 'develop' into features/file-versioning
artoscinote Oct 14, 2024
262ae9c
Add activities for asset restore [SCI-11157]
rekonder Oct 14, 2024
cfefef8
Merge pull request #7965 from rekonder/aj_SCI_11157
rekonder Oct 14, 2024
50d2bf5
Add restore asset permission [SCI-11169]
rekonder Oct 14, 2024
adcc401
Add collapsable breadcrumbs component [SCI-11184]
aignatov-bio Oct 14, 2024
7b30da7
Merge pull request #7966 from rekonder/aj_SCI_11169
rekonder Oct 14, 2024
2c56246
Add file versioning to ove and marvinjs files [SCI-11170]
rekonder Oct 14, 2024
e47663e
Merge pull request #7968 from rekonder/aj_SCI_11170
rekonder Oct 14, 2024
f99c701
Fix report wizard for selecting of deleted inventories [SCI-11173]
rekonder Oct 14, 2024
4600d5c
Merge pull request #7971 from rekonder/aj_SCI_11173
rekonder Oct 15, 2024
78c0b8b
Merge pull request #7967 from aignatov-bio/ai-sci-11184-create-collap…
aignatov-bio Oct 15, 2024
76d4e7c
Update caracal version [SCI-11144]
rekonder Oct 15, 2024
880f31f
Merge pull request #7973 from rekonder/aj_SCI_11144
rekonder Oct 15, 2024
7804b46
Merge branch 'develop' into features/file-versioning
artoscinote Oct 16, 2024
2ac183f
Merge pull request #7980 from scinote-eln/features/file-versioning
artoscinote Oct 17, 2024
5276431
Merge branch 'develop' into features/custom-docx-reports
rekonder Oct 17, 2024
a5389b7
Merge branch 'features/custom-docx-reports' of https://github.com/sci…
rekonder Oct 17, 2024
fdcf14e
Merge branch 'develop' into features/protocol-template-renaming
rekonder Oct 17, 2024
8d6c0b4
Change download path for report templates
artoscinote Oct 18, 2024
bed20b2
Bump actionmailer from 7.0.8.4 to 7.0.8.5 (#7976)
dependabot[bot] Oct 18, 2024
1267293
Bump actiontext from 7.0.8.4 to 7.0.8.5 (#7975)
dependabot[bot] Oct 18, 2024
3961b21
Add confirmation modal for repository file delete [SCI-11198]
artoscinote Oct 21, 2024
46e06df
Merge pull request #7982 from artoscinote/ma_SCI_11198
artoscinote Oct 21, 2024
21fb931
Add option for enabling Aws::Rails::SesMailer for sending emails with…
okriuchykhin Oct 21, 2024
4859557
Merge pull request #7986 from scinote-eln/revert-7782-revert-7678-ma_…
artoscinote Oct 22, 2024
9c524d8
Exclude API status and health endpoints, scheduled jobs from NewRelic…
okriuchykhin Oct 23, 2024
1939902
Fix NewRelic ignore calls for ActiveJobs [SCI-11212] (#7988)
okriuchykhin Oct 24, 2024
2e2308e
Add option to add task name into results [SCI-11220]
andrej-scinote Oct 25, 2024
749c1cd
Fix names for duplicated OVE or MarvinJS files [SCI-11183]
artoscinote Oct 25, 2024
e84db6b
Merge pull request #7990 from andrej-scinote/aj_SCI_11220
andrej-scinote Oct 25, 2024
8b58082
Merge pull request #7989 from artoscinote/ma_SCI_11183
artoscinote Oct 25, 2024
3815e5e
Add select/deselect button for repository column selection on report …
andrej-scinote Oct 25, 2024
6bd4d1a
Merge pull request #7991 from andrej-scinote/aj_SCI_11219
andrej-scinote Oct 25, 2024
c2b7c12
Add default text if not repository columns are selected for reports […
andrej-scinote Oct 25, 2024
47c67ea
Merge pull request #7992 from andrej-scinote/aj_SCI_11211
andrej-scinote Oct 25, 2024
cbe0e9f
When restoring files, also restore preview image [SCI-11216]
artoscinote Oct 25, 2024
60bc382
Merge pull request #7993 from artoscinote/ma_SCI_11216
artoscinote Oct 25, 2024
ddba250
Fix user-based sorting of repository items [SCI-11215]
artoscinote Oct 28, 2024
0c774a7
Merge pull request #7994 from artoscinote/ma_SCI_11215
artoscinote Oct 28, 2024
ab658cf
Refactor SoftLockedRepository logic [SCI-11148] (#7985)
artoscinote Oct 28, 2024
9b0521a
Create snapshot provisioning immediatelly when task is locked [SCI-11…
andrej-scinote Oct 28, 2024
aae0abc
UI fixes for File versions modal [SCI-11218]
artoscinote Oct 28, 2024
0b7705f
Bump rexml from 3.3.7 to 3.3.9 (#7998)
dependabot[bot] Oct 29, 2024
480754d
Fix date format in file versions modal [SCI-11223]
artoscinote Oct 29, 2024
c6a4e71
Enable file editing for inventory files [SCI-11041]
artoscinote Oct 29, 2024
b6ed204
Merge pull request #7997 from artoscinote/ma_SCI_11218
artoscinote Oct 29, 2024
2af9ab7
Merge pull request #8002 from artoscinote/ma_SCI_11041
artoscinote Oct 29, 2024
1283632
Bump elliptic from 6.5.7 to 6.6.0 (#8001)
dependabot[bot] Oct 29, 2024
d707f91
Remove constraint for the protocol template name [SCI-10851]
andrej-scinote Oct 29, 2024
ba45068
Add file delete confirmation modal to item sidebar [SCI-11198]
artoscinote Oct 29, 2024
89bc410
Merge pull request #8005 from artoscinote/ma_SCI_11198
artoscinote Oct 29, 2024
004745d
Merge pull request #8004 from andrej-scinote/aj_SCI_10851
andrej-scinote Oct 30, 2024
2d6d47b
Fix look of the select all button [SCI-11219]
andrej-scinote Oct 30, 2024
19c8c7c
Fix adding of well plates from step toolbar [SCI-11228]
andrej-scinote Oct 30, 2024
649a8ab
Fixes for notifications improvment [SCI-11235]
aignatov-bio Oct 30, 2024
c12abc6
Merge pull request #8008 from aignatov-bio/ai-sci-11235-fixes-for-not…
aignatov-bio Oct 30, 2024
f93855e
Merge pull request #8007 from andrej-scinote/aj_SCI_11228
andrej-scinote Oct 30, 2024
97011d6
Merge pull request #8006 from andrej-scinote/aj_SCI_11219
andrej-scinote Oct 30, 2024
d3292f6
Clone file version history when making new protocol draft [SCI-11230]
artoscinote Oct 30, 2024
9a92820
Merge pull request #8009 from artoscinote/ma_SCI_11230
artoscinote Oct 30, 2024
96d5176
Fix image preview if image is delete immediately [SCI-11236]
andrej-scinote Nov 4, 2024
2bb695a
Merge pull request #8010 from andrej-scinote/aj_SCI_11236
andrej-scinote Nov 4, 2024
53b60a6
Fix generation of docx report preview [SCI-11227]
artoscinote Nov 4, 2024
0a4ddb8
Fix repository asset permission checks [SCI-11238]
artoscinote Nov 4, 2024
f083806
Merge pull request #8012 from artoscinote/ma_SCI_11227
artoscinote Nov 4, 2024
c71e378
Merge pull request #8013 from artoscinote/ma_SCI_11238
artoscinote Nov 4, 2024
9fbfb7f
Merge pull request #7996 from andrej-scinote/aj_SCI_11185
andrej-scinote Nov 5, 2024
4fb5453
Merge branch 'features/protocol-template-renaming' into develop
rekonder Nov 5, 2024
d0877c7
Change link in activities for protocols [SCI-11240]
rekonder Nov 5, 2024
458e8b9
Merge pull request #8015 from andrej-scinote/aj_SCI_11240
andrej-scinote Nov 5, 2024
83150f5
Optimize date time reminders query for inventories [SCI-11156] (#8018)
okriuchykhin Nov 5, 2024
0217419
Fix error during non-grid box creation [SCI-11246]
aignatov-bio Nov 7, 2024
1a5530e
Add 203dpi label templates [SCI-10901]
artoscinote Nov 7, 2024
8246eed
Merge pull request #7727 from artoscinote/ma_SCI_10901
artoscinote Nov 7, 2024
7231224
Fix displaying of long tinymce tables [SCI-11241]
andrej-scinote Nov 7, 2024
778552e
Remove duplicate openLocallyMenu element [SCI-11249]
artoscinote Nov 8, 2024
d5e2101
Merge pull request #8021 from andrej-scinote/aj_SCI_11241
andrej-scinote Nov 8, 2024
0bc8e39
Merge pull request #8023 from artoscinote/ma_SCI_11249
artoscinote Nov 8, 2024
fcfb3dc
Fix 203dpi label migtation [SCI-10901]
artoscinote Nov 8, 2024
e079633
Merge pull request #8026 from artoscinote/ma_SCI_10901
artoscinote Nov 8, 2024
2a12ed1
Merge pull request #8020 from aignatov-bio/ai-sci-11246-fix-storage-l…
aignatov-bio Nov 8, 2024
1a99350
Make file versioning disclaimer overridable [SCI-11040]
artoscinote Nov 8, 2024
8912bb4
Merge pull request #8027 from artoscinote/ma_SCI_11040
artoscinote Nov 8, 2024
bfeea3c
Don't export protocol asset version metadata [SCI-11237]
artoscinote Nov 8, 2024
575920f
Merge pull request #8028 from artoscinote/ma_SCI_11237
artoscinote Nov 8, 2024
f2c9a7c
Fix dangerous use of uri open, remove unused obsolete file encryptor …
okriuchykhin Nov 11, 2024
0be982e
Fix restore action for file preview file reload [SCI-11253]
aignatov-bio Nov 11, 2024
19aa77f
Merge pull request #8032 from aignatov-bio/ai-sci-11230-protocol-temp…
aignatov-bio Nov 12, 2024
a7ab803
Merge pull request #8032 from aignatov-bio/ai-sci-11230-protocol-temp…
aignatov-bio Nov 12, 2024
79e2ab0
Merge branch 'develop' into ai-sci-11264-show-file-versions-with-view…
aignatov-bio Nov 12, 2024
2d70773
Limit quick search possible classes and improve params check for repo…
andrej-scinote Nov 12, 2024
feface9
Fix restore version in file preview [SCI-11253]
aignatov-bio Nov 13, 2024
abea463
Merge pull request #8038 from aignatov-bio/ai-sci-11253-fix-preview-u…
aignatov-bio Nov 13, 2024
67f1424
Merge branch 'develop' into ai-sci-11264-show-file-versions-with-view…
artoscinote Nov 13, 2024
162b64e
Merge pull request #8036 from aignatov-bio/ai-sci-11264-show-file-ver…
artoscinote Nov 13, 2024
d3dc404
Merge branch 'develop' into features/custom-docx-reports
aignatov-bio Nov 14, 2024
1f1ab08
Merge branch 'features/custom-docx-reports' of github.com:scinote-eln…
aignatov-bio Nov 14, 2024
d860a45
Merge branch 'develop' into features/custom-docx-reports
aignatov-bio Nov 14, 2024
dfba7ad
Fix pemrisison for acrived rows and download link [SCI-11284][SCI-11285]
aignatov-bio Nov 14, 2024
c600fda
Remove test docx template
aignatov-bio Nov 14, 2024
59d2445
Merge pull request #8042 from scinote-eln/features/custom-docx-reports
aignatov-bio Nov 15, 2024
1593457
Merge branch 'develop' into ai-sci-11284-fix-archived-items
aignatov-bio Nov 15, 2024
23002e0
Add missing permissions for repository columns [SCI-11147] (#7995)
okriuchykhin Nov 15, 2024
aceeaae
Fix view permission for protocol template [SCI-11256]
aignatov-bio Nov 12, 2024
017a383
Merge branch 'develop' into ai-sci-11256-fix-view-permission-for-prot…
aignatov-bio Nov 15, 2024
8e91284
Merge pull request #8044 from aignatov-bio/ai-sci-11284-fix-archived-…
aignatov-bio Nov 15, 2024
1cff5b1
Merge branch 'develop' into ai-sci-11256-fix-view-permission-for-prot…
aignatov-bio Nov 15, 2024
60a0662
Update Recaptcha config, stricken CSP config for external services [S…
okriuchykhin Nov 15, 2024
abe4336
Merge pull request #8035 from aignatov-bio/ai-sci-11256-fix-view-perm…
aignatov-bio Nov 15, 2024
718fafd
Fix file versions for api flies [SCI-11288]
aignatov-bio Nov 15, 2024
096b957
Merge pull request #8045 from aignatov-bio/ai-sci-11288-fix-version-m…
aignatov-bio Nov 15, 2024
7e0a9bb
Fix generating of reports [SCI-11291][SCI-11292]
andrej-scinote Nov 17, 2024
969f40b
Merge pull request #8046 from andrej-scinote/aj_SCI_11291
artoscinote Nov 18, 2024
2e9887a
Fix recording of asset authors when duplicating stuff and restoring v…
artoscinote Nov 18, 2024
5024064
Merge pull request #8048 from artoscinote/ma_SCI_11295
artoscinote Nov 18, 2024
956813c
Add defulat docx template if nothing is selected [SCI-11300]
andrej-scinote Nov 19, 2024
1a4ea87
Merge pull request #8050 from andrej-scinote/aj_SCI_11300
andrej-scinote Nov 19, 2024
b7f8956
Bump version to 1.38.0
artoscinote Nov 20, 2024
b3b784d
Merge pull request #8052 from scinote-eln/version-bump-1-38-0
artoscinote Nov 20, 2024
60df129
Merge pull request #8054 from scinote-eln/master
artoscinote Nov 20, 2024
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
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

source 'http://rubygems.org'
source 'https://rubygems.org'

ruby '~> 3.2.2'

Expand All @@ -13,7 +13,7 @@ gem 'pg', '~> 1.5'
gem 'pg_search' # PostgreSQL full text search
gem 'psych', '< 4.0'
gem 'rails', '~> 7.0.8'
gem 'recaptcha', require: 'recaptcha/rails'
gem 'recaptcha'
gem 'sanitize'
gem 'sprockets-rails'
gem 'view_component'
Expand Down Expand Up @@ -47,8 +47,7 @@ gem 'aspector' # Aspect-oriented programming for Rails
gem 'auto_strip_attributes', '~> 2.1' # Removes unnecessary whitespaces AR
gem 'bcrypt', '~> 3.1.10'
# gem 'caracal'
gem 'caracal',
git: 'https://github.com/scinote-eln/caracal.git', branch: 'rubyzip2' # Build docx report
gem 'caracal', git: 'https://github.com/scinote-eln/caracal.git', branch: 'custom-docx-reports' # Build docx report
gem 'caxlsx' # Build XLSX files
gem 'deface', '~> 1.9'
gem 'down', '~> 5.0'
Expand Down
137 changes: 65 additions & 72 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ GIT

GIT
remote: https://github.com/scinote-eln/caracal.git
revision: f8e4c279adfee7801eb1024e1d6a18bb06c9c76a
branch: rubyzip2
revision: 54c21353798569476a1eaa73b5fd3e275ac85419
branch: custom-docx-reports
specs:
caracal (1.4.1)
caracal (1.4.2)
nokogiri (~> 1.6)
rubyzip (>= 2.3)
tilt (>= 1.4)
Expand Down Expand Up @@ -50,49 +50,49 @@ GIT
mime-types (>= 1.23)

GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
actioncable (7.0.8.4)
actionpack (= 7.0.8.4)
activesupport (= 7.0.8.4)
actioncable (7.0.8.5)
actionpack (= 7.0.8.5)
activesupport (= 7.0.8.5)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.4)
actionpack (= 7.0.8.4)
activejob (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
actionmailbox (7.0.8.5)
actionpack (= 7.0.8.5)
activejob (= 7.0.8.5)
activerecord (= 7.0.8.5)
activestorage (= 7.0.8.5)
activesupport (= 7.0.8.5)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8.4)
actionpack (= 7.0.8.4)
actionview (= 7.0.8.4)
activejob (= 7.0.8.4)
activesupport (= 7.0.8.4)
actionmailer (7.0.8.5)
actionpack (= 7.0.8.5)
actionview (= 7.0.8.5)
activejob (= 7.0.8.5)
activesupport (= 7.0.8.5)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8.4)
actionview (= 7.0.8.4)
activesupport (= 7.0.8.4)
actionpack (7.0.8.5)
actionview (= 7.0.8.5)
activesupport (= 7.0.8.5)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8.4)
actionpack (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
actiontext (7.0.8.5)
actionpack (= 7.0.8.5)
activerecord (= 7.0.8.5)
activestorage (= 7.0.8.5)
activesupport (= 7.0.8.5)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8.4)
activesupport (= 7.0.8.4)
actionview (7.0.8.5)
activesupport (= 7.0.8.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -102,14 +102,14 @@ GEM
activemodel (>= 4.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (7.0.8.4)
activesupport (= 7.0.8.4)
activejob (7.0.8.5)
activesupport (= 7.0.8.5)
globalid (>= 0.3.6)
activemodel (7.0.8.4)
activesupport (= 7.0.8.4)
activerecord (7.0.8.4)
activemodel (= 7.0.8.4)
activesupport (= 7.0.8.4)
activemodel (7.0.8.5)
activesupport (= 7.0.8.5)
activerecord (7.0.8.5)
activemodel (= 7.0.8.5)
activesupport (= 7.0.8.5)
activerecord-import (1.4.1)
activerecord (>= 4.2)
activerecord-session_store (2.1.0)
Expand All @@ -119,14 +119,14 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 2.0.8, < 4)
railties (>= 6.1)
activestorage (7.0.8.4)
actionpack (= 7.0.8.4)
activejob (= 7.0.8.4)
activerecord (= 7.0.8.4)
activesupport (= 7.0.8.4)
activestorage (7.0.8.5)
actionpack (= 7.0.8.5)
activejob (= 7.0.8.5)
activerecord (= 7.0.8.5)
activesupport (= 7.0.8.5)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8.4)
activesupport (7.0.8.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -428,7 +428,7 @@ GEM
net-imap
net-pop
net-smtp
marcel (1.0.2)
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.4.1)
Expand All @@ -447,20 +447,17 @@ GEM
rails (>= 3.2.0)
net-http (0.4.1)
uri
net-imap (0.4.10)
net-imap (0.4.17)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0.1)
net-smtp (0.5.0)
net-protocol
newrelic_rpm (9.2.2)
newrelic_rpm (9.14.0)
nio4r (2.7.3)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
Expand Down Expand Up @@ -547,7 +544,7 @@ GEM
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.8.1)
rack (2.2.9)
rack (2.2.10)
rack-attack (6.6.1)
rack (>= 1.0, < 3)
rack-cors (2.0.2)
Expand All @@ -564,20 +561,20 @@ GEM
rack (~> 2.2, >= 2.2.4)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8.4)
actioncable (= 7.0.8.4)
actionmailbox (= 7.0.8.4)
actionmailer (= 7.0.8.4)
actionpack (= 7.0.8.4)
actiontext (= 7.0.8.4)
actionview (= 7.0.8.4)
activejob (= 7.0.8.4)
activemodel (= 7.0.8.4)
activerecord (= 7.0.8.4)
activestorage (= 7.0.8.4)
activesupport (= 7.0.8.4)
rails (7.0.8.5)
actioncable (= 7.0.8.5)
actionmailbox (= 7.0.8.5)
actionmailer (= 7.0.8.5)
actionpack (= 7.0.8.5)
actiontext (= 7.0.8.5)
actionview (= 7.0.8.5)
activejob (= 7.0.8.5)
activemodel (= 7.0.8.5)
activerecord (= 7.0.8.5)
activestorage (= 7.0.8.5)
activesupport (= 7.0.8.5)
bundler (>= 1.15.0)
railties (= 7.0.8.4)
railties (= 7.0.8.5)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
Expand All @@ -598,9 +595,9 @@ GEM
railties (> 3.1)
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (7.0.8.4)
actionpack (= 7.0.8.4)
activesupport (= 7.0.8.4)
railties (7.0.8.5)
actionpack (= 7.0.8.5)
activesupport (= 7.0.8.5)
method_source
rake (>= 12.2)
thor (~> 1.0)
Expand All @@ -611,12 +608,12 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.3.4.1)
recaptcha (5.14.0)
recaptcha (5.17.0)
regexp_parser (2.8.1)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.3.7)
rexml (3.3.9)
rgl (0.6.3)
pairing_heap (>= 0.3.0)
rexml (~> 3.2, >= 3.2.4)
Expand Down Expand Up @@ -715,14 +712,12 @@ GEM
faraday-follow_redirects
sys-uname (1.2.3)
ffi (~> 1.1)
tailwindcss-rails (2.4.0)
railties (>= 6.0.0)
tailwindcss-rails (2.4.0-arm64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.4.0-x86_64-linux)
railties (>= 6.0.0)
thor (1.3.1)
tilt (2.2.0)
tilt (2.4.0)
timecop (0.9.6)
timeout (0.4.1)
turbolinks (5.2.1)
Expand Down Expand Up @@ -776,7 +771,6 @@ GEM

PLATFORMS
arm64-darwin
ruby
x86_64-linux

DEPENDENCIES
Expand Down Expand Up @@ -810,7 +804,6 @@ DEPENDENCIES
deface (~> 1.9)
delayed_job_active_record
devise (~> 4.8.1)
devise-async!
devise_invitable
discard
doorkeeper (>= 4.6)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.37.0
1.38.0
14 changes: 2 additions & 12 deletions app/assets/javascripts/my_modules/protocols.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ function initEditMyModuleDescription() {
});

setTimeout(function() {
TinyMCE.wrapTables(viewObject);
const notesContainerEl = document.getElementById('notes-container');
window.wrapTables(notesContainerEl);
}, 100);
}

Expand Down Expand Up @@ -327,16 +328,6 @@ function initAccessModal() {
});
}

function initWrapTables() {
const viewMode = new URLSearchParams(window.location.search).get('view_mode');
if (['archived', 'locked'].includes(viewMode)) {
setTimeout(() => {
const notesContainerEl = document.getElementById('notes-container');
window.wrapTables(notesContainerEl);
}, 100);
}
}

/**
* Initializes page
*/
Expand All @@ -348,7 +339,6 @@ function init() {
initProtocolSectionOpenEvent();
initDetailsDropdown();
initAccessModal();
initWrapTables();
}

init();
Loading