Commit graph

2223 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
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
Anton
e5196774fd Add restricted extensions for scinote edit [SCI-11010] 2024-09-04 11:10:03 +02:00
Martin Artnik
40355ae6c8 Generalize team sharing logic, implement sharing for storage locations [SCI-10865] 2024-08-27 13:31:50 +02:00
Martin Artnik
a85fc77261 Merge branch 'develop' into features/storage-locations 2024-08-26 11:12:04 +02:00
Anton
3c9d2b9a39 Fix shared task tooltip [SCI-10960] 2024-08-06 15:39:58 +02:00
Anton
0dd371abea Fix css for stroge locations [SCI-10959] 2024-08-06 15:13:21 +02:00
Anton
83d9c88546 Add filters to storage locations [SCI-10927] 2024-08-02 14:01:41 +02:00
Anton
124810e07e Add locations to item card [SCI-10923] 2024-08-01 15:07:43 +02:00
Anton
49ddeb7403 Merge branch 'develop' into features/storage-locations 2024-07-31 12:19:31 +02:00
Anton
2da397cc76 Add assign/unassign modal and move modal [SCI-10870] 2024-07-29 16:06:21 +02:00
Andrej
e4fb5d71df Add permissions for storage location and rename box to container [SCI-10882] 2024-07-29 09:46:45 +02:00
Anton
50928f6948 Add toolbar to container table [SCI-10868] 2024-07-25 12:06:56 +02:00
Andrej
9d541e28b2 Add delete location action [SCI-10864] 2024-07-24 15:28:23 +02:00
Anton
612e6a8a24 Add box view [SCI-10866] 2024-07-24 13:25:20 +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
Andrej
2f53772f61 Add move modal for storage locations [SCI-10863] 2024-07-23 09:41:19 +02:00
Martin Artnik
7f2d4cba3e Merge branch 'develop' into features/ui-tweaks 2024-07-22 10:59:12 +02:00
Anton
d0c07d6a3d Add create/edit modal for storage locations [SCI-10860]/ 2024-07-19 13:58:43 +02:00
aignatov-bio
60ce8aa425
Merge pull request #7728 from aignatov-bio/ai-sci-10861-add-storage-locations-toolbar
Add toolbar for storage locations [SCI-10861]
2024-07-18 11:53:36 +02:00
Anton
782256f655 Add toolbar for storage locations [SCI-10861] 2024-07-18 11:46:30 +02:00
Martin Artnik
b7c30bbf0b Merge branch 'develop' into features/storage-locations 2024-07-18 11:45:16 +02:00
Anton
1090fc3cf8 Add storage locations table [SCI-10857] 2024-07-16 15:23:15 +02:00
aignatov-bio
b5d0837b93
Merge pull request #7681 from aignatov-bio/ai-sci-10785-add-toolbar-for-steps
Add toolbar for steps and results [SCI-10785]
2024-07-12 10:56:40 +02:00
Martin Artnik
34e9c9f4e8
Merge pull request #7696 from artoscinote/ma_SCI_10853
Change import activites and flash messages [SCI-10853]
2024-07-11 15:04:55 +02:00
Andrej
181b55b1a1 Fix importing items when input format is incorrect [SCI-10874] 2024-07-11 11:43:37 +02:00