Commit graph

17144 commits

Author SHA1 Message Date
ajugo
51717c343e
Merge pull request #7761 from rekonder/aj_SCI_10794
Add state saving for result [SCI-10794]
2024-07-30 13:56:37 +02:00
aignatov-bio
d68e4d9f27
Merge pull request #7760 from aignatov-bio/ai-sci-10870-assign-unassign-modal-storage-location
Add assign/unassign modal and move modal [SCI-10870][SCI-10869]
2024-07-30 10:57:31 +02:00
Andrej
3b2748ae71 Add state saving for result [SCI-10794] 2024-07-30 09:33:27 +02:00
Anton
2da397cc76 Add assign/unassign modal and move modal [SCI-10870] 2024-07-29 16:06:21 +02:00
ajugo
66d620b5da
Merge pull request #7757 from rekonder/aj_SCI_10882
Add permissions for storage location and rename box to container [SCI-10882]
2024-07-29 09:54:33 +02:00
Andrej
e4fb5d71df Add permissions for storage location and rename box to container [SCI-10882] 2024-07-29 09:46:45 +02:00
aignatov-bio
cf518768b0
Merge pull request #7756 from aignatov-bio/ai-sci-10913-update-radio-button-design
Update radio buttons [SCI-10913]
2024-07-25 14:11:14 +02:00
Anton
776fdeabc5 Update radio buttons [SCI-10913] 2024-07-25 14:06:26 +02:00
aignatov-bio
0c1bc8c29c
Merge pull request #7754 from aignatov-bio/ai-sci-10868-container-table-toolbar
Add toolbar to container table [SCI-10868]
2024-07-25 13:39:43 +02:00
Anton
50928f6948 Add toolbar to container table [SCI-10868] 2024-07-25 12:06:56 +02:00
ajugo
7091c09aff
Merge pull request #7744 from rekonder/aj_SCI_10864
Add delete location action [SCI-10864]
2024-07-24 15:29:19 +02:00
Andrej
9d541e28b2 Add delete location action [SCI-10864] 2024-07-24 15:28:23 +02:00
aignatov-bio
d96ef5751e
Merge pull request #7749 from aignatov-bio/ai-sci-10866-box-storage-view
Add box view [SCI-10866]
2024-07-24 13:29:39 +02:00
Anton
612e6a8a24 Add box view [SCI-10866] 2024-07-24 13:25:20 +02:00
ajugo
c2b1df8019
Merge pull request #7743 from rekonder/aj_SCI_10863
Speedup generating of storage locations tree for move modal [SCI-10863]
2024-07-23 14:58:16 +02:00
Andrej
793dc22991 Speedup generating of storage locations tree for move modal [SCI-10863] 2024-07-23 14:53:10 +02:00
aignatov-bio
ae0bf4bb0d
Merge pull request #7737 from aignatov-bio/ai-sci-10862-add-duplicate-action-to-location
Add duplicate action to locations [SCI-10862]
2024-07-23 11:27:44 +02:00
aignatov-bio
0893774cc5
Merge branch 'features/storage-locations' into ai-sci-10862-add-duplicate-action-to-location 2024-07-23 11:27:36 +02:00
Anton
1c3cc71174 Add duplicate action to locations [SCI-10862] 2024-07-23 11:24:27 +02:00
ajugo
c8a3db554d
Merge pull request #7740 from rekonder/aj_SCI_10863
Fix in memory loading of storage location tree [SCI-10863]
2024-07-23 09:47:51 +02:00
Andrej
d725e278c1 Fix in memory loading of storage location tree [SCI-10863] 2024-07-23 09:44:57 +02:00
ajugo
a973acaf0c
Merge pull request #7739 from rekonder/aj_SCI_10863
Add move modal for storage locations [SCI-10863]
2024-07-23 09:43:09 +02:00
Andrej
2f53772f61 Add move modal for storage locations [SCI-10863] 2024-07-23 09:41:19 +02:00
aignatov-bio
e56e9b7dac
Merge pull request #7733 from aignatov-bio/ai-sci-10860-add-create-edit-modal-for-storage-locations
Add create/edit modal for storage locations [SCI-10860]
2024-07-19 14:00:01 +02:00
Anton
d0c07d6a3d Add create/edit modal for storage locations [SCI-10860]/ 2024-07-19 13:58:43 +02:00
aignatov-bio
60ce8aa425
Merge pull request #7728 from aignatov-bio/ai-sci-10861-add-storage-locations-toolbar
Add toolbar for storage locations [SCI-10861]
2024-07-18 11:53:36 +02:00
Anton
782256f655 Add toolbar for storage locations [SCI-10861] 2024-07-18 11:46:30 +02:00
Martin Artnik
b7c30bbf0b Merge branch 'develop' into features/storage-locations 2024-07-18 11:45:16 +02:00
aignatov-bio
33626e0ddd
Merge pull request #7719 from aignatov-bio/ai-sci-10857-add-locations-page
Add storage locations table [SCI-10857][SCI-10858]
2024-07-17 14:50:51 +02:00
Martin Artnik
79036cd3e8
Merge pull request #7724 from artoscinote/ma_SCI_10900
Fix draft protocol title markup [SCI-10900]
2024-07-17 13:01:45 +02:00
Martin Artnik
ad8955e5c9 Fix draft protocol title markup [SCI-10900] 2024-07-17 13:00:01 +02:00
aignatov-bio
eb03389065
Merge pull request #7723 from aignatov-bio/ai-sci-10834-fix-scinote-edit
Fix scinote edit in attachments [SCI-10834]
2024-07-17 12:40:38 +02:00
Anton
a7ec6e0086 Fix scinote edit in attachments [SCI-10834] 2024-07-17 12:24:17 +02:00
Martin Artnik
a9980c04c7
Merge pull request #7722 from artoscinote/ma_SCI_10893
Fix import of stock units [SCI-10893]
2024-07-17 12:04:58 +02:00
Martin Artnik
9403b4fd67 Fix import of stock units [SCI-10893] 2024-07-17 12:00:00 +02:00
Martin Artnik
69165c96a6
Merge pull request #7720 from artoscinote/ma_SCI_10890
Fix repository row touch for checklist values [SCI-10890]
2024-07-17 10:54:42 +02:00
ajugo
adb7115312
Merge pull request #7721 from rekonder/aj_SCI_10884
Fix cell value validation [SCI-10884]
2024-07-17 10:46:34 +02:00
Andrej
40bbbf4863 Fix cell value validation [SCI-10884] 2024-07-17 10:24:02 +02:00
Martin Artnik
8aee1ce94a Fix repository row touch for checklist values [SCI-10890] 2024-07-17 10:22:44 +02:00
Anton
1090fc3cf8 Add storage locations table [SCI-10857] 2024-07-16 15:23:15 +02:00
ajugo
c02653a45a
Merge pull request #7718 from rekonder/aj_SCI_10894
Fix saving of repository state [SCI-10894]
2024-07-16 13:59:24 +02:00
Andrej
56439bf5ec Fix saving of repository state [SCI-10894] 2024-07-16 13:32:21 +02:00
aignatov-bio
4f6e2adfc1
Merge pull request #7717 from aignatov-bio/ai-sci-10834-fix-scinote-edit-check
Fix scinote edit check [SCI-10834]
2024-07-16 11:55:12 +02:00
Anton
9604af8e4c Fix scinote edit check [SCI-10834] 2024-07-16 11:53:32 +02:00
Martin Artnik
9c1140c3b6
Merge pull request #7716 from artoscinote/ma_SCI_10896
Also resize TinyMCE images for export reports [SCI-10896]
2024-07-16 10:39:09 +02:00
Martin Artnik
bb6cf73e7b Also resize TinyMCE images for export reports [SCI-10896] 2024-07-16 10:33:27 +02:00
aignatov-bio
ef9fc0b020
Merge pull request #7715 from aignatov-bio/ai-sci-10887-protocol-info-on-task-page
Fix overflow issue for protocol info [SCI-10887]
2024-07-15 15:42:00 +02:00
Anton
7d6c75b622 Fix overflow issue for protocol info [SCI-10887] 2024-07-15 15:04:54 +02:00
aignatov-bio
8587bcad68
Merge pull request #7670 from aignatov-bio/ai-sci-10818-poc-instruction-in-inventory-export
Instruction for inventory import [SCI-10846]
2024-07-15 14:44:29 +02:00
Martin Artnik
83394b7e9e
Merge pull request #7713 from artoscinote/ma_SCI_10889
Fix handling of blank rows and stock changes [SCI-10889]
2024-07-15 14:41:10 +02:00