Commit graph

17776 commits

Author SHA1 Message Date
Martin Artnik
a19383cd71 Prevent multiple submits in legacy components [SCI-9221] 2025-01-20 16:26:49 +01:00
Martin Artnik
39e65bc54d Prevent multiple submits in various Vue components [SCI-9221] 2025-01-20 16:15:21 +01:00
Martin Artnik
15d3d55fdd
Merge pull request #8108 from artoscinote/ma_SCI_11261
Fix counts for archived and assigned repository rows [SCI-11261]
2024-12-18 14:40:49 +01:00
Martin Artnik
793ee0cd0b Fix counts for archived and assigned repository rows [SCI-11261] 2024-12-18 14:22:00 +01:00
dependabot[bot]
bf76faef96
Bump actionpack from 7.0.8.5 to 7.0.8.7 (#8095)
Bumps [actionpack](https://github.com/rails/rails) from 7.0.8.5 to 7.0.8.7.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v8.0.0.1/actionpack/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.8.5...v7.0.8.7)

---
updated-dependencies:
- dependency-name: actionpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-12-11 09:37:06 +01:00
Martin Artnik
2bfbe6e2df
Move filtered count to separate query, to improve performance for large inventories [SCI-11261] (#8090) 2024-12-09 17:57:41 +01:00
dependabot[bot]
7ffb664dad
Bump rails-html-sanitizer from 1.6.0 to 1.6.1 (#8080)
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.6.0...v1.6.1)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-12-03 14:37:30 +01:00
Alex Kriuchykhin
e488e8108a
Improve handling of empty uid params in omniauth auth responces [SCI-11312] (#8074) 2024-11-27 10:12:58 +01:00
Martin Artnik
b770e5c499
Merge master 1.38.0.1 (#8070)
* Remove check for database in migrations [SCI-11213]

* Bump version to 1.37.0.1

* Bump version to 1.38.0.1

---------

Co-authored-by: Andrej <andrej.jugovic7@gmail.com>
2024-11-22 15:20:44 +01:00
Alex Kriuchykhin
1b5e93f2a4
Fix Fontawesome styles inclusion in PDF reports [SCI-11302] (#8058) 2024-11-21 15:10:38 +01:00
Alex Kriuchykhin
dd1c2f5505
Add option to set custom AWS region for SES mail API [SCI-11207] (#8057) 2024-11-21 15:10:15 +01:00
dependabot[bot]
878ee08abd
Bump cross-spawn from 7.0.3 to 7.0.6 (#8055)
Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-11-21 14:26:23 +01:00
Martin Artnik
60df129710
Merge pull request #8054 from scinote-eln/master
Merge pull request #7979 from scinote-eln/develop
2024-11-20 11:32:21 +01:00
Martin Artnik
b3b784d664
Merge pull request #8052 from scinote-eln/version-bump-1-38-0
Bump version to 1.38.0
2024-11-20 11:05:21 +01:00
Martin Artnik
b7f8956887
Bump version to 1.38.0 2024-11-20 10:46:03 +01:00
andrej-scinote
1a4ea87bdd
Merge pull request #8050 from andrej-scinote/aj_SCI_11300
Add default docx template if nothing is selected [SCI-11300]
2024-11-19 13:07:32 +01:00
Andrej
956813c66c Add defulat docx template if nothing is selected [SCI-11300] 2024-11-19 12:52:12 +01:00
Martin Artnik
50240647cf
Merge pull request #8048 from artoscinote/ma_SCI_11295
Fix recording of asset authors when duplicating stuff and restoring versions [SCI-11295]
2024-11-18 15:52:34 +01:00
Martin Artnik
2e9887a59a Fix recording of asset authors when duplicating stuff and restoring versions [SCI-11295] 2024-11-18 14:56:30 +01:00
Martin Artnik
969f40bb1d
Merge pull request #8046 from andrej-scinote/aj_SCI_11291
Fix generating of reports [SCI-11291][SCI-11292]
2024-11-18 09:43:29 +01:00
Andrej
7e0a9bb092 Fix generating of reports [SCI-11291][SCI-11292] 2024-11-17 12:35:15 +01:00
aignatov-bio
096b95781f
Merge pull request #8045 from aignatov-bio/ai-sci-11288-fix-version-modals-for-api-files
Fix file versions for api flies [SCI-11288]
2024-11-15 14:21:44 +01:00
Anton
718fafdec8 Fix file versions for api flies [SCI-11288] 2024-11-15 14:03:14 +01:00
aignatov-bio
abe4336eef
Merge pull request #8035 from aignatov-bio/ai-sci-11256-fix-view-permission-for-protocol-template
Fix view permission for protocol template [SCI-11256]
2024-11-15 10:32:39 +01:00
Alex Kriuchykhin
60a06627c1
Update Recaptcha config, stricken CSP config for external services [SCI-11281] (#8043) 2024-11-15 10:16:54 +01:00
Anton
1cff5b19dd Merge branch 'develop' into ai-sci-11256-fix-view-permission-for-protocol-template 2024-11-15 10:08:21 +01:00
aignatov-bio
8e91284e29
Merge pull request #8044 from aignatov-bio/ai-sci-11284-fix-archived-items
Fix permission for archived rows and download link [SCI-11284][SCI-11285]
2024-11-15 10:06:45 +01:00
Anton
017a383aa0 Merge branch 'develop' into ai-sci-11256-fix-view-permission-for-protocol-template 2024-11-15 09:57:23 +01:00
Anton
aceeaae49c Fix view permission for protocol template [SCI-11256] 2024-11-15 09:56:57 +01:00
Alex Kriuchykhin
23002e0478
Add missing permissions for repository columns [SCI-11147] (#7995) 2024-11-15 09:56:22 +01:00
Anton
159345700f Merge branch 'develop' into ai-sci-11284-fix-archived-items 2024-11-15 09:53:03 +01:00
aignatov-bio
59d2445f38
Merge pull request #8042 from scinote-eln/features/custom-docx-reports
Features/custom docx reports
2024-11-15 09:50:50 +01:00
Anton
c600fda71c Remove test docx template 2024-11-14 16:18:00 +01:00
Anton
dfba7adf98 Fix pemrisison for acrived rows and download link [SCI-11284][SCI-11285] 2024-11-14 15:33:03 +01:00
Anton
d860a45fac Merge branch 'develop' into features/custom-docx-reports 2024-11-14 11:37:36 +01:00
Anton
1f1ab08001 Merge branch 'features/custom-docx-reports' of github.com:scinote-eln/scinote-web into features/custom-docx-reports 2024-11-14 11:35:52 +01:00
Anton
d3dc404b61 Merge branch 'develop' into features/custom-docx-reports 2024-11-14 11:31:46 +01:00
Martin Artnik
162b64e761
Merge pull request #8036 from aignatov-bio/ai-sci-11264-show-file-versions-with-view-permissions
Show file version with view permission [SCI-11264]
2024-11-13 15:02:15 +01:00
Martin Artnik
67f142438f
Merge branch 'develop' into ai-sci-11264-show-file-versions-with-view-permissions 2024-11-13 14:48:35 +01:00
aignatov-bio
abea4638d3
Merge pull request #8038 from aignatov-bio/ai-sci-11253-fix-preview-update
Fix restore version in file preview [SCI-11253]
2024-11-13 12:29:51 +01:00
Anton
feface9141 Fix restore version in file preview [SCI-11253] 2024-11-13 12:15:55 +01:00
andrej-scinote
2d70773cda
Limit quick search possible classes and improve params check for reports and activities [SCI-11260] (#8034) 2024-11-12 16:37:42 +01:00
Anton
79e2ab0826 Merge branch 'develop' into ai-sci-11264-show-file-versions-with-view-permissions 2024-11-12 13:44:48 +01:00
aignatov-bio
a7ab803ad0 Merge pull request #8032 from aignatov-bio/ai-sci-11230-protocol-templates-versioning
Fix restore action for file preview file reload [SCI-11253]
2024-11-12 13:37:36 +01:00
aignatov-bio
19aa77f14a
Merge pull request #8032 from aignatov-bio/ai-sci-11230-protocol-templates-versioning
Fix restore action for file preview file reload [SCI-11253]
2024-11-12 10:25:56 +01:00
Anton
0be982e25f Fix restore action for file preview file reload [SCI-11253] 2024-11-12 10:03:20 +01:00
Alex Kriuchykhin
f2c9a7c0a5
Fix dangerous use of uri open, remove unused obsolete file encryptor module [SCI-11259] (#8030) 2024-11-11 15:39:36 +01:00
Martin Artnik
575920f83d
Merge pull request #8028 from artoscinote/ma_SCI_11237
Don't export protocol asset version metadata [SCI-11237]
2024-11-08 14:56:55 +01:00
Martin Artnik
bfeea3ca43 Don't export protocol asset version metadata [SCI-11237] 2024-11-08 14:52:49 +01:00
Martin Artnik
8912bb44b0
Merge pull request #8027 from artoscinote/ma_SCI_11040
Make file versioning disclaimer overridable [SCI-11040]
2024-11-08 14:38:01 +01:00