scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
14640 commits 70 branches 179 tags 165 MiB
Commit graph

11548 commits

Author SHA1 Message Date
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
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
wandji20 996e3b1d9a Fix issue loading iframe modal in session_layouts [SCI-9310] 2023-09-18 10:28:19 +01:00
Alex Kriuchykhin ad4a4412f7
Merge pull request #6233 from rekonder/aj_SCI_9301 
Move OVE trial period handling [SCI-9301]
 2023-09-18 09:41:24 +02:00
Andrej 4c7cd5dd10 Change check if open vector editor is enabled [SCI-9301] 2023-09-18 09:40:16 +02:00
Martin Artnik fa53a0a049 Fix handson table rendering [SCI-9295] 2023-09-18 09:37:18 +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
Giga Chubinidze 73c1f67510 Missing modal when deleting an archived result [SCI-9291] 2023-09-18 01:28:22 +04:00
Andrej 9f672ecfe2 Move OVE trial period handling [SCI-9301] 2023-09-15 16:07:10 +02: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
Oleksii Kriuchykhin 4e16d702bd Fix next page loading for global and task activities [SCI-9175] 2023-09-15 12:34:27 +02:00
Martin Artnik 94db5c1155
Merge pull request #6227 from lasniscinote/gl_SCI_9294 
Fix wrong OVE view file size after editing [SCI_9294]
 2023-09-15 12:32:16 +02:00
