Commit graph

11646 commits

Author SHA1 Message Date
Martin Artnik 9c302f186b
Merge branch 'features/navigator-resize' into SCI-9318-making-navigator-resizable 2023-10-13 10:33:37 +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 43522c54a0
Merge pull request #6424 from G-Chubinidze/gc_SCI_9489
CSS: Signatures modal issues [SCI-9489]
2023-10-13 10:28:58 +02:00
Gregor Lasnibat b5ece3429f
Fixed missing inventory columns on item card [SCI-9469] (#6416) 2023-10-13 09:51:50 +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
Soufiane 857bda6f69
Fix broken unit tests [SCI-8972] (#6342)
- Models tests
- Controllers tests
- Jobs tests
- Permissions tests
- Utilities tests
2023-10-12 16:16:43 +02:00
ajugo 04a898760a
Add assign button to item cards [SCI-9158] (#6326) 2023-10-12 15:46:13 +02:00
Oleksii Kriuchykhin 9e67b20b38 Merge branch 'features/october-release' into develop 2023-10-12 15:40:21 +02:00
ajugo 4b5c7362e5
Fix opening of the datetime picker direction [SCI-9146] (#6395) 2023-10-12 15:37:23 +02:00
ajugo c55c9e2596
Fix button permission for the shareable link on task [SCI-9517] (#6427) 2023-10-12 15:36:00 +02:00
Gregor Lasnibat 27652fd1a0
Working on sticky header + navigation behaviour [SCI-9472] (#6428)
Working on highlighting ScrollSpy when scrolling. Decided on external library [SCI-9472]

Finished not sticky item header v.01 [SCI-9472]

PR fix01 [SCI-9472]
2023-10-12 15:35:30 +02:00
wandji 6ca66f3b96
Fix text size and close icon in protocol docx parser [SCI-9451] (#6423) 2023-10-12 15:32:42 +02:00
ivanscinote a5ec4a6c95
Fix outside_click.js [SCI-9404] (#6398) 2023-10-12 15:27:36 +02:00
Gregor Lasnibat 60d79be220
Working on item card interactions, implemented close on click outside [SCI-9470] (#6401)
Fixed date format, checklist content, active/archived state [SCI-9470]

Fixed date formatting on BE [SCI-9470]
2023-10-12 15:26:41 +02:00
ajugo e0148cca31
Fix image preview and status icon for items card [SCI-9480] (#6413) 2023-10-12 15:19:51 +02:00
wandji 45cfe77ef7
Add qr code and print label to item card [SCI-9471 (#6364)
* Add qr acode and print label to item card [SCI-9471

* Remove jQuery handler for setting barcode image src [SCI-9471]
2023-10-12 15:10:54 +02:00
Ivan Kljun d34d424b0f Make navigator resizable [SCI-9318] 2023-10-12 14:45:51 +02:00
ajugo 357eebee40
Fix stock export on task [SCI-9477] (#6400) 2023-10-12 14:43:17 +02:00
Giga Chubinidze 3502d96674 CSS: Signatures modal issues [SCI-9489] 2023-10-12 10:52:55 +04:00
Anton 84477cad43 Update css for shared protocol [SCI-9476] 2023-10-11 11:41:34 +02:00
Martin Artnik 120f710bb4 Fix checklists for users with check permissions [SCI-9507] 2023-10-11 11:33:04 +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
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 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 09df0c3b1f Fix missing project in result level activities [SCI-9500] 2023-10-10 16:23:58 +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 b3c664664d Add project to result activities [SCI-9500] 2023-10-10 14:48:00 +02:00
Ivan Kljun d68d7af529 Allow data attr in sanitize config [SCI-9464] 2023-10-10 14:33:55 +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
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
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
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