scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
14361 commits 69 branches 179 tags 165 MiB
Commit graph

14361 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +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
ajugo 700df3525e
Fix special characters rendering for asset filenames [SCI-9242] (#6197) 2023-09-13 15:00:28 +02:00
wandji e0ed027211
Fix css issues in manage tags modal [SCI-9168] (#6208) 2023-09-13 15:00:04 +02:00
Martin Artnik a0fca943aa Add new step buttons for protocol template, remove bottom new result button [SCI-9286] 2023-09-13 14:57:03 +02:00
wandji 642e3b5ff4
Add link to knowledge base [SCI-9231] (#6190) 
* Add link to knowledge base [SCI-9231]

* Remove custom OVE help link [SCI-9231]
 2023-09-13 14:45:28 +02:00
aignatov-bio 110e2ced6c
Merge pull request #6213 from aignatov-bio/ai-sci-9296-fix-restore-archive-action 
Fix archive/restore results [SCI-9296]
 2023-09-13 14:37:09 +02:00
aignatov-bio f5b08ffb33
Merge pull request #6212 from aignatov-bio/ai-sci-9260-fix-new-office-in-results 
Fix office creation on results [SCI-9260]
 2023-09-13 14:36:23 +02:00
aignatov-bio 0e290fa2dc
Merge pull request #6211 from aignatov-bio/ai-sci-9271-fix-checklist-rearange 
Fix checklist rearrange [SCI-9271]
 2023-09-13 14:35:54 +02:00
aignatov-bio 4aaf3818d5
Merge pull request #6210 from aignatov-bio/ai-sci-9261-fix-activties-header-background 
Fix layout on task activities page [SCI-9261]
 2023-09-13 14:35:44 +02:00
aignatov-bio 59b545353a
Merge pull request #6209 from aignatov-bio/ai-sci-9149-fix-text-field-in-safari 
Fix text field width and table header [SCI-9149]
 2023-09-13 14:35:33 +02:00
Anton a8c660394f Fix archive/restore results [SCI-9296] 2023-09-13 14:34:49 +02:00
Anton d6ab6e15f8 Fix office creation on results [SCI-9260] 2023-09-13 14:30:00 +02:00
Anton 718013439d Fix checklist rearrange [SCI-9271] 2023-09-13 14:13:34 +02:00
Anton d34608d22c Fix layout on task activties page [SCI-9261] 2023-09-13 14:08:39 +02:00
Anton 3268a95ecf Fix text field width and table header [SCI-9149] 2023-09-13 14:03:49 +02:00
aignatov-bio ef3c916c00
Merge pull request #6205 from aignatov-bio/ai-sci-9262-add-three-dots-menu-for-elements 
Add flyout menu to step/results elements [SCI-9262]
 2023-09-13 13:49:33 +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 631d987b92
Merge pull request #5909 from G-Chubinidze/gc_SCI_8796 
Date range in filters allows start date to be after end date [SCI-8796]
 2023-09-13 13:37:03 +02:00
Martin Artnik 0d38a6870e
Merge pull request #6206 from artoscinote/ma_SCI_9293 
Remove obsolete CSS tag [SCI-9293]
 2023-09-13 13:08:56 +02:00
Martin Artnik ee5f77f8dd Remove obsolete CSS tag [SCI-9293] 2023-09-13 13:05:01 +02:00
Anton 3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +02:00
Martin Artnik 6a8f8cb419
Merge pull request #6194 from artoscinote/ma_SCI_9279 
Fix z-index issues with share modal [SCI-9279]
 2023-09-13 10:11:38 +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 c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285 
Fix result pagination, fix new step/result buttons [SCI-9285]
 2023-09-13 10:00:01 +02:00
aignatov-bio 637093f69e
Merge pull request #6188 from aignatov-bio/ai-sci-9254-fix-inline-edit 
Fix inline edit [SCI-9254]
 2023-09-13 09:59:50 +02:00
Martin Artnik 2fc4f3c033
Merge pull request #6168 from ivanscinote/SCI-9010-rework-result-activities-to-be-aligned-with-step-activities 
Add and fix result activities [SCI-9010]
 2023-09-13 09:51:08 +02:00
Martin Artnik 6114dd7afc Fix result pagination, fix new step/result buttons [SCI-9285] 2023-09-12 17:33:47 +02:00
Martin Artnik e359f373ea
Consumption export copy fixes [SCI-9281] (#6195) 2023-09-12 15:21:17 +02:00
Martin Artnik b78ed02bf4 Fix z-index issues with share modal [SCI-9279] 2023-09-12 14:11:34 +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
Martin Artnik 83f5facba6
Merge pull request #6191 from G-Chubinidze/gc_SCI_9105 
Implement results expand/collapse, and expand/collapse all [SCI-9105]
 2023-09-12 13:42:31 +02:00
Ivan Kljun c7123ebc8a Change result_* activities to *_old and create new ones [SCI-9010] 2023-09-12 09:45:34 +02:00
ajugo 4de09f4f9e
Merge pull request #6187 from sboursen-scinote/sb_SCI-8968-move-to-common 
Update OVE promo [SCI-8968]
 2023-09-12 09:38:43 +02:00
sboursen-scinote ba390d6239 Remove unecessary locals [SCI-8968] 2023-09-12 09:15:11 +02:00
G-Chubinidze 067d0ca51e
Merge branch 'features/september-release' into gc_SCI_9105 2023-09-12 02:19:02 +04:00
Giga Chubinidze 4dc8273a4e hound fix 2023-09-12 02:17:12 +04:00