Commit graph

2249 commits

Author SHA1 Message Date
Andrej
4fb54535ad Merge branch 'features/protocol-template-renaming' into develop 2024-11-05 10:34:14 +01:00
Martin Artnik
3961b21c00 Add confirmation modal for repository file delete [SCI-11198] 2024-10-21 17:23:13 +02:00
Andrej
fdcf14efd6 Merge branch 'develop' into features/protocol-template-renaming 2024-10-17 14:28:02 +02:00
Martin Artnik
7804b46937 Merge branch 'develop' into features/file-versioning 2024-10-16 13:22:28 +02:00
Martin Artnik
57079bea51 Add missing translation [SCI-11188] 2024-10-15 12:55:43 +02:00
ajugo
cfefef8d01
Merge pull request #7965 from rekonder/aj_SCI_11157
Add activities for asset restore [SCI-11157]
2024-10-14 13:53:54 +02:00
Andrej
262ae9c2c0 Add activities for asset restore [SCI-11157] 2024-10-14 13:45:39 +02:00
Martin Artnik
8c356f7293 Merge branch 'develop' into features/file-versioning 2024-10-14 13:09:42 +02:00
Anton
c71366acc5 Update notifications flyout [SCI-10735] 2024-10-14 10:29:01 +02:00
Andrej
40a7b88d1a Add warning for unsharing repository relationships [SCI-11110] 2024-10-10 12:55:03 +02:00
aignatov-bio
a03bd8e4ec
Merge pull request #7953 from aignatov-bio/ai-sci-11162-improve-box-item-move-modal
Improve box item move modal [SCI-11162]
2024-10-09 14:19:13 +02:00
Anton
6c7736b81e Improve box item move modal [SCI-11162] 2024-10-09 13:14:26 +02:00
Martin Artnik
ca944f1bf7 Fix storage location item move activity [SCI-11164] 2024-10-09 11:44:49 +02:00
Martin Artnik
f3420e33e2
Merge pull request #7951 from artoscinote/ma_SCI_11159
Add missing trasnlations for confirmation modal [SCI-11159]
2024-10-09 11:20:36 +02:00
Martin Artnik
250eba45e0 Add missing trasnlations for confirmation modal [SCI-11159] 2024-10-09 11:17:57 +02:00
Anton
e88cc66e69 Fix for storage locations import [SCI-11152] 2024-10-08 14:39:08 +02:00
Martin Artnik
f7dde1b24c Merge branch 'develop' into features/file-versioning 2024-10-08 11:04:33 +02:00
Martin Artnik
8515e29ee9
Revert "Don't make snapshots of hidden inventories [SCI-11123]" 2024-10-08 10:17:15 +02:00
Martin Artnik
11f1025a92 Don't make snapshots of hidden inventories [SCI-11123] 2024-10-07 16:25:56 +02:00
Martin Artnik
122f389629
Merge pull request #7931 from aignatov-bio/ai-sci-11149-fix-moving-for-shared-locations
Fix moving action for shared locations [SCI-11149]
2024-10-07 11:54:18 +02:00
Anton
4ddf3d24cd Fix moving action for shared locations [SCI-11149] 2024-10-07 11:53:15 +02:00
Martin Artnik
ce287fa931 Storage location activity fixes [SCI-11145] 2024-10-07 11:03:07 +02:00
Anton
f2aa3842fd Fix assign modal storage locations item card interactions [SCI-11141] 2024-10-03 14:11:18 +02:00
Martin Artnik
98d70d6c8a
Merge pull request #7915 from artoscinote/ma_SCI_11043
Add file editing & versioning to inventories [SCI-11043]
2024-10-02 15:12:30 +02:00
Martin Artnik
74f3ea2108 Add file editing & versioning to inventories [SCI-11043] 2024-10-02 14:22:51 +02:00
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
ajugo
5ab1fbbab9
Improve error handling for sso [SCI-11034] (#7892) 2024-10-02 10:19:51 +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
a251a18d46 Show selected position in assign modal [SCI-11107] 2024-09-26 17:09:04 +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
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
Martin Artnik
0f0868f932 Add missing activities [SCI-11050] 2024-09-24 12:35:13 +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
Anton
5ac9f16f58 Add unassign action to item card [SCI-11086][SCI-11079] 2024-09-23 15:17:50 +02:00
aignatov-bio
17fd864f5d
Merge pull request #7874 from aignatov-bio/ai-sci-11075-fix-sharing-label-for-storage-locations
Storage locations fixes for sharing and moving locations [SCI-11075][SCI-11076]
2024-09-23 12:25:21 +02:00
Anton
c5d6c8e039 Storage locations fixes for sharing and moving locations [SCI-11075] 2024-09-23 10:10:30 +02:00
Anton
3fc6f20bd4 Fix import and validation for containers without box [SCI-11065] 2024-09-20 15:18:14 +02:00
Martin Artnik
6c2c416bbf Implement disabled file versioning state [SCI-11040] 2024-09-18 13:51:03 +02:00
Martin Artnik
444b561060 Implement file versions modal [SCI-11039] 2024-09-17 15:19:44 +02:00
Anton
8e79237e2f Fix interactions for box locations [SCI-11033] 2024-09-12 14:59:41 +02:00
Martin Artnik
2039a65e9b Merge branch 'features/storage-locations' into develop 2024-09-12 12:38:32 +02:00
Martin Artnik
cf7c87a116
Merge pull request #7846 from artoscinote/ma_SCI_10925
Implement Storage location activities [SCI-10925]
2024-09-12 12:25:13 +02:00
Martin Artnik
c4c14553ff Implement storage location activities [SCI-10925] 2024-09-11 14:36:14 +02:00
Anton
5e299cef65 Enable edit for empty box and fix team import/export [SCI-10947][SCI-11032] 2024-09-11 12:55:21 +02:00
Anton
43cec17f00 Add import/export for box [SCI-10954] 2024-09-10 15:14:52 +02:00