Commit graph

14398 commits

Author SHA1 Message Date
Martin Artnik bde1434923
Merge pull request #6245 from G-Chubinidze/gc_SCI_9300
Add activities for moving content between steps and results [SCI-9300]
2023-09-19 13:06:08 +02:00
Giga Chubinidze b414cc4295 fixed hound and changed logic for ove to marvin 2023-09-19 12:50:45 +04:00
Alex Kriuchykhin 2303b72f78
Merge pull request #6246 from lasniscinote/gl_SCI_9306
Fix ESLint config/install v.01 [SCI-9306]
2023-09-19 10:40:08 +02:00
Alex Kriuchykhin 7825433ac2
Merge pull request #6242 from rekonder/aj_SCI_9273
Insert the correct link for protocol parser import in the email notification [SCI-9273]
2023-09-19 09:54:05 +02:00
Gregor Lasnibat 7a6b4ed359 Fix ESLint config/install v.01 [SCI-9306]
Added yarn.lock [SCI-9306]
2023-09-19 09:27:29 +02:00
Giga Chubinidze 01e57e0395 Add activities for moving content between steps and results [SCI-9300] 2023-09-19 03:17:30 +04:00
aignatov-bio e34de5511a
Merge pull request #6241 from aignatov-bio/ai-sci-more-css-fixes
Fix css for protocol/results
2023-09-18 15:39:06 +02:00
Anton 6228a3bc00 Fix css for protocol/results 2023-09-18 15:35:27 +02:00
Andrej 5e4f156ae5 Insert correct link for protocol parser import in email notification [SCI-9273] 2023-09-18 15:30:11 +02:00
Martin Artnik 8784add939
Merge pull request #6240 from artoscinote/ma_SCI_9211
Fix report generation with text results [SCI-9211]
2023-09-18 15:07:05 +02:00
Martin Artnik 2f4b1ef7b0 Fix report generation with text results [SCI-9211] 2023-09-18 15:01:13 +02:00
Martin Artnik 9aa4274702
Merge pull request #6237 from lasniscinote/gl_SCI_9188
Fixed misplaced checkbox for archived task [SCI-9188]
2023-09-18 14:42:00 +02:00
ajugo 8c1292c8ab
Merge pull request #6239 from rekonder/aj_SCI_9288
Change dropdown options for importing protocols [SCI-9288]
2023-09-18 14:24:10 +02:00
Martin Artnik bced4afbae
Merge pull request #6238 from lasniscinote/gl_SCI_9192
Fixed styles for the clear button on activities [SCI-9192]
2023-09-18 14:09:04 +02:00
Gregor Lasnibat 6efdc75f45 Fixed misplaced checkbox for archived task [SCI-9188]
Fixed linter issues [SCI-9188]
2023-09-18 13:41:58 +02:00
Andrej aebea07be4 Change dropdown options for importing protocols [SCI-9288] 2023-09-18 13:15:55 +02:00
Gregor Lasnibat 90c85290d6 Fixed styles for the clear button on activities [SCI-9192]
PR fix 01 [SCI-9192]
2023-09-18 13:05:43 +02:00
Martin Artnik 1068f9b979
Merge pull request #6232 from ivanscinote/SCI-9235-table-horizontal-scroller-when-bottom-action-toolbar-is-opened
Make bottom scrollbar visible with action toolbar at inventories [SCI-9235]
2023-09-18 09:32:05 +02:00
Martin Artnik 8af515ae68
Merge pull request #6234 from G-Chubinidze/gc_SCI_9291
Missing modal when deleting an archived result [SCI-9291]
2023-09-18 09:31:47 +02:00
Giga Chubinidze 73c1f67510 Missing modal when deleting an archived result [SCI-9291] 2023-09-18 01:28:22 +04:00
Ivan Kljun 13715fa472 Make bottom scrollbar visible with action toolbar at inventories [SCI-9235] 2023-09-15 15:08:09 +02:00
Soufiane 0191b9e9ab
Fix wellplates reversed columns and rows headers [SCI-9071] (#6196)
- Fix well plates reversed columns and rows headers.
- Fix jumping when in edit mode.
- Fix disappearing columns after edit.
2023-09-15 14:52:36 +02:00
aignatov-bio 5258e55d00
Merge pull request #6230 from aignatov-bio/ai-sci-9265-update-flyouts-menu-task-results
Replace flyouts menu in protocol in results [SCI-9265]
2023-09-15 14:40:55 +02:00
Anton b0dc63ebb5 Replace flyouts menu in protocol in results [SCI-9265] 2023-09-15 12:39:56 +02:00
Alex Kriuchykhin 7f4b147a1f
Merge pull request #6204 from sboursen-scinote/sb_SCI-8126-fix
Fix issues with the you've reached the end of the list banner [SCI-8126]
2023-09-15 12:38:15 +02:00
Martin Artnik 160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +02:00
Martin Artnik 58d5192d1d
Merge pull request #6220 from ivanscinote/SCI-9190-new-already-read-comment-indicator
Fix comment-counter 'seen' badge color [SCI-9190]
2023-09-15 09:17:56 +02:00
Martin Artnik b8dcfb1988
Merge pull request #6223 from ivanscinote/SCI-9304-the-page-doesnt-refresh-when-the-task-status-is-transitioning-to-in-review
Add constants for status state polling [SCI-9304]
2023-09-15 09:17:34 +02:00
Martin Artnik cc1d179366
Merge pull request #6225 from rekonder/aj_SCI_9032
Fix gene sequence html compiling with deface [SCI-9302]
2023-09-15 09:15:25 +02:00
Andrej b9fe7c3d3e Fix gene sequence html compiling with deface [SCI-9032] 2023-09-14 17:10:52 +02:00
Ivan Kljun af18a42129 Add constants for status state polling [SCI-9304] 2023-09-14 16:21:17 +02:00
Alex Kriuchykhin 2504083157
Merge pull request #6221 from okriuchykhin/ok_SCI_9287
Fix user and team activities filters [SCI-9287]
2023-09-14 15:17:13 +02:00
aignatov-bio 1cb4f71db8
Merge pull request #6222 from aignatov-bio/ai-sci-fix-handsone-table-scroll
Fix handsone table scroll
2023-09-14 14:41:04 +02:00
Anton 0f4e561689 Fix handson table scrolling 2023-09-14 14:35:37 +02:00
Oleksii Kriuchykhin 45e9a459d7 Fix user and team activities filters [SCI-9287] 2023-09-14 14:22:01 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Ivan Kljun 9e3b6328a4 Fix comment-counter 'seen' badge color [SCI-9190] 2023-09-14 13:03:43 +02:00
Martin Artnik 31c0ddba7e
Merge pull request #6214 from artoscinote/ma_SCI_9286
Add new step buttons for protocol template, remove bottom new result button [SCI-9286]
2023-09-14 12:26:16 +02:00
Martin Artnik fd6ae82874
Merge pull request #6218 from artoscinote/ma_SCI_9295
Fix handson table rendering [SCI-9295]
2023-09-14 12:26:05 +02:00
aignatov-bio cd6bf3fad4
Merge pull request #6219 from aignatov-bio/ai-sci-task-result-css-fixes
Update protocol css
2023-09-14 12:25:00 +02:00
Anton 4dab80e814 Update protocol css 2023-09-14 12:12:15 +02:00
Alex Kriuchykhin d08c2d8bb0
Merge pull request #6101 from okriuchykhin/ok_SCI_9148
Hide from annotations projects where user is not assigned [SCI-9148]
2023-09-14 10:57:34 +02:00
Oleksii Kriuchykhin c649ad26f3 Hide from annotations projects where user is not assigned [SCI-9148] 2023-09-14 10:54:56 +02:00
Martin Artnik c3aab9c3a9 Fix handson table rendering [SCI-9295] 2023-09-14 10:52:08 +02:00
Martin Artnik 1421de018a
Merge pull request #6182 from G-Chubinidze/gc_SCI_9245
Ensure reports work with new results [SCI-9245]
2023-09-14 10:37:15 +02:00
Giga Chubinidze bf1a543e94 refactored to result orderable element assoc 2023-09-14 06:25:38 +04:00
Alex Kriuchykhin 40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration
Features/ove integration
2023-09-13 17:05:48 +02:00
wandji c2d6b4d960
Add option to disable save button when OVE editor is in readonly mode [SCI-9110] (#6111)
* Add option to disable save button when OVE editor is in readonly mode [SCI-9110]
2023-09-13 16:53:16 +02:00
ajugo efed11be3c
Remove cancel button in import protocol parser modals and fix wording [SCI-9284] (#6203) 2023-09-13 15:02:30 +02:00
Alex Kriuchykhin fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00