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
14258 commits 69 branches 179 tags 165 MiB
Commit graph

14258 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton 3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +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 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
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
Giga Chubinidze 46af9af0a9 Implement results expand/collapse, and expand/collapse all [SCI-9105] 2023-09-12 02:11:58 +04:00
Anton 982da48bbe Fix inline edit vue component [SCI-9254] 2023-09-11 17:15:00 +02:00
Anton 67c6d66ff1 Fixing inline edit [SCI-9254] 2023-09-11 15:58:53 +02:00
aignatov-bio daa708a840
Merge pull request #6183 from aignatov-bio/ai-sci-fix-css-task-results 
CSS fixed for task protocol
 2023-09-11 15:57:36 +02:00
Ivan Kljun cd892878db Merge remote-tracking branch 'upstream/features/september-release' into SCI-9010-rework-result-activities-to-be-aligned-with-step-activities 2023-09-11 15:38:46 +02:00
wandji 1631de67ea
Fix issue opening dropdown when typing [SCI-9172] (#6171) 2023-09-11 15:29:27 +02:00
Anton 3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Martin Artnik 8c3ff1813a
Merge pull request #6177 from artoscinote/ma_SCI_9267 
Fix attachment sorting in results [SCI-9267]
 2023-09-11 10:01:26 +02:00
Martin Artnik 266c78deb1
Merge pull request #6179 from artoscinote/ma_SCI_9278 
Disable move button in move content modal if there's no target selected [SCI-9278]
 2023-09-11 09:59:47 +02:00
Gregor Lasnibat b9cff2faff
Merge pull request #6181 from lasniscinote/gl_SCI_9226 
Fix shared task issues [SCI-9226]
 2023-09-11 09:59:07 +02:00
Martin Artnik b831b9aa12
Merge pull request #6105 from artoscinote/ma_SCI_9096 
Display show more for experiment description if there are more than 2 lines [SCI-9096]
 2023-09-11 09:39:06 +02:00
Martin Artnik f0c77b4e7d Disable move button in move content modal if there's no target selected [SCI-9278] 2023-09-08 16:26:29 +02:00
Martin Artnik ede9e40be8 Fix attachment sorting in results [SCI-9267] 2023-09-08 16:07:43 +02:00
Martin Artnik 520f978f35
Fix update of database settings values [SCI-9240] (#6174) 2023-09-08 14:45:39 +02:00
aignatov-bio cbb4e02e90
Merge pull request #6173 from aignatov-bio/ai-sci-9264-add-active-archive-switch-to-result-page 
Add active/archive switch to results page [SCI-9264]
 2023-09-08 13:47:44 +02:00
Anton 7b44a47d51 Add active/archive switch to results page [SCI-9264] 2023-09-08 13:42:02 +02:00
Martin Artnik 68bf78e0af
Merge pull request #6172 from G-Chubinidze/gc_SCI_9237 
Protocol template title is displayed in the grey area [SCI-9237]
 2023-09-08 13:31:13 +02:00
wandji e6252e09cc
Change consumption reposrt esport modal text [SCI-9194] (#6167) 2023-09-08 11:39:46 +02:00
Ivan Kljun 1242ec588f Add and fix result activities [SCI-9010] 2023-09-08 11:36:59 +02:00
Alex Kriuchykhin d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] (#6170) 2023-09-08 11:35:16 +02:00
Giga Chubinidze b436550ae9 Protocol template title is displayed in the grey area 2023-09-08 11:59:57 +04:00
Gregor Lasnibat d029b54291 Fix shared task issues [SCI-9226] 2023-09-08 00:03:01 +02:00
Martin Artnik 4abc2288b3
Merge pull request #6163 from artoscinote/ma_SCI_9244 
Fix global search to work with new results [SCI-9244]
 2023-09-07 14:17:06 +02:00
aignatov-bio 18a5fcd58f
Merge pull request #6161 from aignatov-bio/ai-sci-9249-add-step-text-title-to-protocol-print 
Add step text title to print protocol [SCI-9249]
 2023-09-07 14:16:09 +02:00
aignatov-bio 88a899449a
Merge pull request #6159 from aignatov-bio/ai-sci-9210-add-move-action-to-asset-card 
Add move action to asset thumbnail [SCI-9210]
 2023-09-07 14:15:23 +02:00
aignatov-bio 92749d5ec2
Merge branch 'features/september-release' into ai-sci-9210-add-move-action-to-asset-card 2023-09-07 14:15:17 +02:00
aignatov-bio 704749bd09
Merge pull request #6164 from aignatov-bio/ai-sci-9253-fix-permissions-on-results 
Fix permissions on results [SCI-9253]
 2023-09-07 14:14:37 +02:00
wandji a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] (#6092) 
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]

* Add consumption export modal and improve report generation [SCI-9023]

* Add repository_row association to repository_ledger_records [SCI-9023]
 2023-09-07 13:12:27 +02:00
Anton 53d08fe09d Fix permissions on results [SCI-9253] 2023-09-07 12:12:30 +02:00
aignatov-bio d2c0e3dca2
Merge pull request #6160 from aignatov-bio/ai-sci-9230-fix-navigator-css 
Fix navigator CSS [SCI-9230][SCI-9233]
 2023-09-07 12:03:07 +02:00
Martin Artnik bf7b1c2f2a Fix global search to work with new results [SCI-9244] 2023-09-07 11:43:45 +02:00
Martin Artnik 45c30be6d2 Fix rubocop config 2023-09-07 11:43:12 +02:00
Anton 170187a5e5 Add step text title to print protocol [SCI-9249] 2023-09-07 10:59:38 +02:00
Martin Artnik 722ef7cc0f
Merge pull request #6158 from ivanscinote/SCI-8592-long-name-experiment-modal 
Fix long name experiment modal [SCI-8592]
 2023-09-07 10:49:53 +02:00
Anton 8f9072f46e Fix navigator CSS [SCI-9230][SCI-9233] 2023-09-07 10:45:50 +02:00
Martin Artnik 70bdb870b5
Merge pull request #6124 from artoscinote/ma_SCI_9209 
Fix attachment deletion and image errors [SCI-9209]
 2023-09-07 10:37:41 +02:00
Martin Artnik d9e8be91d9
Merge pull request #6153 from artoscinote/ma_SCI_9212 
Fix status flow loading when modal opens [SCI-9212]
 2023-09-07 10:37:25 +02:00