Commit graph

17444 commits

Author SHA1 Message Date
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
Martin Artnik
ab2f5c16b4
Merge pull request #7758 from scinote-eln/features/ui-tweaks
Features/UI tweaks
2024-07-29 10:38:30 +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
Klemen Benedicic
bb7e85b19d Add data-e2e to protocol versions modal [SCI-10920] 2024-07-25 13:52:31 +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
Andrej
10e3790566 Fix space for add step button in protocols [SCI-10910] 2024-07-24 17:08:34 +02:00
Andrej
0efa1b96be Fix sharing permission for task sharing [SCI-10918] 2024-07-24 16:38:29 +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
ajugo
5ee4308448
Merge pull request #7748 from rekonder/aj_SCI_10909
Fix rendering of the title on the left menu [SCI-10909]
2024-07-24 15:00:29 +02:00
Andrej
662d47caf6 Improve handling of auto mapping and clearing [SCI-10905] 2024-07-24 14:51:19 +02:00
aignatov-bio
05d35bfee5
Merge pull request #7750 from aignatov-bio/ai-sci-10914-update-icon-font
Update font icons [SCI-10914]
2024-07-24 14:47:42 +02:00
Anton
3a09459595 Update font icons 2024-07-24 14:46:51 +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
Andrej
ae4b5cffe6 Fix rendering of title on left menu [SCI-10909] 2024-07-24 11:05:00 +02:00
Martin Artnik
6db98fee1a
Merge pull request #7747 from scinote-eln/develop
July 2024 Release
2024-07-24 11:00:32 +02:00
Martin Artnik
c7d3fdf97b
Bump version to 1.36.0 2024-07-24 10:59:49 +02:00
Andrej
58a8535d33 Add disabled tag to repository colums [SCI-10911] 2024-07-24 10:29:02 +02:00
Martin Artnik
e684e25b10
Merge pull request #7745 from artoscinote/ma_SCI_10912
Improve blank stock importing [SCI-10912]
2024-07-23 16:00:45 +02:00
Martin Artnik
bfcf8208c8 Improve blank stock importing [SCI-10912] 2024-07-23 15:55:39 +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
Martin Artnik
aad78294da
Merge pull request #7742 from artoscinote/ma_SCI_10912
On import, set blank stock values to zero instead of destroying [SCI-10912]
2024-07-23 12:56:24 +02:00
Martin Artnik
a135b6fb59 On import, set blank stock values to zero instead of destroying [SCI-10912] 2024-07-23 12:54:04 +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
Martin Artnik
82557d31d6
Merge pull request #7741 from artoscinote/ma_SCI_10908
Fix creating RepositoryStockConsumptionValues in repository snapshots [SCI-10908]
2024-07-23 10:34:56 +02:00
Martin Artnik
357e7bc7f7 Fix creating RepositoryStockConsumptionValues in repository snapshots [SCI-10908] 2024-07-23 10:30:07 +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
Martin Artnik
4e0a3958a4
Merge pull request #7738 from artoscinote/ma_SCI_10907
Fix comment send button Firefox issue [SCI-10907]
2024-07-22 13:58:15 +02:00
Martin Artnik
59c6259318 Fix comment send button Firefox issue [SCI-10907] 2024-07-22 13:55:54 +02:00
Martin Artnik
9c3e1d1946
Merge pull request #7736 from artoscinote/ma_SCI_10906
Fix user assignment deletion for public projects [SCI-10906]
2024-07-22 11:25:46 +02:00
Martin Artnik
7f2d4cba3e Merge branch 'develop' into features/ui-tweaks 2024-07-22 10:59:12 +02:00
Martin Artnik
09dc6c3ec6 Fix user assignment deletion for public projects [SCI-10906] 2024-07-22 10:50:36 +02:00
Alex Kriuchykhin
8f8bd353bc
Add Brakeman code static analysis tool (#7734) 2024-07-22 10:30:28 +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
Martin Artnik
842b8af6ac Properly set last_modified_by when consuming stock [SCI-10904] 2024-07-19 13:10:36 +02:00
Martin Artnik
82ce3db5a0
Merge pull request #7732 from artoscinote/ma_SCI_10904
Properly set last_modified_by when consuming stock [SCI-10904]
2024-07-19 09:33:14 +02:00