Commit graph

17675 commits

Author SHA1 Message Date
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
Martin Artnik
8246eed23c
Merge pull request #7727 from artoscinote/ma_SCI_10901
Add 203dpi label template [SCI-10901]
2024-11-07 12:31:27 +01:00
Martin Artnik
1a5530efde Add 203dpi label templates [SCI-10901] 2024-11-07 11:59:36 +01:00
Anton
0217419603 Fix error during non-grid box creation [SCI-11246] 2024-11-07 11:53:27 +01:00
Alex Kriuchykhin
83150f59c0
Optimize date time reminders query for inventories [SCI-11156] (#8018) 2024-11-05 16:21:53 +01:00
andrej-scinote
458e8b9a86
Merge pull request #8015 from andrej-scinote/aj_SCI_11240
Change link in activities for protocols [SCI-11240]
2024-11-05 10:59:15 +01:00
Andrej
d0877c7d15 Change link in activities for protocols [SCI-11240] 2024-11-05 10:56:08 +01:00
Andrej
4fb54535ad Merge branch 'features/protocol-template-renaming' into develop 2024-11-05 10:34:14 +01:00
andrej-scinote
9fbfb7f05c
Merge pull request #7996 from andrej-scinote/aj_SCI_11185
Create snapshot provisioning immediately when the task is locked [SCI-11185]
2024-11-05 10:32:53 +01:00
Martin Artnik
c71e3780f5
Merge pull request #8013 from artoscinote/ma_SCI_11238
Fix repository asset permission checks [SCI-11238]
2024-11-04 15:15:21 +01:00
Martin Artnik
f083806abc
Merge pull request #8012 from artoscinote/ma_SCI_11227
Fix generation of docx report preview [SCI-11227]
2024-11-04 15:11:32 +01:00
Martin Artnik
0a4ddb8038 Fix repository asset permission checks [SCI-11238] 2024-11-04 15:10:28 +01:00
Martin Artnik
53b60a6b1e Fix generation of docx report preview [SCI-11227] 2024-11-04 13:54:18 +01:00
andrej-scinote
2bb695a17f
Merge pull request #8010 from andrej-scinote/aj_SCI_11236
Fix image preview if an image is deleted immediately  [SCI-11236]
2024-11-04 11:19:37 +01:00
Andrej
96d5176bf1 Fix image preview if image is delete immediately [SCI-11236] 2024-11-04 10:57:14 +01:00
Martin Artnik
9a92820e11
Merge pull request #8009 from artoscinote/ma_SCI_11230
Clone file version history when making new protocol draft [SCI-11230]
2024-10-30 15:36:33 +01:00
Martin Artnik
d3292f6c4a Clone file version history when making new protocol draft [SCI-11230] 2024-10-30 15:23:48 +01:00
andrej-scinote
f93855ef9e
Merge pull request #8007 from andrej-scinote/aj_SCI_11228
Fix adding of well plates from the step toolbar [SCI-11228]
2024-10-30 13:07:21 +01:00
aignatov-bio
c12abc62ea
Merge pull request #8008 from aignatov-bio/ai-sci-11235-fixes-for-notifications
Fixes for notifications improvements [SCI-11235]
2024-10-30 12:45:31 +01:00
Anton
649a8abe66 Fixes for notifications improvment [SCI-11235] 2024-10-30 11:44:30 +01:00
Andrej
19c8c7c504 Fix adding of well plates from step toolbar [SCI-11228] 2024-10-30 11:41:19 +01:00
andrej-scinote
004745d4e7
Merge pull request #8004 from andrej-scinote/aj_SCI_10851
Remove constraint for the protocol template name [SCI-10851]
2024-10-30 09:07:17 +01:00
Martin Artnik
89bc4102ee
Merge pull request #8005 from artoscinote/ma_SCI_11198
Add file delete confirmation modal to item sidebar [SCI-11198]
2024-10-29 21:03:11 +01:00
Martin Artnik
ba45068807 Add file delete confirmation modal to item sidebar [SCI-11198] 2024-10-29 16:41:31 +01:00
Andrej
d707f9121c Remove constraint for the protocol template name [SCI-10851] 2024-10-29 15:12:27 +01:00
dependabot[bot]
1283632e33
Bump elliptic from 6.5.7 to 6.6.0 (#8001)
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.0.
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.7...v6.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-29 13:25:13 +01:00
Martin Artnik
2af9ab7f5d
Merge pull request #8002 from artoscinote/ma_SCI_11041
Enable file editing for inventory files [SCI-11041]
2024-10-29 10:22:30 +01:00
Martin Artnik
b6ed204aa0
Merge pull request #7997 from artoscinote/ma_SCI_11218
UI fixes for File versions modal [SCI-11218]
2024-10-29 10:22:17 +01:00
Martin Artnik
c6a4e71d69 Enable file editing for inventory files [SCI-11041] 2024-10-29 09:56:03 +01:00
Martin Artnik
480754d3d4 Fix date format in file versions modal [SCI-11223] 2024-10-29 09:43:11 +01:00
dependabot[bot]
0b7705f95f
Bump rexml from 3.3.7 to 3.3.9 (#7998)
Bumps [rexml](https://github.com/ruby/rexml) from 3.3.7 to 3.3.9.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.3.7...v3.3.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-10-29 09:38:46 +01:00