Commit graph

13644 commits

Author SHA1 Message Date
Martin Artnik
52c0159eb8
Merge pull request #7911 from artoscinote/ma_SCI_11043
Change how asset sync conflict resolution works with file versioning [SCI-11043]
2024-10-02 11:18:43 +02:00
Martin Artnik
104825af79 Change how asset sync conflict resolution works with file versioning [SCI-11043] 2024-10-02 11:10:34 +02:00
Martin Artnik
0223d7773c Merge branch 'develop' into features/file-versioning 2024-10-02 11:07:18 +02:00
Alex Kriuchykhin
635d927e6d
Remove obsolete devise-async gem, switch to built-in async email delivery (#7643) 2024-10-02 11:02:39 +02:00
ajugo
5ab1fbbab9
Improve error handling for sso [SCI-11034] (#7892) 2024-10-02 10:19:51 +02:00
Martin Artnik
77740275e4 Optimize loading of assigned box items [SCI-11132] 2024-10-01 16:55:52 +02:00
aignatov-bio
0aa2fe559f
Merge pull request #7908 from aignatov-bio/ai-sci-11128-add-team-redirect-to-storage-locations-activity
Add team redirect to storage locations activity [SCI-11128]
2024-10-01 15:41:20 +02:00
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
Anton
14dea69717 update permissions for shared locations [SCI-11118] 2024-10-01 11:55:44 +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
Anton
1a9a3bdad8 Fix shared locations perimission in move modal [SCI-11117] 2024-09-30 13:42:05 +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
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
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
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
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
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
Anton
f3eb94f9c2 Add placeholder for disabled storage locations to item card [SCI-11084] 2024-09-25 13:37:34 +02:00
Anton
c27646aa3d Add smart annotation notifications for storage locations [SCI-11097] 2024-09-25 12:06:20 +02:00
aignatov-bio
677b199bfa
Merge pull request #7881 from aignatov-bio/ai-sci-11082-add-descripiton-modal-to-storage-location
Add description modal to storage locations [SCI-11082]
2024-09-25 11:29:47 +02:00
Andrej
85cd2bcafb Show hashed api key on the frontend [SCI-11059] 2024-09-25 09:24:27 +02:00
Anton
9b8f224396 Add description modal to storage locations [SCI-11082] 2024-09-24 13:33:21 +02:00
Martin Artnik
7ca35a9c33 Fix permission checks for nested storage locations [SCI-10865] 2024-09-24 12:32:34 +02:00
aignatov-bio
921d4905a3
Merge pull request #7877 from aignatov-bio/ai-sci-11086-fix-unassign-storage-location-from-item-card
Add unassign action to item card [SCI-11086][SCI-11079]
2024-09-23 17:57:53 +02:00