Commit graph

5058 commits

Author SHA1 Message Date
Giga Chubinidze 3cee796ac6 added spacings between dots 2023-09-25 14:56:06 +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
Giga Chubinidze add1a55e0d Dot divider between steps/results 2023-09-22 05:25:33 +04: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
aignatov-bio af7bc2f11b
Merge pull request #6265 from aignatov-bio/ai-add-addons-to-tailwind
Add addons to tailwind and label fixes
2023-09-21 13:30:37 +02:00
Anton 97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00
Anton 3d43c791ad Fix input fields globaly 2023-09-21 11:38:58 +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 2ad0d3a65f
Merge pull request #6260 from G-Chubinidze/gc_SCI_9289
Result comments issues [SCI-9289]
2023-09-21 10:01:30 +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
Giga Chubinidze eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Giga Chubinidze f0fdfe2ea3 Result comments issues 2023-09-21 06:21:50 +04:00
Anton 4cc968bcb2 Filters modal fixes [SCI-9276] 2023-09-20 11:07:48 +02:00
Alex Kriuchykhin 825f0e839f
Merge pull request #6250 from lasniscinote/gl_SCI_9226
Fixed breaking table in shared view [SCI-9226]
2023-09-19 14:33:26 +02:00
Anton ab8deeb181 Fix legacy inline editing [SCI-9274] 2023-09-19 13:17:23 +02:00
Gregor Lasnibat ddc17c912f Fixed breaking table in shared view [SCI-9226] 2023-09-19 12:49:02 +02: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
Gregor Lasnibat 7a6b4ed359 Fix ESLint config/install v.01 [SCI-9306]
Added yarn.lock [SCI-9306]
2023-09-19 09:27:29 +02: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
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
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
Ivan Kljun 13715fa472 Make bottom scrollbar visible with action toolbar at inventories [SCI-9235] 2023-09-15 15:08:09 +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 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
Ivan Kljun af18a42129 Add constants for status state polling [SCI-9304] 2023-09-14 16:21:17 +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
Anton 4dab80e814 Update protocol css 2023-09-14 12:12:15 +02:00
Alex Kriuchykhin fae428e305
Fix OVE file preview from imported .eln [SCI-9263] (#6200) 2023-09-13 15:00:52 +02:00
wandji e0ed027211
Fix css issues in manage tags modal [SCI-9168] (#6208) 2023-09-13 15:00:04 +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
Ivan Kljun 01a909c9e7 Fix eye icon placement in password fields [SCI-9217] 2023-09-13 14:16:52 +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
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
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
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
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
wandji 1631de67ea
Fix issue opening dropdown when typing [SCI-9172] (#6171) 2023-09-11 15:29:27 +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
Martin Artnik e74597d112 Keep asset image tooltip aspect ratio [SCI-9277] 2023-09-08 16:17:02 +02: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 93a1c842d9 Fix styles for input in OVE/Marvin editor [SCI-9256] 2023-09-07 15:42: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
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 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 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
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
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
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
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
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
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
Ivan Kljun a6abfc7e31 Applying hound suggestions [SCI-9016] 2023-09-05 13:39:21 +02:00
Alex Kriuchykhin f0fe040932
Fix OVE asset preview reloading after update [SCI-9112] (#6122) 2023-09-05 11:36:37 +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
Anton 86f413cc71 Add title to text component [SCI-9141] 2023-09-04 14:13:29 +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
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
Martin Artnik 3724a4a067 Merge branch 'develop' into features/september-release 2023-09-01 10:30:48 +02:00
Giga Chubinidze 100fdde5ca Placeholder text in the "Move to different result" modal dropdown 2023-09-01 11:49:43 +04: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
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
Anton e9cd01467d Add custom colors to tailwind config [SCI-9124] 2023-08-30 13:21:51 +02:00