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

5097 commits

Author SHA1 Message Date
Martin Artnik 040379039f
Merge pull request #6510 from G-Chubinidze/gc_SCI_9552 
Report - Well plates columns fix [SCI-9552]
 2023-10-20 10:16:11 +02:00
aignatov-bio 453bdf0082
Merge pull request #6508 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results 
Fix drag n drop on results
 2023-10-20 09:43:49 +02:00
Gregor Lasnibat 6812bd135b
Fixed double PATCH request sent [SCI-9568] (#6512) 2023-10-20 09:37:09 +02:00
Giga Chubinidze 186eb1cc7e Report - Well plates columns fix [SCI-9552] 2023-10-20 02:27:06 +04:00
Anton 635a4b7fb3 Fix drag n drop on results 2023-10-19 17:41:13 +02:00
Alex Kriuchykhin 8a18bc6ad3
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506) 2023-10-19 16:35:23 +02:00
Alex Kriuchykhin 18c03eb836
Fix smart annotation links on the item card [SCI-9571] (#6501) 2023-10-19 16:35:15 +02:00
aignatov-bio 29ce96b67d
Merge pull request #6496 from aignatov-bio/ai-sci-9518-fix-bottom-toolbar-for-reports 
Fix bottom toolbar for reports [SCI-9518]
 2023-10-19 11:31:39 +02:00
Anton 4122876a90 Fix bottom toolbar for reports [SCI-9518] 2023-10-19 10:16:09 +02:00
Martin Artnik 1cf2e31e1f
Merge pull request #6489 from sboursen-scinote/sb_SCI-9549 
Fix background blurring of stacked modals [SCI-9549]
 2023-10-19 10:02:08 +02:00
ivanscinote 8b5f610c07
Fix grid rows layout for experiment table view when no results found [SCI-9482] (#6434) 2023-10-19 09:47:44 +02:00
sboursen-scinote e0d1841b7b Fix blurring of stacked modals [SCI-9549] 2023-10-18 17:15:17 +02:00
ajugo 965deded98
Fix collapsing/extending containers on shareable results [SCI-9555] (#6476) 2023-10-18 10:15:43 +02:00
Gregor Lasnibat 22c718d61c
Fixed protocol template table header covered by the list [SCI-9520] (#6457) 2023-10-17 16:32:02 +02:00
ajugo 67008a54d6
Fix item sidebar showing on full view of inventory [SCI-9525] (#6447) 2023-10-16 10:18:22 +02:00
Martin Artnik 3021297f73
Revert "Refocus on tinymce editor after marvinjs img update [SCI-9515]" 2023-10-13 14:40:52 +02:00
Martin Artnik a83235b23c
Merge pull request #6417 from aignatov-bio/ai-sci-9476-update-shared-tasks 
Update css for shared protocol [SCI-9476]
 2023-10-13 10:30:48 +02:00
Martin Artnik 118a25e0ab
Merge pull request #6430 from ivanscinote/SCI-9515-click-away-not-working-after-editing-chemical-drawing-in-rtf 
Refocus on tinymce editor after marvinjs img update [SCI-9515]
 2023-10-12 16:45:36 +02:00
Ivan Kljun d80d0af5b8 Refocus on tinymce editor after marvinjs img update [SCI-9515] 2023-10-12 16:35:36 +02:00
ajugo c3ae813fb9
Remove link from assigned snapshot inventory row for simple view [SCI-9481] (#6405) 2023-10-12 16:30:58 +02:00
ajugo 04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
ajugo 4b5c7362e5
Fix opening of the datetime picker direction [SCI-9146] (#6395) 2023-10-12 15:37:23 +02:00
ajugo 357eebee40
Fix stock export on task [SCI-9477] (#6400) 2023-10-12 14:43:17 +02:00
Anton 84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Andrej 79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Martin Artnik 5bd9834e91 Fix issues with project filters [SCI-9492] 2023-10-10 10:12:26 +02:00
Martin Artnik 7a01020a2d
Merge pull request #6389 from aignatov-bio/ai-sci-small-css-fixes 
CSS fixes
 2023-10-09 11:34:57 +02:00
Anton c39ba5afe6 Css fixes 2023-10-09 11:29:28 +02:00
Martin Artnik e6834d0b74
Merge pull request #6387 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file 
Fix pdf reports [SCI-9464]
 2023-10-09 11:01:33 +02:00
Ivan Kljun 879b03ad3d Fix pdf reports [SCI-9464] 2023-10-09 10:49:07 +02:00
Martin Artnik 60acd42614
Merge pull request #6378 from lasniscinote/gl_SCI_9435 
Not responsive task page [SCI-9435]
 2023-10-09 09:14:34 +02:00
Gregor Lasnibat cce02b29ed Fixed overflowing text, breaking buttons in new line, figuring out how header stacking works (flickering bug) [SCI-9435] 
Fixed header stack stuttering [SCI-9435]

PR fix 01 [SCI-9435]
 2023-10-08 16:07:05 +02:00
Martin Artnik 56f53a7ed8
Merge pull request #6366 from lasniscinote/gl_SCI_9463 
Fixed project filter not saved, red dot missing [SCI-9463]
 2023-10-06 15:33:51 +02:00
Gregor Lasnibat 7c7c0b0d88 Working on project filter not saved, red dot missing [SCI-9463] 
Fixed project filters not saved/red dot not showing when applied [SCI-9463]

PR fix 01 [SCI-9463]
 2023-10-06 15:31:00 +02:00
wandji20 8408b65818 Fix issue with text name when importting protocol eln file [SCI-9490] 2023-10-06 14:19:42 +01:00
Martin Artnik 19c44c50ff
Merge pull request #6363 from artoscinote/ma_SCI_9410 
Fix attachment issues [SCI-9410]
 2023-10-05 16:42:10 +02:00
Martin Artnik 5c7ee78cd6 Fix attachment issues [SCI-9410] 2023-10-05 15:44:41 +02:00
Alex Kriuchykhin e48fc19546
Merge pull request #6361 from sboursen-scinote/sb_SCI-9468 
Import from Protocols.io not loading protocols [SCI-9468]
 2023-10-05 15:35:44 +02:00
Alex Kriuchykhin 5b39c2f08e
Merge pull request #6258 from sboursen-scinote/sb_SCI-9068 
FIX: Clicking any link makes a side scrollbar appear on the page [SCI-9068]
 2023-10-05 15:33:35 +02:00
Alex Kriuchykhin b73f88f91c
Merge pull request #6359 from rekonder/aj_SCI_9452 
Fix opening protocol parser import modal [SCI-9452]
 2023-10-05 15:28:18 +02:00
sboursen-scinote 9b24bf9504 Fix Protocols.io modal not loading any protocols [SCI-9468] 
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-10-05 12:03:05 +02:00
wandji20 6358ad2da4 Fix issue with protocol and result text name [SCI-9420] 2023-10-05 08:08:49 +01:00
Andrej 0a53b2e6bc Fix opening protocol parser import modal [SCI-9452] 2023-10-04 17:13:27 +02:00
Andrej 0889c40d46 Fix icons and OVE view for attachments [SCI-9445] 2023-10-04 16:18:03 +02:00
Alex Kriuchykhin e4e4992415
Merge pull request #6338 from sboursen-scinote/sb_SCI-8126-fix3 
Fix no-result placeholder position for archived project list [SCI-8126]
 2023-10-04 15:46:51 +02:00
Martin Artnik 5b29ccd1f9
Merge pull request #6354 from lasniscinote/gl_SCI_9418 
Fixed edit date/datetime columns range option selection [SCI-9418]
 2023-10-04 14:16:27 +02:00
Gregor Lasnibat 6dbc3c5aaa Fixed edit date/datetime columns range option selection [SCI-9418] 
Fixed edit date/datetime columns range option selection [SCI-9418]
 2023-10-04 14:05:51 +02:00
Oleksii Kriuchykhin 421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Martin Artnik 6f45980648
Merge pull request #6335 from ivanscinote/SCI-9407-css-consumption-modals-assign-to-task-modal-issues 
Fix UI for consumption/edit stock/assign to task modals [SCI-9407]
 2023-10-04 12:51:59 +02:00
Martin Artnik b15cedd198
Merge pull request #6345 from G-Chubinidze/gc_SCI_9438 
CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]
 2023-10-04 12:51:20 +02:00