Commit graph

14939 commits

Author SHA1 Message Date
Martin Artnik 04e45eb1ee
Merge pull request #6408 from artoscinote/ma_SCI_9500
Fix missing project in result level activities [SCI-9500]
2023-10-10 16:25:49 +02:00
Martin Artnik 09df0c3b1f Fix missing project in result level activities [SCI-9500] 2023-10-10 16:23:58 +02:00
Martin Artnik c640c784a1
Merge pull request #6407 from artoscinote/ma_SCI_9501
Update table metadata when it's created [SCI-9501]
2023-10-10 16:11:07 +02:00
Martin Artnik 7f8e515e88 Update table metadata when it's created [SCI-9501] 2023-10-10 16:09:47 +02:00
Alex Kriuchykhin e131163f11
Merge pull request #6406 from okriuchykhin/ok_SCI_9461_v2
Fix file preview generation issues in export all [SCI-9461]
2023-10-10 15:33:26 +02:00
Oleksii Kriuchykhin 5c5319d80d Fix file preview generation issues in export all [SCI-9461] 2023-10-10 15:30:15 +02:00
Gregor Lasnibat cac2b3c37e
Merge pull request #6394 from lasniscinote/gl_SCI_9474
Fixed no file preview on item card [SCI-9474]
2023-10-10 15:16:36 +02:00
Martin Artnik 6972abbe01
Merge pull request #6404 from artoscinote/ma_SCI_9500
Add project to result activities [SCI-9500]
2023-10-10 14:57:42 +02:00
Martin Artnik b3c664664d Add project to result activities [SCI-9500] 2023-10-10 14:48:00 +02:00
Martin Artnik d8247813c3
Merge pull request #6402 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file
Allow data attr in sanitize config [SCI-9464]
2023-10-10 14:37:54 +02:00
Ivan Kljun d68d7af529 Allow data attr in sanitize config [SCI-9464] 2023-10-10 14:33:55 +02:00
Martin Artnik b03659cf08
Merge pull request #6403 from aignatov-bio/ai-sci-9499-fix-marving-js-move
Fix marvinJS move on results [SCI-9499]
2023-10-10 14:32:11 +02:00
Anton 1ab62616c4 Fix marvinJS move on results [SCI-9499] 2023-10-10 14:29:06 +02:00
Andrej 79118effa7 Merge branch 'develop' into features/october-release 2023-10-10 11:09:04 +02:00
Martin Artnik 3cf3d799f6
Merge pull request #6396 from artoscinote/ma_SCI_9492
Fix issues with project filters [SCI-9492]
2023-10-10 10:48:36 +02:00
Martin Artnik 5bd9834e91 Fix issues with project filters [SCI-9492] 2023-10-10 10:12:26 +02:00
Alex Kriuchykhin 472e573011
Merge pull request #6393 from okriuchykhin/ok_SCI_9494
Fix repository export job for snapshots [SCI-9494]
2023-10-10 09:12:49 +02:00
Gregor Lasnibat 1b85b251ba Fixed no file preview on item card [SCI-9474] 2023-10-09 17:10:41 +02:00
Alex Kriuchykhin 6ae8b3d45a
Merge pull request #6381 from rekonder/aj_SCI_9475
Fix css for item card [SCI-9475]
2023-10-09 15:42:04 +02:00
Oleksii Kriuchykhin 144c3ce12f Fix repository export job for snapshots [SCI-9494] 2023-10-09 15:40:19 +02:00
Martin Artnik 763ede050d
Merge pull request #6392 from ivanscinote/SCI-9430-move-result-does-not-work
Fix moving result elements [SCI-9430]
2023-10-09 15:11:30 +02:00
Ivan Kljun 7c0e8221c1 Fix moving result elements [SCI-9430] 2023-10-09 14:54:22 +02:00
Giga Chubinidze face69e960 changed controller action & javascript 2023-10-09 15:15:54 +04:00
Martin Artnik b30d5577ac
Merge pull request #6391 from lasniscinote/gl_SCI_9487
Fixed checklist boxes getting bulletpoints [SCI-9487]
2023-10-09 12:49:51 +02:00
Martin Artnik ec4662c484
Merge pull request #6390 from artoscinote/ma_SCI_9440
Copy fixes [SCI-9440]
2023-10-09 11:43:45 +02:00
Martin Artnik a9b629bdf7 Copy fixes [SCI-9440] 2023-10-09 11:40:12 +02:00
Gregor Lasnibat 30ded70f7b Fixed checklist boxes getting bulletpoints [SCI-9487] 2023-10-09 11:39:22 +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
Alex Kriuchykhin efa0149c9f
Merge pull request #6386 from rekonder/aj_SCI_9484
Fix unsharing of repository rows [SCI-9484]
2023-10-09 11:06:23 +02:00
Andrej 30295a313b Fix unsharing of repository rows [SCI-9484] 2023-10-09 11:05:33 +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
Alex Kriuchykhin 8e420181ac
Merge pull request #6385 from okriuchykhin/ok_SCI_9461
Fix file preview generation in projects export jobs [SCI-9461]
2023-10-09 10:17:25 +02:00
Oleksii Kriuchykhin b3759ff150 Fix file preview generation in projects export jobs [SCI-9461] 2023-10-09 09:52:31 +02:00
Martin Artnik 252479a748
Merge pull request #6380 from aignatov-bio/ai-sci-9448-fix-tinymce-header-bug
Fix tinymce header bug [SCI-9448]
2023-10-09 09:43:21 +02:00
Martin Artnik 9bf5903c54
Merge pull request #6384 from aignatov-bio/ai-sci-9491-fix-acitvity-type-selector
Fix activity type selector [SCI-9491]
2023-10-09 09:42:50 +02:00
Martin Artnik 1df8ad6f87
Merge pull request #6383 from G-Chubinidze/gc_SCI_9424
CSS:  Various issues [SCI-9424]
2023-10-09 09:41:48 +02:00
Anton 6b6ecf1b43 Fix activity type selector [SCI-9491] 2023-10-09 09:40:42 +02:00
Giga Chubinidze 9b9b486324 CSS: Various issues [SCI-9424] 2023-10-09 11:35:52 +04:00
Giga Chubinidze 1a6578b460 Missing file preview [SCI-9433] 2023-10-09 11:33:54 +04:00
Andrej ab49c52054 Fix css for item card [SCI-9475] 2023-10-09 09:33:38 +02:00
Anton 4db213b331 Fix tinymce header bug [SCI-9448] 2023-10-09 09:15:43 +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 2c12b19297
Merge pull request #6377 from artoscinote/ma_SCI_9488
Fix editable name for locked checklists [SCI-9488]
2023-10-06 15:49:26 +02:00
Martin Artnik 595bca7e5b Fix editable name for locked checklists [SCI-9488] 2023-10-06 15:46:07 +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
Alex Kriuchykhin 42ef253e64
Merge pull request #6376 from wandji20/wb-SCI-9490
Fix issue with text name when importing protocol eln file [SCI-9490]
2023-10-06 15:23:11 +02:00