Commit graph

4342 commits

Author SHA1 Message Date
Giga Chubinidze 07ce65f5e6 DOCX not working if result name empty. 2023-09-29 10:38:27 +04:00
Martin Artnik 3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
Anton 6c8447beac Fix status color 2023-09-22 14:46:10 +02:00
Alex Kriuchykhin 50a87b1562
Merge pull request #6235 from wandji20/wb-SCI-8914
Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]
2023-09-22 14:14:38 +02:00
Anton ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
wandji20 3dd7d0fdb3 Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914] 2023-09-22 09:36:07 +01:00
sboursen-scinote adc0a460bd Improve logic for custom logos on error pages [SCI-9147]
- Switch to dynamic ERB templates.
- Move text to I18n
2023-09-22 10:26:32 +02:00
Alex Kriuchykhin 5cc41451cd
Merge pull request #6254 from sboursen-scinote/sb_SCI-9133
Fix missing icon files in exported projects [SCI-9133]
2023-09-21 17:12:08 +02:00
sboursen-scinote aa769f92f7 Fix missing icon files in exported projects [SCI-9133] 2023-09-21 15:11:02 +02:00
Anton 97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00
aignatov-bio 2ab4d2b8dc
Merge pull request #6263 from aignatov-bio/ai-sci-9319-update-protocol-template-screen
Update protocol template screen [SCI-9319]
2023-09-21 10:39:16 +02:00
Anton 40144ea33f Update protocol template screen [SCI-9319] 2023-09-21 10:37:58 +02:00
aignatov-bio ecd00a4f4f
Merge pull request #6262 from aignatov-bio/ai-sci-9342-fix-task-details-section-css
Task details css fixes [SCI-9342]
2023-09-21 10:20:00 +02:00
Martin Artnik 810e0ffaff
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269
CSS: Results revamp issues [SCI-9269]
2023-09-21 10:00:14 +02:00
Anton ce2d91025c Task details css fixes [SCI-9342] 2023-09-21 09:48:46 +02:00
Alex Kriuchykhin 04e191e377
Merge pull request #6259 from wandji20/wb-SCI-9191
Fix issue displaying long tables protocol description in import modal [SCI-9191]
2023-09-21 09:26:25 +02:00
Giga Chubinidze eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Alex Kriuchykhin 8e1f8296f4
Merge pull request #6243 from rekonder/aj_SCI_9272
Fix message for successful import protocol from protocol parser [SCI-9272]
2023-09-20 19:36:12 +02:00
wandji20 ca8e6d88dc Fix issue displaying long tables protocol description in impor modal [SCI-9191] 2023-09-20 15:04:10 +01:00
Martin Artnik 5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348
Clean up legacy comment logic [SCI-9348]
2023-09-20 13:10:28 +02:00
Martin Artnik 44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton d46ee2adf6 Fix task secondary navigation on small screens [SCI-9305] 2023-09-20 12:30:15 +02:00
Andrej b47651750b Fix message for successful import protocol from protocol parser [SCI-9272] 2023-09-19 15:47:51 +02:00
aignatov-bio dcce202f78
Merge pull request #6248 from aignatov-bio/ai-sci-9274-fix-legacy-inline-editing
Fix legacy inline editing [SCI-9274]
2023-09-19 13:49:13 +02:00
aignatov-bio 5626bdef4b
Merge pull request #6247 from aignatov-bio/ai-sci-9260-fix-wopi
Fix wopi and pdf preview [SCI-9260]
2023-09-19 13:17:42 +02:00
Anton ab8deeb181 Fix legacy inline editing [SCI-9274] 2023-09-19 13:17:23 +02:00
Anton 370508304b Fix wopi and pdf preview [SCI-9260] 2023-09-19 12:44:28 +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
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
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
Andrej 9f672ecfe2 Move OVE trial period handling [SCI-9301] 2023-09-15 16:07:10 +02:00
Martin Artnik 160d9775d8 Merge branch 'develop' into features/september-release 2023-09-15 10:40:55 +02:00
Andrej b9fe7c3d3e Fix gene sequence html compiling with deface [SCI-9032] 2023-09-14 17:10:52 +02:00
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +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
wandji e0ed027211
Fix css issues in manage tags modal [SCI-9168] (#6208) 2023-09-13 15:00:04 +02:00
Anton d34608d22c Fix layout on task activties page [SCI-9261] 2023-09-13 14:08:39 +02:00
Martin Artnik cb28c4d566
Merge pull request #6185 from ivanscinote/SCI-9250-fix-shared-task-with-new-results
Fixed shared task to work with new results [SCI-9250]
2023-09-13 13:43:30 +02:00
Martin Artnik ee5f77f8dd Remove obsolete CSS tag [SCI-9293] 2023-09-13 13:05:01 +02:00
Martin Artnik 7bb5305b14
Merge pull request #6193 from artoscinote/ma_SCI_9096
Fix displaying the 'more' link for multiline experiment description [SCI-9096]
2023-09-13 10:00:38 +02:00
Martin Artnik 08157cd8a1 Fix displaying the 'more' link for multiline experiment description [SCI-9096] 2023-09-12 13:50:02 +02:00
wandji 58bce55f91
Fix css issues in manage tags modal [SCI-9168] (#6189) 2023-09-12 13:46:22 +02:00
sboursen-scinote bebae64944 Update OVE promo [SCI-8968]
- Move OVE promo to addons
- Update text and style of the promo
- Fix the iFrame closing logic
2023-09-11 16:42:50 +02:00