Commit graph

17306 commits

Author SHA1 Message Date
ajugo
9277e89b5e
Merge pull request #7752 from rekonder/aj_SCI_10918
Fix sharing permission for task sharing [SCI-10918]
2024-07-30 14:02:28 +02:00
ajugo
17bf51dac8
Merge pull request #7751 from rekonder/aj_SCI_10905
Improve handling of auto mapping and clearing [SCI-10905]
2024-07-30 14:02:12 +02:00
ajugo
9a18c70eb4
Merge pull request #7746 from rekonder/aj_SCI_10911
Add disabled tag to repository columns [SCI-10911]
2024-07-30 14:01:58 +02:00
ajugo
189b609fc8
Merge pull request #7753 from rekonder/aj_SCI_10910
Fix space for add step button in protocols [SCI-10910]
2024-07-30 13:56:49 +02:00
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
Martin Artnik
cc24e22a1b
Merge pull request #7763 from artoscinote/ma_SCI_10931
Force ActiveStorage variant recreation when generating reports [SCI-10931]
2024-07-30 13:55:56 +02:00
KlemenSciNote
a2cbd28f2d
Merge pull request #7755 from KlemenSciNote/kb_SCI-10920_data-e2e-protocol-templates
Add data-e2e to protocol versions modal [SCI-10920]
2024-07-30 13:48:49 +02:00
Martin Artnik
cb619cb3fa Force ActiveStorage variant recreation when generating reports [SCI-10931] 2024-07-30 13:45:03 +02:00
Klemen Benedicic
0cac65063c Update step text title and content data-e2e [SCI-10920] 2024-07-30 13:24:43 +02:00
Klemen Benedicic
788c11f06e Merge branch 'develop' into kb_SCI-10920_data-e2e-protocol-templates 2024-07-30 12:56:51 +02:00
ajugo
5695150e98
Merge pull request #7762 from rekonder/aj_SCI_10930
Remove edit ability for read-only inventories [SCI-10930]
2024-07-30 12:45:44 +02:00
Andrej
a00708ea5b Remove edit ability for read only inventories [SCI-10930] 2024-07-30 12:09:44 +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
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