Commit graph

17216 commits

Author SHA1 Message Date
Anton
74a0afca6c Add assign action to item cards locations [SCI-10924] 2024-08-05 11:23:35 +02:00
Martin Artnik
d470a3a5ac
Merge pull request #7729 from artoscinote/ma_SCI_10859
Implement sub-location count column [SCI-10859]
2024-08-05 10:34:34 +02:00
Martin Artnik
10290d82d4
Merge branch 'features/storage-locations' into ma_SCI_10859 2024-08-05 10:34:18 +02:00
aignatov-bio
d53d198ac5
Merge pull request #7778 from rekonder/aj_SCI_10950
Make storage locations toggleable [SCI-10950]
2024-08-02 16:58:39 +02:00
Andrej
333d62bfde Make storage locations toggleable [SCI-10950] 2024-08-02 14:40:02 +02:00
aignatov-bio
838bce9ac1
Merge pull request #7776 from aignatov-bio/ai-sci-10927-add-storage-locations-filter-search
Add filters to storage locations [SCI-10927]
2024-08-02 14:04:33 +02:00
Anton
83d9c88546 Add filters to storage locations [SCI-10927] 2024-08-02 14:01:41 +02:00
ajugo
7a84083a6c
Merge pull request #7759 from rekonder/aj_SCI_10816
Fix searching through tree for location and folders [SCI-10816]
2024-08-02 11:00:47 +02:00
Andrej
351aed9520 Fix searching through tree for location and folders [SCI-10816] 2024-08-01 16:42:33 +02:00
aignatov-bio
c544168115
Merge pull request #7772 from aignatov-bio/ai-sci-10923-add-storage-locations-to-item-card
Add locations to item card [SCI-10923]
2024-08-01 15:12:34 +02:00
Anton
124810e07e Add locations to item card [SCI-10923] 2024-08-01 15:07:43 +02:00
Anton
09e5d3399e Merge branch 'features/storage-locations' of github.com:scinote-eln/scinote-web into features/storage-locations 2024-07-31 12:20:10 +02:00
Anton
49ddeb7403 Merge branch 'develop' into features/storage-locations 2024-07-31 12:19:31 +02:00
aignatov-bio
cdc5e66e4a
Merge pull request #7768 from aignatov-bio/ai-sci-10921-add-stock-column-to-storage-locations
Add stock to storage locations [SCI-10921]
2024-07-31 11:38:16 +02:00
Anton
b774c04f5b Add stock to storage locations [SCI-10921] 2024-07-31 11:36:16 +02:00
aignatov-bio
6ad8120e0d
Merge pull request #7765 from aignatov-bio/ai-sci-10922-add-grid-interactions
Add storage grid interactions [SCI-10922]
2024-07-31 11:11:24 +02:00
ajugo
efd7dd8b0b
Merge pull request #7766 from rekonder/aj_SCI_10929
Change step/result toolbar interaction [SCI-10929]
2024-07-30 17:27:45 +02:00
Andrej
5714e684ef Change step/result toolbar interaction [SCI-10929] 2024-07-30 15:48:12 +02:00
Anton
1d63c6f818 Add storage grid interactions [SCI-10922] 2024-07-30 14:36:00 +02:00
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
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