Commit graph

14986 commits

Author SHA1 Message Date
Andrej
9ca96145d5 Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 08:05:28 +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
wandji
767c98c101
Add barcode and print label to item card [SCI-9156] (#6269)
* Add barcode and print label to item card [SCI-9156]

* Rename wrong label [SCI-9156]
2023-09-22 16:17:42 +02:00
aignatov-bio
da6d294573
Merge pull request #6277 from aignatov-bio/ai-sci-fix-status-color
Fix status color
2023-09-22 14:49:29 +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
Alex Kriuchykhin
c817c269cb
Merge pull request #6270 from lasniscinote/gl_SCI_9153
Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
2023-09-22 14:13:54 +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
01e4ab3cd5 Removed variable 2023-09-22 12:07:56 +02:00
aignatov-bio
c6d701e8b2
Merge pull request #6275 from aignatov-bio/ai-sci-css-fixes-results
CSS fixes protocol page
2023-09-22 12:04:41 +02:00
Anton
ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
Alex Kriuchykhin
30b848fef3
Merge pull request #6273 from sboursen-scinote/sb_SCI-9147
Improve logic for custom logos on error pages [SCI-9147]
2023-09-22 10:53:44 +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
sboursen-scinote
adc0a460bd Improve logic for custom logos on error pages [SCI-9147]
- Switch to dynamic ERB templates.
- Move text to I18n
2023-09-22 10:26:32 +02:00
Alex Kriuchykhin
912b5862d6
Merge pull request #6271 from okriuchykhin/ok_SCI_7548
Fix missing fonts in PDF reports [SCI-7548]
2023-09-22 10:16:26 +02:00
Oleksii Kriuchykhin
f6dbd45746 Fix missing fonts in PDF reports [SCI-7548] 2023-09-22 10:11:18 +02:00
wandji20
ff463f2db1 Fix issue previewing large image after edit [SCI-8914] 2023-09-22 09:10:56 +01:00
Anton
566705cb67 Small fixes [SCI-9340] 2023-09-22 10:07:29 +02:00
Alex Kriuchykhin
3500b5f08c
Merge pull request #6266 from sboursen-scinote/sb_SCI-9215
Remove the Experiment ID from the three dots menu [SCI-9215]
2023-09-22 10:01:44 +02:00
Anton
77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Giga Chubinidze
add1a55e0d Dot divider between steps/results 2023-09-22 05:25:33 +04:00
Gregor Lasnibat
1bf2bc6156 Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
Fixed regular card (without cusotm columns) styles [SCI-9153]

Updated API to return column name, working on subcomponents [SCI-9153]

TooltipPreview on dynamic file component working [SCI-9153]

Finished new item card refactor [SCI-9153]

PR fix 01 [SCI-9153]

PR fixes 02 [SCI-9153]
2023-09-21 20:18:20 +02: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
Ivan Kljun
84d3c8a279 Fix team import/export to work with new result [SCI-9247] 2023-09-21 14:23:33 +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
aignatov-bio
60b477b7cc
Merge pull request #6267 from aignatov-bio/ai-sci-9330-fix-modals-after-revamp
Fix modals after revamp [SCI-9330]
2023-09-21 13:30:07 +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
sboursen-scinote
90b9813083 Remove the Experiment ID displayed in the three dots menu dropdown [SCI-9215] 2023-09-21 11:38:09 +02:00
Anton
cb3508616f Add addons to tailwind 2023-09-21 11:07:10 +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
Alex Kriuchykhin
04e191e377
Merge pull request #6259 from wandji20/wb-SCI-9191
Fix issue displaying long tables protocol description in import modal [SCI-9191]
2023-09-21 09:26:25 +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
wandji20
ca8e6d88dc Fix issue displaying long tables protocol description in impor modal [SCI-9191] 2023-09-20 15:04:10 +01:00
Martin Artnik
5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348
Clean up legacy comment logic [SCI-9348]
2023-09-20 13:10:28 +02:00
aignatov-bio
1233c34fb2
Merge pull request #6257 from aignatov-bio/ai-sci-9305-fix-task-secondary-navigation-on-small-screens
Fix task secondary navigation on small screens [SCI-9305]
2023-09-20 13:10:22 +02:00
aignatov-bio
5fc4d8f9f7
Merge pull request #6256 from aignatov-bio/ai-sci-9276-filters-modal-fixes
Filters modal fixes [SCI-9276]
2023-09-20 13:10:11 +02:00
Martin Artnik
44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton
d46ee2adf6 Fix task secondary navigation on small screens [SCI-9305] 2023-09-20 12:30:15 +02:00
Oleksii Kriuchykhin
b7e2e227b5 Merge branch 'develop' 2023-09-20 11:14:56 +02:00