Gregor Lasnibat 415e7338f7 Fix wrong OVE view file size after editing [SCI_9294] 2023-09-15 11:50:13 +02:00
Martin Artnik 18072bbde7 Fix update of database settings values [SCI-9240] 2023-09-15 11:04:13 +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 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
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
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
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
Ivan Kljun 01a909c9e7 Fix eye icon placement in password fields [SCI-9217] 2023-09-13 14:16:52 +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 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
sboursen-scinote f436f7912c Fix issues with the you've reached the end of the list banner [SCI-8126] 2023-09-13 12:11:43 +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 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
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
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
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
Alex Kriuchykhin a07174ed78
Fix disabling buttons on submit for remote forms [SCI-9241] (#6184) 2023-09-11 15:22:25 +02:00
Ivan Kljun dfaa91c682 Fixed shared task to work with new results [SCI-9250] 2023-09-11 15:19:22 +02:00
Anton 3f12f91b4a CSS fixed for task protocol 2023-09-11 12:19:21 +02:00
Giga Chubinidze a11a879d90 Ensure reports work with new results [SCI-9245] 2023-09-11 12:13:22 +04: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
wandji a3dd30d218
Load OVE packages via yarn [SCI-9231] (#6176) 
* Add OVE yarn package and load assets from node_modules [SCI-9231]

* Move hardcoded text to i18 [SCI-9231]
 2023-09-11 09:50:05 +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 e74597d112 Keep asset image tooltip aspect ratio [SCI-9277] 2023-09-08 16:17:02 +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
Gregor Lasnibat c82a1b1108 Fix shared task issues [SCI-9226] 2023-09-07 21:04:01 +02:00
Gregor Lasnibat 5ad6b27f9c
Merge pull request #6169 from lasniscinote/gl_SCI_9256 
Fix styles for input in OVE/Marvin editor [SCI-9256]
 2023-09-08 10:19:59 +02:00
wandji 8e4dbbac58
Remove name when loading ove file [SCI-9169] (#6165) 2023-09-07 17:19:09 +02:00
Gregor Lasnibat 93a1c842d9 Fix styles for input in OVE/Marvin editor [SCI-9256] 2023-09-07 15:42:37 +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 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
Gregor Lasnibat 6934ae38aa Fix wrong OVE file size [SCI-9243] 2023-09-07 11:36:17 +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
Anton 7af03bd651 Add move action to asset thumbnail [SCI-9210] 2023-09-07 10:33:33 +02:00
Ivan Kljun 368a6f62ea Fix long names also for canvas view modal [SCI-8592] 2023-09-07 10:09:18 +02:00
Giga Chubinidze 13fc4cceb1 hound fix 2023-09-07 03:59:11 +04:00
Giga Chubinidze c071eb4c16 Implement inline edit design changes for legacy inline edit (PET titles, etc.) 2023-09-07 03:56:42 +04:00
wandji a25e6fdda3
Add sorting options to experiment task table view [SCI-9120] (#6102) 2023-09-06 16:14:17 +02:00
Martin Artnik f22d777c2c Fix status flow loading when modal opens [SCI-9212] 2023-09-06 15:33:58 +02:00
Anton 1247406055 Add archive view to results [SCI-9223] 2023-09-06 15:06:27 +02:00
Alex Kriuchykhin 60f9814eca
Fix failed_delivery_notifiable_job concern naming [SCI-9119] (#6151) 2023-09-06 14:58:30 +02:00
G-Chubinidze 3976e05042
Merge branch 'features/september-release' into gc_SCI_9178 2023-09-06 16:38:25 +04:00
Giga Chubinidze 44cb0db41a removed object constantization 2023-09-06 16:36:26 +04:00
Martin Artnik 1e49cc5608
Merge pull request #6149 from G-Chubinidze/gc_SCI_9187 
Implement type-to-search functionality in the "Move to different results" modal [SCI-9187]
 2023-09-06 14:31:05 +02:00
Giga Chubinidze 76b7c45021 Implement type-to-search functionality in the 'Move to different result' modal [SCI-9187] 2023-09-06 16:12:31 +04:00
Gregor Lasnibat c030d2b6d1 Fix missing paperclip icon for file attachment [SCI-9224] 2023-09-06 13:52:03 +02:00
Alex Kriuchykhin eea24a69e9
Add FailureNotifiableJob jobs concerns for creating failure notifications for users [SCI-9119] (#6147) 2023-09-06 12:51:34 +02:00
Gregor Lasnibat f172c97a79 Fix missing OVE file preview [SCI-9214] 2023-09-06 12:45:42 +02:00
wandji d671471b44
Add autofocus to 2fa input field [SCI-9069] (#6145) 2023-09-06 12:40:58 +02:00
wandji dfce1e1382
Fix issue previewing large image after edit [SCI-8914] (#6143) 2023-09-06 11:43:51 +02:00
Martin Artnik 3b3e3cdc46
Merge pull request #6138 from ivanscinote/SCI-8592-long-name-experiment-modal 
Fix long names being cut off at move task modal [SCI-8592]
 2023-09-06 11:39:26 +02:00
Martin Artnik 33cd529967
Merge pull request #6144 from G-Chubinidze/gc_SCI_8798_v2 
Remove text when option is chosen in dropdown selector in add member to team [SCI-8798]
 2023-09-06 11:38:56 +02:00
wandji d5deb4fa52
Allow non-automatic user_assignments to be updated whe n user role is changed [SCI-9173] (#6137) 2023-09-06 11:06:22 +02:00
aignatov-bio b5883178a4
Merge pull request #6123 from ivanscinote/SCI-9016-inline-edit-component-ui-rework 
Rework inline edit vue component UI [SCI-9016]
 2023-09-06 10:49:18 +02:00
aignatov-bio 218b853577
Merge pull request #6139 from artoscinote/ma_SCI_9212 
Fix status flow modal to work across multiple pages [SCI-9212]
 2023-09-06 10:34:31 +02:00
Giga Chubinidze 6ade210728 Remove text when option is chosen in dropdown selector in add member to team [SCI-8798] 2023-09-05 19:07:18 +04:00
Giga Chubinidze 5a6202aea2 Unable to create a MarvinJS attachment [SCI-9178] 2023-09-05 18:29:15 +04:00
Anton 48b89fc699 Fix activities for results [SCI-9206][SCI-9205][SCI-9207] 2023-09-05 16:25:21 +02:00
Ivan Kljun c2b686324f Fix long names being cut off at move task modal [SCI-8592] 2023-09-05 15:58:50 +02:00
Martin Artnik 914697d4bf Fix status flow modal to work across multiple pages [SCI-9212] 2023-09-05 15:54:53 +02:00
Martin Artnik 94932d0b04 Fix attachment deletion and image errors [SCI-9209] 2023-09-05 14:43:16 +02:00
aignatov-bio 7a32703c1a
Merge branch 'features/september-release' into ai-sci-9088-add-attachments-move-ability 2023-09-05 14:41:23 +02:00
aignatov-bio 647fb76910
Merge branch 'features/september-release' into ai-sci-9108-add-infinite-scroll 2023-09-05 14:40:03 +02:00
aignatov-bio c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields 
Add title to text component [SCI-9141]
 2023-09-05 14:32:42 +02:00
aignatov-bio c3a5bf2e37
Merge pull request #6136 from aignatov-bio/ai-sci-9195-fix-tinymce-sticky-header 
Fix tinymce header [SCI-9195]
 2023-09-05 14:31:20 +02:00
Ivan Kljun a6abfc7e31 Applying hound suggestions [SCI-9016] 2023-09-05 13:39:21 +02:00
Oleksii Kriuchykhin 2c816cf463 Merge branch 'release/1.28.0' into develop 2023-09-05 12:54:37 +02:00
Alex Kriuchykhin 5928f708e1
Remove user controlled method execution from connected_accounts controller, add Okta unlinking functionality [SCI-9220] (#6135) 2023-09-05 12:53:51 +02:00
Anton b4659e88a9 Fix tinymce header [SCI-9195] 2023-09-05 12:06:48 +02:00
Alex Kriuchykhin 90cd330126
Fix removing user from public projects [SCI-9174] (#6130) 2023-09-05 11:36:26 +02:00
Ivan Kljun 86e2cfe747 Merge remote-tracking branch 'upstream/features/september-release' into SCI-9016-inline-edit-component-ui-rework 2023-09-05 11:31:30 +02:00
artoscinote 8d352b758a
Merge pull request #6133 from ivanscinote/SCI-9182-rearranging-content-within-a-result-modal-translation 
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
 2023-09-05 11:09:08 +02:00
Ivan Kljun 56744e2dcd Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182] 2023-09-05 11:02:39 +02:00
artoscinote c59ee1c358
Merge pull request #6132 from G-Chubinidze/gc_SCI_9179 
Archiving results doesn't work [SCI-9179]
 2023-09-05 10:53:43 +02:00
Giga Chubinidze b7da98c1dd Archiving results doesn't work [SCI-9179] 2023-09-05 11:55:15 +04:00
artoscinote cdfe9aaa0c
Revert "Don't display icons in fields with errors (alignment issues) [SCI-9217]" 2023-09-05 09:21:40 +02:00
Oleksii Kriuchykhin 7b40b43922 Merge branch 'release/1.28.0' into develop 2023-09-04 16:01:46 +02:00
Alex Kriuchykhin df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] (#6129) 2023-09-04 15:56:17 +02:00
Martin Artnik cc29ca4cce Don't display icons in fields with errors (alignment issues) [SCI-9217] 2023-09-04 15:17:22 +02:00
Ivan Kljun 54a8552901 Fix my_module_results_path and add id to experiments/tablejs tag [SCI-911] 2023-09-04 14:23:55 +02:00
Anton 86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +02:00
Giga Chubinidze 3b8669ed84 Add timestamps to results [SCI-9181] 2023-09-04 11:40:32 +04:00
Gregor Lasnibat b382bb441e Fix save empty OVE [SCI-9193] 2023-09-02 06:44:30 +02:00
lasniscinote 178d46dfae
Merge pull request #6134 from lasniscinote/gl_SCI_9213 
Fix gene sequence attachment icons [SCI-9213]
 2023-09-05 12:58:19 +02:00
Alex Kriuchykhin f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +02:00
Gregor Lasnibat 589faef72f Fix gene sequence attachment icons [SCI-9213] 2023-09-02 03:14:51 +02:00
Ivan Kljun 40638dbb63 Rework inline edit vue component UI [SCI-9016] 2023-09-01 17:18:13 +02:00
Martin Artnik cb023cd9c8 Add back status_flow.scss, deleted by accident 2023-09-01 13:59:58 +02:00
wandji c46c2ee9d6
Detach the File name changes from changing filename inside the OVE [SCI-9169] (#6116) 2023-09-01 13:54:41 +02:00
artoscinote dc535bce52
Merge pull request #6121 from G-Chubinidze/gc_SCI_9186 
Button translation in the "Move to different result" Modal [sci-9186]
 2023-09-01 11:40:57 +02:00
artoscinote 7b73e03a5f
Merge pull request #6120 from G-Chubinidze/gc_SCI_9185 
Placeholder text in the "Move to different result" modal dropdown [SCI-9185]
 2023-09-01 11:40:34 +02:00
Giga Chubinidze b71323d720 changed object mutation/changed placeholder check 2023-09-01 13:37:48 +04:00
artoscinote 51227b5c65
Merge pull request #6119 from G-Chubinidze/gc_SCI_9081 
Placeholder text (titles, description field) [SCI-9081]
 2023-09-01 11:02:06 +02:00
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
wandji bed7f574f0
Hide align toolbar option in OVE editor [SCI-9113] (#6113) 
* Hide align toolbar option in OVE editor [SCI-9113]

* Hide alligment toolbar in OVE editor [SCI-9113]
 2023-09-01 10:18:36 +02:00
Giga Chubinidze 6db9134065 Button translation in the "Move to different result" Modal 2023-09-01 11:59:56 +04:00
Giga Chubinidze 100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04:00
artoscinote 19026b936d
Merge pull request #6117 from artoscinote/ma_SCI_9180 
Fix result assets when duplicating [SCI-9180]
 2023-08-31 16:00:50 +02:00
Anton d2ffaa209c Fix results CSS [SCI-9177] 2023-08-31 15:53:38 +02:00
Oleksii Kriuchykhin b4eb4d38e6 Merge branch 'develop' into features/ove-integration 2023-08-31 15:52:38 +02:00
Martin Artnik 65e55acc06 Fix result assets when duplicating [SCI-9180] 2023-08-31 15:38:56 +02:00
wandji 167abe5239
Add .json extension to OVE import tooltip [SCI-9116] (#6112) 
* Add .json extension to OVE import tooltip [SCI-9116]

* Override import and downlod tooltip values [SCI-9116]
 2023-08-31 12:51:49 +02:00
Alex Kriuchykhin d63ec9f927
Fix shareable links association on user model [SCI-9200] (#6114) 2023-08-31 11:48:35 +02:00
artoscinote 142504743d
Merge pull request #6109 from artoscinote/ma_SCI_9107 
Fix up result element duplicate endpoints [SCI-9107]
 2023-08-30 15:59:39 +02:00
Anton 2d76e628be Add infinite scroll to results [SCI-9108] 2023-08-30 15:51:23 +02:00
G-Chubinidze 7a1b1b5cf5
UI rework of thumbnail view asset controls [SCI-9015] (#6104) 
* UI rework of thumbnail view asset controls [SCI-9015]

* styling change css -> tailwind
 2023-08-30 15:42:55 +02:00
Martin Artnik 8245ad9738 Fix up result element duplicate endpoints [SCI-9107] 2023-08-30 14:54:38 +02:00
Alex Kriuchykhin fd58a23e55
Handle situations when file preview was not yet generated for shared tasks [SCI-9183] (#6106) 2023-08-30 13:30:12 +02:00
Martin Artnik c6e8bc1d2a Fix TinyMCE sticky header calculation [SCI-9184] 2023-08-30 13:28:36 +02:00
Anton e9cd01467d Add custom colors to tailwind config [SCI-9124] 2023-08-30 13:21:51 +02:00
Martin Artnik 9c1948998d Revert "Fix Protocols.io modal not loading any protocols [SCI-9167]" 
This reverts commit 983daa0e67.
 2023-08-30 13:09:20 +02:00
aignatov-bio f5235a9b9d
Merge pull request #6097 from aignatov-bio/ai-sci-8980-scrolling-on-task-page 
Add sticky scrolling to task page [SCI-8980]
 2023-08-30 11:54:28 +02:00
Anton c496d2c763 Fix transaction rollback [SCI-9088] 2023-08-30 11:48:16 +02:00
Anton 6a287fa54f Add sticky scrolling to task page [SCI-8980] 2023-08-30 11:09:27 +02:00
wandji 645b6dbe16
Add sort options to dashboard current task dropdown [SCI-9121] (#6103) 2023-08-30 09:51:41 +02:00
Martin Artnik d6ffb326d1 Display show more for experiment description if there are more than 2 lines [SCI-9096] 2023-08-29 17:03:34 +02:00
artoscinote ffb8c7c455
Merge pull request #6100 from scinote-eln/hotfix/1.28.0.2 
Hotfix/1.28.0.2
 2023-08-29 16:31:04 +02:00
artoscinote fabc9ddd1d
Merge pull request #6099 from okriuchykhin/ok_SCI_9170 
Add CSP tag to sign_in_halt layout [SCI-9170]
 2023-08-29 16:29:38 +02:00
Oleksii Kriuchykhin 75890a0053 Add CSP tag to sign_in_halt layout [SCI-9170] 2023-08-29 16:26:33 +02:00
Ivan Kljun d5066c1a5d Fix task status color on exp. list view [SCI-9159] 2023-08-29 16:12:00 +02:00
sboursen-scinote 983daa0e67 Fix Protocols.io modal not loading any protocols [SCI-9167] 
The JavaScript responsible for loading the list was attached to a
Partial that by itself was loaded using and AJAX request. Therefore,
The JavaScript was not being executed (no page reload). It was thus moved
to the parent partial (loaded on page reload) and called when the required
HTML is appended to the DOM.
 2023-08-29 14:26:07 +02:00
artoscinote 30cb9b0697
Fix RTE images in exports [SCI-9164] (#6095) 2023-08-29 13:50:43 +02:00
aignatov-bio e75d846930
Merge pull request #6085 from sboursen-scinote/sb_SCI-9138 
Fix description text area when creating a new team [SCI-9138]
 2023-08-29 10:33:06 +02:00
artoscinote c955c235d2
Fix user assignment endpoints [SCI-9150] (#6094) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-29 10:32:39 +02:00
artoscinote bb3a2f1c24
Fix applying resizable class [SCI-9137] (#6093) 2023-08-29 10:20:46 +02:00
aignatov-bio e8f839d719
Merge pull request #6088 from aignatov-bio/ai-sci-8977-ui-revamp-filters-modal 
Revamp filters flyouts [SCI-8977]
 2023-08-29 10:18:54 +02:00
wandji c80e99bdbc
Add protocol activity group for protocol step sequence assets [SCI-9087] (#6078) 2023-08-29 09:42:51 +02:00
sboursen-scinote 9f05f6d28b Fix description text area when creating a new team [SCI-9138] 2023-08-28 20:51:03 +02:00
aignatov-bio 1f382be2ca
Merge pull request #6091 from aignatov-bio/ai-sci-9144-fix-marvinjs-on-steps 
Fix marvinJS button initialisation [SCI-9144]
 2023-08-28 15:59:50 +02:00
Anton eb44724ece Fix marving JS button initialization [SCI-9144] 2023-08-28 15:53:58 +02:00
aignatov-bio 0cbcfadec9
Merge pull request #6090 from aignatov-bio/ai-sci-9149-fix-tinymce-in-safari 
Fix tinymce in safari [SCI-9149]
 2023-08-28 15:20:24 +02:00
Anton 8d7aa2aba5 Fix tinymce in safari [SCI-9149] 2023-08-28 15:17:15 +02:00
artoscinote 90f23cc61c
Fix API endpoints for user assignments [SCI-9150] (#6089) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-28 15:13:30 +02:00
Alex Kriuchykhin 165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] (#6086) 2023-08-28 14:53:09 +02:00
Anton 171a996aec Revamp filters flyouts [SCI-8977] 2023-08-28 13:15:41 +02:00
G-Chubinidze bbffce5e03
Placeholder text (titles, description field) [SCI-9081] (#6087) 
* Placeholder text (titles, description field) [SCI-9081]

* removed serializer code

* Update table.vue
 2023-08-28 10:36:40 +02:00
Giga Chubinidze 0e2f9ff81d removed serializer code 2023-08-28 12:14:44 +04:00
artoscinote 953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors 
Update 'Not started' status color at reports [SCI-9007]
 2023-08-28 09:56:25 +02:00
Alex Kriuchykhin a7aa06d18a
Fix error handling on new folder and project edit modals [SCI-9135] (#6082) 2023-08-28 09:37:11 +02:00
Giga Chubinidze 6d8d804c71 Placeholder text (titles, description field) [SCI-9081] 2023-08-28 10:32:08 +04:00
ajugo db4aa53f72
Merge pull request #5993 from sboursen-scinote/sb_SCI-9038 
Set sequence attachments file icon [SCI-9038]
 2023-08-25 21:53:22 +02:00
Ivan Kljun 90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
Anton 6615c01cb4 Add input field with search history [SCI-9102] 2023-08-25 15:02:27 +02:00
wandji f4c48fe907
Fix label templates datatables height overflow [SCI-8559] (#6083) 2023-08-25 14:23:05 +02:00
Soufiane a19ab3b519
Fix OVE CSS issues [SCI-9114] (#6081) 
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
 2023-08-25 14:22:37 +02:00
sboursen-scinote 195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
sboursen-scinote 0d7c9862ee Set sequence attachment icons [SCI-9038] 
- Fix edit action
- Add OVE icon to step attachment
- Add OVE icon to global search results
 2023-08-25 13:53:57 +02:00
Alex Kriuchykhin ac159c29ed
Fix task card due date setup modal [SCI-9139] (#6080) 2023-08-25 13:08:50 +02:00
wandji 61da3a12b9
Add menubar to ove editor [SCI-9115] (#6079) 
* Add menubar to ove editor [SCI-9115]
 2023-08-25 11:36:33 +02:00
Anton e66968357a Fix hound 2023-08-25 09:46:53 +02:00
ajugo 103b62798b
Return error if label template preview image is nil [SCI-9070] (#6077) 2023-08-24 16:45:34 +02:00
ajugo 5ea31337b7
Remove SSO buttons on forgotten password screen [SCI-9049] (#6076) 2023-08-24 16:44:04 +02:00
Soufiane e00a8bb7a3
Update logo across Scinote [SCI-8997] (#6058) 
- Update logo in PDF reports
- Update logo in Docx reports
- Update logo in sign-in page
 2023-08-24 16:27:33 +02:00
Anton f31d2b8912 Add move ability to attachments [SCI-9088] 2023-08-24 15:57:03 +02:00
Soufiane bed603c5d5
Fix design of sign in and signature modal [SCI-9109] (#6074) 2023-08-24 15:50:05 +02:00