Commit graph

17771 commits

Author SHA1 Message Date
Martin Artnik
8b7562091e
Merge pull request #8067 from scinote-eln/hotfix/1.38.0.1
Hotfix/1.38.0.1
2024-11-22 10:41:25 +01:00
Martin Artnik
6670f49077 Bump version to 1.38.0.1 2024-11-22 10:06:56 +01:00
Martin Artnik
0d9640f4ae Merge branch 'hotfix/1.37.0.1' into hotfix/1.38.0.1 2024-11-22 09:59:54 +01:00
Martin Artnik
4c57d97f77
Merge pull request #8053 from scinote-eln/develop
November 2024 Release
2024-11-20 11:46:40 +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
Martin Artnik
1a99350611 Make file versioning disclaimer overridable [SCI-11040] 2024-11-08 14:30:09 +01:00
aignatov-bio
2a12ed129e
Merge pull request #8020 from aignatov-bio/ai-sci-11246-fix-storage-locations-grey-background
Fix error during non-grid box creation [SCI-11246]
2024-11-08 14:14:52 +01:00
Martin Artnik
e079633ff5
Merge pull request #8026 from artoscinote/ma_SCI_10901
Fix 203dpi label migtation [SCI-10901]
2024-11-08 13:51:56 +01:00
Martin Artnik
fcfb3dc8f7 Fix 203dpi label migtation [SCI-10901] 2024-11-08 13:49:29 +01:00
Martin Artnik
0bc8e39491
Merge pull request #8023 from artoscinote/ma_SCI_11249
Remove duplicate openLocallyMenu element [SCI-11249]
2024-11-08 11:12:49 +01:00
andrej-scinote
d5e21019cd
Merge pull request #8021 from andrej-scinote/aj_SCI_11241
Fix displaying of long TinyMCE tables [SCI-11241]
2024-11-08 11:11:18 +01:00
Martin Artnik
778552e809 Remove duplicate openLocallyMenu element [SCI-11249] 2024-11-08 10:27:05 +01:00
Andrej
7231224d84 Fix displaying of long tinymce tables [SCI-11241] 2024-11-07 15:53:15 +01:00