Commit graph

15163 commits

Author SHA1 Message Date
Martin Artnik
7d1d1b7cfa
Merge pull request #6418 from scinote-eln/develop
October 2023 Release Hotfix
2023-10-11 12:08:42 +02:00
Martin Artnik
957f539e32
Bump version to 1.29.0.1
Fix issue where users with only checklist check/uncheck permission could not click on the checklist check boxes.
2023-10-11 12:08:09 +02:00
Anton
84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Martin Artnik
543e782634
Merge pull request #6415 from artoscinote/ma_SCI_9507
Fix checklists for users with check permissions [SCI-9507]
2023-10-11 11:37:00 +02:00
Martin Artnik
120f710bb4 Fix checklists for users with check permissions [SCI-9507] 2023-10-11 11:33:04 +02:00
Martin Artnik
9a21af9244
Merge pull request #6414 from scinote-eln/develop
October 2023 Release
2023-10-11 11:00:06 +02:00
Martin Artnik
9fdcd2d7bd
Bump version to 1.29.0 2023-10-11 10:58:09 +02:00
Oleksii Kriuchykhin
e08304d0cd Merge branch 'develop' into features/inventory-item-card-edit 2023-10-11 10:51:51 +02:00
wandji
d236ba0a5b
Add reminders to item card [SCI-9154] (#6285)
* Add reminders to item card [SCI-9154]

* Refactor item card reminder component [SCI-9154]
2023-10-11 09:35:10 +02:00
Giga Chubinidze
de8366bb51 Code sample in RTF on archived results is not highlighted with colors [SCI-9429] 2023-10-11 03:22:11 +04:00
Alex Kriuchykhin
c446bed593
Merge pull request #6411 from okriuchykhin/ok_SCI_9503
Fix delete results permission helper, don't allow deletion if task is archived [SCI-9503]
2023-10-10 17:56:13 +02:00
Oleksii Kriuchykhin
3d9e151fc0 Fix delete results permission helper, don't allow deletion if task is archived [SCI-9503] 2023-10-10 17:54:45 +02:00
Martin Artnik
8d9c64849c
Merge pull request #6410 from artoscinote/ma_SCI_9502
Fix delete all steps modal [SCI-9502]
2023-10-10 17:10:12 +02:00
Martin Artnik
03e0bc9a02 Fix delete all steps modal [SCI-9502] 2023-10-10 17:08:46 +02:00
Alex Kriuchykhin
dfe3a5c54b
Merge pull request #6409 from okriuchykhin/ok_SCI_9461_v2
Fix file preview presence check in export all job [SCI-9461]
2023-10-10 16:52:46 +02:00
Oleksii Kriuchykhin
2481b0af35 Fix file preview presence check in export all job [SCI-9461] 2023-10-10 16:51:15 +02:00
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
Martin Artnik
43f89b93ea
Merge pull request #6367 from mvrazic/e2e
Update e2e
2023-10-09 11:21:47 +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