Commit graph

17771 commits

Author SHA1 Message Date
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
97011d6d86
Merge pull request #8006 from andrej-scinote/aj_SCI_11219
Fix look of the select all button [SCI-11219]
2024-10-30 13:07:32 +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
2d6d47bf69 Fix look of the select all button [SCI-11219] 2024-10-30 11:12:55 +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
Martin Artnik
aae0abcd67 UI fixes for File versions modal [SCI-11218] 2024-10-28 15:03:05 +01:00
Andrej
9b0521a168 Create snapshot provisioning immediatelly when task is locked [SCI-11185] 2024-10-28 13:55:07 +01:00
Martin Artnik
ab658cfeb1
Refactor SoftLockedRepository logic [SCI-11148] (#7985) 2024-10-28 10:50:24 +01:00
Martin Artnik
0c774a736e
Merge pull request #7994 from artoscinote/ma_SCI_11215
Fix user-based sorting of repository items [SCI-11215]
2024-10-28 10:28:58 +01:00
Martin Artnik
ddba250086 Fix user-based sorting of repository items [SCI-11215] 2024-10-28 10:19:33 +01:00
Martin Artnik
60bc382f36
Merge pull request #7993 from artoscinote/ma_SCI_11216
When restoring files, also restore preview image [SCI-11216]
2024-10-25 15:24:11 +02:00
Martin Artnik
cbe0e9f2f2 When restoring files, also restore preview image [SCI-11216] 2024-10-25 15:22:18 +02:00
andrej-scinote
47c67ea9b4
Merge pull request #7992 from andrej-scinote/aj_SCI_11211
Add default text if not repository columns are selected for reports [SCI-11211]
2024-10-25 12:52:58 +02:00
Andrej
c2b7c12497 Add default text if not repository columns are selected for reports [SCI-11211] 2024-10-25 12:46:58 +02:00
andrej-scinote
6bd4d1a1bd
Merge pull request #7991 from andrej-scinote/aj_SCI_11219
Add select/deselect button for repository column selection on report wizard [SCI-11219]
2024-10-25 11:39:58 +02:00
Andrej
3815e5e78d Add select/deselect button for repository column selection on report wizard [SCI-11219] 2024-10-25 11:36:27 +02:00
Martin Artnik
8b580823a5
Merge pull request #7989 from artoscinote/ma_SCI_11183
Fix names for duplicated OVE or MarvinJS files [SCI-11183]
2024-10-25 11:35:51 +02:00
andrej-scinote
e84db6ba8d
Merge pull request #7990 from andrej-scinote/aj_SCI_11220
Add option to add task name into results [SCI-11220]
2024-10-25 11:16:32 +02:00
Martin Artnik
749c1cd494 Fix names for duplicated OVE or MarvinJS files [SCI-11183] 2024-10-25 10:53:42 +02:00
Andrej
2e2308e866 Add option to add task name into results [SCI-11220] 2024-10-25 10:30:33 +02:00
Alex Kriuchykhin
1939902eb1
Fix NewRelic ignore calls for ActiveJobs [SCI-11212] (#7988) 2024-10-24 13:22:21 +02:00
Alex Kriuchykhin
9c524d8e0e
Exclude API status and health endpoints, scheduled jobs from NewRelic monitoring, update APM agent [SCI-11212] (#7987) 2024-10-23 16:58:03 +02:00
Martin Artnik
4859557212
Merge pull request #7986 from scinote-eln/revert-7782-revert-7678-ma_SCI_10809
Revert "Revert "Timeout slow libreoffice preview generation [SCI-10809]""
2024-10-22 15:33:02 +02:00