Commit graph

17771 commits

Author SHA1 Message Date
aignatov-bio
82635e8421
Merge pull request #7907 from aignatov-bio/ai-sci-11126-hide-reminders-from-hidden-locations
Hide reminders from hidden locations [SCI-11126]
2024-10-01 15:41:09 +02:00
aignatov-bio
1f0d8a1491
Merge pull request #7906 from aignatov-bio/ai-sci-11121-fix-import-issues
Fix import/export storage locations [SCI-11121]
2024-10-01 14:55:19 +02:00
Anton
059cd611fb Add team redirect to storage locations activity [SCI-11128] 2024-10-01 14:37:00 +02:00
Anton
f7dc47eb24 Hide reminders from hidden locations [SCI-11126] 2024-10-01 14:30:23 +02:00
Anton
8067f332ef Fix import/export storage locations [SCI-11121] 2024-10-01 14:22:19 +02:00
aignatov-bio
45907b1a7a
Merge pull request #7905 from aignatov-bio/ai-sci-11118-update-permission-for-shared-locations
Update permissions for shared locations [SCI-11118]
2024-10-01 14:18:19 +02:00
ajugo
6948f79469
Merge pull request #7904 from rekonder/aj_SCI_11095
Add support for inventory columns selection for docx report [SCI-11095]
2024-10-01 13:03:49 +02:00
Anton
14dea69717 update permissions for shared locations [SCI-11118] 2024-10-01 11:55:44 +02:00
Andrej
1a04e249ba Add support for inventory columns selection for docx report [SCI-11095] 2024-10-01 11:55:22 +02:00
ajugo
36192e8758
Merge pull request #7903 from rekonder/aj_SCI_11119
Fix adding backgroung color to docx tables [SCI-11119]
2024-10-01 09:34:18 +02:00
Andrej
a3d549495b Fix adding backgroung color to docx tables [SCI-11119] 2024-10-01 07:52:54 +02:00
Martin Artnik
85f0b28e6d
Merge pull request #7902 from aignatov-bio/ai-sci-11120-fix-repository-row-import-for-locations
Fix repository row import to location [SCI-11120]
2024-09-30 14:26:03 +02:00
Anton
f2c2f1e560 Fix repository row import to location [SCI-11120] 2024-09-30 14:13:40 +02:00
aignatov-bio
b74b17872f
Merge pull request #7901 from aignatov-bio/ai-sci-11117-fix-shared-locations-on-move-modal
Fix shared locations permission in move modal [SCI-11117]
2024-09-30 14:07:02 +02:00
Anton
1a9a3bdad8 Fix shared locations perimission in move modal [SCI-11117] 2024-09-30 13:42:05 +02:00
Martin Artnik
2fb5b573c6
Merge pull request #7898 from aignatov-bio/ai-sci-11105-storage-location-creation-modal
Fixes for storage locations creation modal [SCI-11105]
2024-09-30 13:40:42 +02:00
aignatov-bio
7966ffc824
Merge branch 'develop' into ai-sci-11105-storage-location-creation-modal 2024-09-30 13:24:09 +02:00
Martin Artnik
d2e74bddde
Merge pull request #7897 from aignatov-bio/ai-sci-11104-improve-image-preview-on-storage-location
Improve image preview positioning [SCI-11104]
2024-09-30 12:43:16 +02:00
Martin Artnik
37174b5e3e
Merge pull request #7900 from aignatov-bio/ai-sci-11116-add-grid-and-size-validation-to-storage-locations
Fix validation for storage locations metadata [SCI-11116]
2024-09-30 12:43:06 +02:00
aignatov-bio
ce5a0b7ce0
Add search by repository id [SCI-11106] (#7894) 2024-09-30 12:40:30 +02:00
Anton
55f9dd4964 Fix validation for storage locations metadata [SCI-11116] 2024-09-30 11:02:32 +02:00
Martin Artnik
5d7195af2e Merge branch 'develop' into features/file-versioning 2024-09-30 10:16:55 +02:00
ajugo
67f8049920
Merge pull request #7899 from rekonder/aj_SCI_11024
Fix carcal version [SCI-11024]
2024-09-30 08:07:42 +02:00
Andrej
e53ea89f14 Fix carcal version [SCI-11024] 2024-09-27 16:03:05 +02:00
Anton
0306aa79bb Fixes for storage locations creation modal [SCI-11105] 2024-09-27 15:17:30 +02:00
Anton
92da33ec22 Improve image preview positioning [SCI-11104] 2024-09-27 14:26:32 +02:00
Alex Kriuchykhin
8552cd9600
Remove dev packages from production Docker image, update omniauth-saml and nokogiri gems [SCI-11112] (#7896) 2024-09-27 13:56:32 +02:00
Martin Artnik
d617a4de02
Merge pull request #7895 from artoscinote/ma_SCI_11103
Fix shared location status display [SCI-11103]
2024-09-27 13:47:02 +02:00
Martin Artnik
c70b230c6e Remove unassign logic for unshared repository [SCI-11108] 2024-09-27 13:25:11 +02:00
Martin Artnik
42be903fc0 Pass root location share status to child location serializer [SCI-11103] 2024-09-27 13:23:51 +02:00
Martin Artnik
2ce7c24df1 Fix storage location breadcrumbs for shared locations [SCI-11103] 2024-09-27 12:45:07 +02:00
Martin Artnik
a7e025736b
Merge pull request #7893 from artoscinote/ma_SCI_11108
Don't unassign items when unsharing inventories [SCI-11108]
2024-09-27 12:23:26 +02:00
Martin Artnik
e0370e061d Don't unassign items when unsharing inventories [SCI-11108] 2024-09-27 12:22:33 +02:00
Martin Artnik
b9540cafb2
Merge pull request #7891 from aignatov-bio/ai-sci-11107-show-selected-position-in-assign-modal
Show selected position in assign modal [SCI-11107]
2024-09-26 17:19:25 +02:00
Anton
a251a18d46 Show selected position in assign modal [SCI-11107] 2024-09-26 17:09:04 +02:00
aignatov-bio
b424fa4491
Merge pull request #7890 from aignatov-bio/ai-sci-11101-fix-sublocation-counter-for-deleted-locations
Fix sublocation counter for deleted locations [SCI-11101]
2024-09-26 15:01:47 +02:00
aignatov-bio
40228a9fd1
Merge pull request #7889 from aignatov-bio/ai-sci-11106-add-serach-to-row-selection
Add search to repository row selection [SCI-11106]
2024-09-26 14:25:55 +02:00
aignatov-bio
6b42ea9cb1
Merge pull request #7888 from aignatov-bio/ai-sci-11097-fix-team-switch-in-storage-locations
Add team switch to storage locations [SCI-11097]
2024-09-26 14:23:40 +02:00
Anton
b43ce7c73f Fix sublocation counter for deleted locations [SCI-11101] 2024-09-26 14:21:22 +02:00
Anton
9e70d5b935 Add search to repository row selection [SCI-11106] 2024-09-26 14:00:59 +02:00
Anton
759fd30747 Add team switch to storage locations [SCI-11097] 2024-09-26 13:55:31 +02:00
Andrej
737d12f97f Merge branch 'develop' into features/custom-docx-reports 2024-09-26 11:57:38 +02:00
ajugo
96835a171e
Merge pull request #7882 from rekonder/aj_SCI_11059
Show hashed api key on the frontend [SCI-11059]
2024-09-25 15:05:31 +02:00
Alex Kriuchykhin
27a0f462eb
Fix Chromium execution failure in Docker containers (#7887) 2024-09-25 14:57:46 +02:00
Martin Artnik
a4f5b3c724
Merge pull request #7886 from artoscinote/ma_SCI_11102
Fix team sharing logic [SCI-11102]
2024-09-25 14:30:53 +02:00
Martin Artnik
c7f175b71b Fix team sharing logic [SCI-11102] 2024-09-25 14:28:32 +02:00
Martin Artnik
00200823eb
Merge pull request #7885 from artoscinote/ma_SCI_11100
Fix shareable viewable scope [SCI-11100]
2024-09-25 14:18:03 +02:00
aignatov-bio
a70b081c38
Merge pull request #7884 from aignatov-bio/ai-sci-11084-add-storage-location-banner-to-item-card
Add placeholder for disabled storage locations to item card [SCI-11084]
2024-09-25 14:14:01 +02:00
Martin Artnik
283b1e8175 Fix shareable viewable scope [SCI-11100] 2024-09-25 14:13:51 +02:00
aignatov-bio
1c27d388fc
Merge pull request #7883 from aignatov-bio/ai-sci-11097-add-smart-annotation-notifications-for-storage-locations
Add smart annotation notifications for storage locations [SCI-11097]
2024-09-25 13:42:08 +02:00