Commit graph

1249 commits

Author SHA1 Message Date
Alex Kriuchykhin 112e642a21
Merge pull request #6340 from lasniscinote/gl_SCI_9419
Fixed Protocol templates missing additional options for steps [SCI-9419]
2023-10-03 15:29:10 +02:00
Gregor Lasnibat 6724a31256 Fixed Protocol templates missing additional options for steps [SCI-9419] 2023-10-03 15:03:37 +02:00
Alex Kriuchykhin 8cc72cb05e
Merge pull request #6334 from wandji20/wb-SCI-9359
Update OVE package and fix bug opening github issue link [SCI-9359]
2023-10-03 12:51:15 +02:00
wandji20 4f5ecf66f4 Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-03 09:54:54 +01:00
Martin Artnik b4ce0dda60
Merge pull request #6316 from artoscinote/ma_SCI_9400
Add back version modal link [SCI-9400]
2023-10-03 10:54:47 +02:00
Alex Kriuchykhin 40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386
Refactor export stock consumption modal [SCI-9386]
2023-10-03 10:33:00 +02:00
Andrej 835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Andrej 1aa9091e0d Fix protocol parser import button closing [SCI-9275] 2023-10-03 09:13:20 +02:00
Martin Artnik a2870dd9d1 Add back version modal link [SCI-9400] 2023-10-02 14:31:28 +02:00
Alex Kriuchykhin 20be895938
Merge pull request #6325 from rekonder/aj_SCI_9275
Fix closing of the dropdown menu for protocol parser import [SCI-9275]
2023-10-02 13:58:50 +02:00
Alex Kriuchykhin c4f646ef78
Merge pull request #6324 from rekonder/aj_SCI_9409
Fix marvinjs loading and speedup creating of the wopi files [SCI-9409]
2023-10-02 13:58:30 +02:00
Andrej 4cf6d225ca Fix closing of the dropdown menu for protocol parser improt [SCI-9275] 2023-10-02 08:57:26 +02:00
Andrej e1ca9175b7 Fix marvinjs loading and speedup creating of the wopi files [SCI-9409] 2023-10-02 08:32:50 +02:00
Martin Artnik 4f2f5d156b Fix linked protocol info button position [SCI-9328] 2023-09-29 11:45:04 +02:00
Martin Artnik 82b9b676b6 Fix linked protocol dropdown [SCI-9328] 2023-09-28 15:40:48 +02:00
Martin Artnik 3ce0779663
Merge pull request #6290 from ivanscinote/SCI-9344-sticky-toolbar-issues
Fix results sticky toolbar [SCI-9344]
2023-09-27 14:03:12 +02:00
Martin Artnik 923006dc38
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
2023-09-27 12:41:34 +02:00
Martin Artnik 187c8b12f9
Merge pull request #6296 from ivanscinote/SCI-9346-cannot-insert-a-chemical-drawing-into-results
Add hidden element to support legacy code for MarvinJS at results [SCI-9346]
2023-09-27 10:43:25 +02:00
Alex Kriuchykhin 9f03d88f12
Merge pull request #6201 from wandji20/wb-SCI-9225
Improve UI for stock consumption export [SCI-9225]
2023-09-27 09:21:22 +02:00
Anton f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +02:00
wandji20 213c752941 Improve UI for for exports in inventory with stock enabled [SCI-9225] 2023-09-26 15:20:18 +01:00
Ivan Kljun 1373994559 Fix results sticky toolbar [SCI-9344] 2023-09-26 12:20:49 +02:00
Andrej 9641c75a4a Merge branch 'develop' of https://github.com/scinote-eln/scinote-web into aj_SCI_9275 2023-09-26 11:23:25 +02:00
Ivan Kljun f16354e498 Add hidden element to support legacy code for MarvinJS at results [SCI-9346] 2023-09-26 10:09:45 +02:00
Anton 2b9ae65a51 Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379] 2023-09-25 15:04:41 +02:00
Anton 2b676f249b Css Fixes 2023-09-25 14:15:08 +02:00
Martin Artnik 3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
aignatov-bio 647d94bebc
Merge pull request #6279 from aignatov-bio/ai-sci-9343-improve-flyouts
Fixes for new flyout [SCI-9343]
2023-09-25 10:15:11 +02:00
Martin Artnik 3f23d10462
Merge pull request #6281 from G-Chubinidze/gc_SCI_9326
Thumbnail previews on attachments that cannot generate a preview. [SCI-9326]
2023-09-25 09:05:38 +02:00
Andrej 2478918aa6 Fix protocol parser flyout and notifications [SCI-9275] 2023-09-25 07:55:43 +02:00
Giga Chubinidze 5bae359b91 Thumbnail previews on attachments that cannot generate a preview. 2023-09-25 06:30:34 +04:00
Anton 5b434c4e4c Fixes for new flyout [SCI-9343] 2023-09-23 19:15:35 +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
aignatov-bio a19a2d16e9
Merge pull request #6272 from aignatov-bio/ai-sci-9340-update-checklists-interactions
Refactor checklist [SCI-9340]
2023-09-22 12:09:41 +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
Anton 77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +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 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
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
Andrej b47651750b Fix message for successful import protocol from protocol parser [SCI-9272] 2023-09-19 15:47:51 +02:00
Anton dd17b46667 Fix inline editing 2023-09-19 13:56:07 +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