Commit graph

13822 commits

Author SHA1 Message Date
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
Anton
714b7e85ea Change create by on location duplicate [SCI-11136] 2024-10-02 12:43:47 +02:00
aignatov-bio
f6bb7022d9
Merge pull request #7910 from aignatov-bio/ai-sci-11129-improve-storage-locations-search
Improve storage locations search [SCI-11129]
2024-10-02 12:39:36 +02:00
Anton
c760b215de Storage locations fix name ordering and move modal ordering [SCI-11133] 2024-10-02 12:14:18 +02:00
Anton
f03f22fd8a Hide archived rows and repositories in storage locations assignment modal [SCI-11131] 2024-10-02 11:48:25 +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
Anton
ba1162c453 Improve storage locations search [SCI-11129] 2024-10-02 11:05:15 +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
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
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
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
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
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
aignatov-bio
01b585ebda
Merge pull request #7876 from aignatov-bio/ai-sci-11077-container-move-not-working
Storage locations box fixes [SCI-11077][SCI-11078][SCI-11080]
2024-09-23 17:57:24 +02:00
aignatov-bio
07ba4de28f
Merge pull request #7878 from aignatov-bio/ai-sci-11081-fix-file-extension-for-file-uploader
Fix file extension validation for file uploader [SCI-11081]
2024-09-23 17:57:13 +02:00
Anton
a30898fe6b Fix file extension validation for file uploader [SCI-11081] 2024-09-23 15:22:31 +02:00
Anton
5ac9f16f58 Add unassign action to item card [SCI-11086][SCI-11079] 2024-09-23 15:17:50 +02:00
Anton
52d2cd6d0c Storage locations box fixes [SCI-11077][SCI-11078][SCI-11080] 2024-09-23 12:47:46 +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
aignatov-bio
c949705036
Merge pull request #7872 from aignatov-bio/ai-sci-11065-update-storage-locations-behavior-for-non-grid-boxes
Fix import and validation for containers without grid [SCI-11065]
2024-09-23 12:25:01 +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
Anton
5e2eda547b Fix reminders on storage location [SCI-11066] 2024-09-20 11:41:08 +02:00
aignatov-bio
656e386cdd
Merge pull request #7868 from aignatov-bio/ai-sci-11058-storage-locations-fixes
Storage locations fixes [SCI-11058]
2024-09-20 11:38:06 +02:00
Andrej
d8c3d9a129 Merge branch 'develop' into features/custom-docx-reports 2024-09-20 11:04:47 +02:00
ajugo
c53034359a
Merge pull request #7869 from rekonder/aj_SCI_11074
Fix displaying of checklist items for repository snapshots [SCI-11074]
2024-09-19 15:54:26 +02:00
Andrej
fa3d96dbb3 Fix displaying of checklistitems for repository snapshots [SCI-11074] 2024-09-19 15:39:52 +02:00
Anton
2f6b56aa8b Storage locations fixes [SCI-11058] 2024-09-19 15:21:40 +02:00
Anton
f2796e54c2 Fix smart annotations on storage locations [SCI-11072] 2024-09-19 11:32:36 +02:00
Andrej
8bc8ccb2f7 Improve rendering of docx tables [SCI-11056] 2024-09-18 16:24:35 +02:00
Martin Artnik
926a9ee6d4
Merge pull request #7865 from artoscinote/ma_SCI_11057
Simplify and fix shareable scope [SCI-11057]
2024-09-18 15:09:10 +02:00
Martin Artnik
1449b581f1 Simplify and fix shareable scope [SCI-11057] 2024-09-18 14:54:18 +02:00
Anton
103a687206 Fix search and filter on storage locations [SCI-11067][SCI-11068] 2024-09-18 14:31:36 +02:00
Martin Artnik
294eef13a2 Fix file versioning disclamer load [SCI-11040] 2024-09-18 14:12:42 +02:00
Martin Artnik
401f1d7fa3 Merge branch 'develop' into features/file-versioning 2024-09-18 14:06:07 +02:00
Martin Artnik
6c2c416bbf Implement disabled file versioning state [SCI-11040] 2024-09-18 13:51:03 +02:00
Martin Artnik
9aa43f4c36
Add restore file permission check [SCI-11042] 2024-09-18 13:36:49 +02:00
Andrej
4ddbe53f0c Merge branch 'develop' into features/custom-docx-reports 2024-09-18 08:06:20 +02:00
Martin Artnik
48fb68c07c Implement restore functionality in file versions modal [SCI-11042] 2024-09-17 16:26:45 +02:00
Martin Artnik
ada9cdf696
Merge pull request #7859 from aignatov-bio/ai-sci-11060-add-sorting-to-storage-locations
Add sorting to storage locations [SCI-11060]
2024-09-17 15:29:16 +02:00
Martin Artnik
d498bd8c0d
Merge pull request #7861 from aignatov-bio/ai-sci-11003-fix-navigator-for-archived-task
Fix navigator for archived task [SCI-11003]
2024-09-17 15:28:35 +02:00
Anton
a5fe735822 Fix navigator for archived task [SCI-11003] 2024-09-17 15:26:48 +02:00
Martin Artnik
444b561060 Implement file versions modal [SCI-11039] 2024-09-17 15:19:44 +02:00
Martin Artnik
157a23d025 Fix viewable scope for sharable models [SCI-11057] 2024-09-17 15:16:02 +02:00
Anton
9d65cdab31 Add sorting to storage locations [SCI-11060] 2024-09-17 14:01:17 +02:00
Martin Artnik
4f9f48de23
Merge pull request #7858 from aignatov-bio/ai-sci-10933-fixs-tags-interaction-on-canvas-and-task
Fix tags interaction on canvas and task page [SCI-10933]
2024-09-17 11:05:13 +02:00
Anton
47bbc1d43d Fix tags interaction on canvas and task page [SCI-10933] 2024-09-17 10:48:41 +02:00
ajugo
47b3a256fa
Merge pull request #7857 from rekonder/aj_SCI_11037
Fix failed docx generation when you can not find image [SCI-11037]
2024-09-17 09:53:41 +02:00
Andrej
396c042ff8 Fix failes docx generation when you can not find image [SCI-11037] 2024-09-17 08:40:45 +02:00
Oleksii Kriuchykhin
7cc037100d Merge branch 'hotfix/1.36.2.2' into develop 2024-09-16 15:36:52 +02:00
Martin Artnik
a11615cbf5
Merge pull request #7856 from aignatov-bio/ai-sci-add-placeholder-for-storage-location-sorting
Add placeholder to storage location sorting
2024-09-16 14:24:48 +02:00
Anton
9a257e0a81 Add placeholder to storage location sorting 2024-09-16 14:22:57 +02:00
Martin Artnik
16e57763cd
Merge pull request #7855 from aignatov-bio/ai-sci-11047-add-sorting-to-list-of-locations
Add repository item card to storage container [SCI-11048]
2024-09-16 14:09:05 +02:00
Anton
bfffcda8ac Remove unused method from item sidebar title 2024-09-16 11:59:35 +02:00
Anton
f4e1498df1 Add repository item card to storage container [SCI-11048] 2024-09-16 11:50:54 +02:00
Martin Artnik
30f9a911c2 Fix viewable scope for sharable models [SCI-11057] 2024-09-16 11:42:29 +02:00
Martin Artnik
388926e021 Add versioned file attachments to assets [SCI-10774] 2024-09-16 10:56:18 +02:00
Martin Artnik
bf1c446cc2
Merge pull request #7853 from artoscinote/ma_SCI_11050
Import fixes [SCI-11050]
2024-09-16 10:12:12 +02:00
aignatov-bio
53c6056706
Merge pull request #7852 from aignatov-bio/ai-sci-11047-add-sorting-to-list-of-locations
Add sorting to list of locations [SCI-11047]
2024-09-16 10:07:56 +02:00
Martin Artnik
dd2499a70c Fix position validation [SCI-11050] 2024-09-13 15:34:54 +02:00
Martin Artnik
ddc7cf9bf6 Remove obsolete logic from location importer [SCI-11050] 2024-09-13 15:34:46 +02:00
Martin Artnik
d6ca444f4a Fix position validation [SCI-11050] 2024-09-13 15:17:32 +02:00
Martin Artnik
04efd5f84f Fix position validation for StorageLocationRepositoryRow [SCI-11050] 2024-09-13 13:58:23 +02:00
Martin Artnik
60d46efdd7 Refactor import and add activities [SCI-11050] 2024-09-13 13:43:45 +02:00
Alex Kriuchykhin
7f15eecbd8
Optimize repository datatable cell serializer lookup, remove N+1 queries [SCI-11053] (#7851) 2024-09-13 13:32:01 +02:00
Anton
e20467bf51 Add sorting to list of locations [SCI-11047] 2024-09-13 13:10:06 +02:00
Martin Artnik
173fdda28a
Merge pull request #7847 from aignatov-bio/ai-sci-11033-add-missing-interactions-storage-location-table
Fix interactions for box locations [SCI-11033]
2024-09-12 16:51:12 +02:00
Martin Artnik
c4b3b10429 Fix shareable scope [SCI-10865] 2024-09-12 16:24:46 +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
326a0c1ec4 (Re)implement team sharing activities [SCI-10925] 2024-09-11 16:11:11 +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
Martin Artnik
e3a5b15180 Fix destroying repository rows [SCI-11015] 2024-09-10 10:19:28 +02:00
Martin Artnik
7f47256e3a
Fix creating storage locations [SCI-10865] 2024-09-09 12:46:42 +02:00
Andrej
9d7a0c268d Exclude timestamps for docx reports for task results [SCI-11017] 2024-09-09 11:37:52 +02:00
Martin Artnik
57444dca65 Skip initialization of sharable models if DB is not connected 2024-09-09 10:39:43 +02:00
Martin Artnik
34c8da949f
Merge pull request #7827 from artoscinote/ma_SCI_10865
Implement storage location sharing [SCI-10865]
2024-09-09 10:25:03 +02:00
Andrej
2ccf1abc91 Remove tag for attached files in docx [SCI-11027] 2024-09-05 16:21:39 +02:00
Andrej
cce140d387 Update exclude metadata setting [SCI-11017] 2024-09-05 13:41:35 +02:00
Anton
c641e6b552 Fix task table name renderer [SCI-11009] 2024-09-05 12:17:57 +02:00
Martin Artnik
e57dc3d213 Fix shared objects for different repository types [SCI-10865] 2024-09-04 14:04:56 +02:00
Martin Artnik
c895047114 Remove unused permission helpers [SCI-10865] 2024-09-04 13:36:12 +02:00
Andrej
cb4675c522 Fix moving of dropdowns on report wizard [SCI-11016] 2024-09-04 11:56:07 +02:00
Anton
e5196774fd Add restricted extensions for scinote edit [SCI-11010] 2024-09-04 11:10:03 +02:00
Andrej
b2539d1366 Fix repositories component for docx [SCI-10988] 2024-09-04 09:17:02 +02:00
Martin Artnik
5ba07aec28 Implement storage location sharing logic and permissions [SCI-10865] 2024-09-03 15:50:10 +02:00
Anton
f8fd07695f Move table renderers to components [SCI-11009] 2024-09-03 13:22:57 +02:00
Alex Kriuchykhin
c8af20a822
Restrict ActiveStorage previews format to only PNG or JPEG [SCI-10969] (#7810) 2024-09-02 13:44:57 +02:00
Martin Artnik
c0d386f0c1 Merge branch 'develop' into features/storage-locations 2024-08-30 13:28:19 +02:00
Andrej
dddffc11cd Improve report wizards [SCI-10989] 2024-08-28 12:14:45 +02:00
Martin Artnik
efe19a776e Fix shared task assigned items [SCI-11007] 2024-08-28 11:42:30 +02:00
Martin Artnik
2ebb88c300 Fix shared tasks [SCI-11007] 2024-08-28 11:19:27 +02:00
Martin Artnik
e4e547aa6d Fix project export permission checks [SCI-11005] 2024-08-27 14:21:02 +02:00
Andrej
f912f6bc41 Fix docx templates [SCI-10988] 2024-08-27 13:40:10 +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
0581931ad9 Merge branch 'develop' into features/storage-locations 2024-08-27 13:18:04 +02:00
Andrej
9cc72e0957 Merge branch 'develop' into features/custom-docx-reports 2024-08-27 12:56:05 +02:00
Martin Artnik
726b1973f1 Update mapping step selections once an item is selected [SCI-11004] 2024-08-27 11:20:46 +02:00
Martin Artnik
64f7f1bad4 Fix deleted result activities, experiment activity permission checks, dashboard permission checks [SCI-11000] 2024-08-26 12:07:13 +02:00
Martin Artnik
a85fc77261 Merge branch 'develop' into features/storage-locations 2024-08-26 11:12:04 +02:00
Martin Artnik
a957e2e442 Simplify activity queries [SCI-11000] 2024-08-26 10:54:24 +02:00
Martin Artnik
74e6d5074e Fix permission check for protocol template activities [SCI-11000] 2024-08-26 10:12:54 +02:00
Martin Artnik
6b5a5cddf8 Fix task activity permission checks [SCI-11000] 2024-08-26 09:48:10 +02:00
Martin Artnik
e7b4fd0151
Merge pull request #7809 from artoscinote/ma_SCI_10988
Properly handle experiments with hidden tasks in navigator [SCI-10988]
2024-08-21 11:09:35 +02:00
ajugo
b380a009d8
Merge pull request #7808 from rekonder/aj_SCI_10997
Fix inventory item counter on inventory page [SCI-10997]
2024-08-21 11:09:16 +02:00
Martin Artnik
531cdbf23c Properly handle experiments with hidden tasks in navigator [SCI-10988] 2024-08-21 11:06:02 +02:00
Andrej
dd42485cd4 Fix inventory item counter on inventory page [SCI-10997] 2024-08-20 17:28:53 +02:00
Andrej
7e0cd6bd10 Fix collapsing of results [SCI-10995] 2024-08-20 16:26:32 +02:00
Alex Kriuchykhin
e561594a47
Fix permissions checking user assignments scopes [SCI-10991] (#7805) 2024-08-20 14:47:32 +02:00
Oleksii Kriuchykhin
0cd2493f8b Fix listing of globally shared inventories [SCI-10991] 2024-08-20 11:26:57 +02:00
Oleksii Kriuchykhin
9eee05f906 Fix inventory activities listing, fix inventory viewable_by_user scope, fix inventory fetching in reports [SCI-10991][SCI-10994] 2024-08-19 17:37:04 +02:00
aignatov-bio
36821c691f
Merge pull request #7799 from aignatov-bio/ai-sci-10978-checkbox-to-hide-metadata-from-reports
Add exclude metadata from reports [SCI-10978]
2024-08-19 14:09:41 +02:00
Martin Artnik
495618abe4 Merge branch 'develop' into features/repository-permissions-rework 2024-08-14 15:06:18 +02:00
Anton
5105079f81 Add exclude metadata settings [SCI-10978] 2024-08-14 11:05:31 +02:00
Anton
6d7696670e Merge branch 'develop' into features/custom-docx-reports 2024-08-13 14:14:28 +02:00
Anton
b4bcd69683 Add exclude metadata from reports [SCI-10978] 2024-08-13 14:14:00 +02:00
Martin Artnik
2370cfaf15 Don't show content toolbar if no inserts are available [SCI-10980] 2024-08-13 13:24:37 +02:00
Anton
5841fbdda1 Add basic support for custom templates docx [SCI-10967] 2024-08-13 11:44:32 +02:00
Martin Artnik
82ebac9cc1
Merge pull request #7792 from okriuchykhin/ok_SCI_10972
Prevent repository access to users without repository READ permission on team level [SCI-10972]
2024-08-12 13:05:19 +02:00
Martin Artnik
ce4f79e645
Merge pull request #7794 from artoscinote/ma_SCI_10975
Fix stock field in item card for disabled stock management [SCI-10975]
2024-08-12 12:51:34 +02:00
Martin Artnik
551c23e709 Fix stock field in item card for disabled stock management [SCI-10975] 2024-08-12 12:50:03 +02:00
Martin Artnik
7f25e8e474 Don't fail report if a TinyMCE image variant fails to generate [SCI-10970] 2024-08-12 12:28:55 +02:00
Oleksii Kriuchykhin
ac32b5b04a Prevent repository access to users without repository READ permission on team level [SCI-10972] 2024-08-12 10:54:35 +02:00
Anton
fb8d7e5741 Add reminders to storage locations [SCI-10961] 2024-08-08 11:58:27 +02:00
Martin Artnik
3a6888b276
Merge pull request #7788 from aignatov-bio/ai-sci-10968-fix-insert-content-toolbar
Hide action toolbar on collapsed result [SCI-10968]
2024-08-08 10:07:16 +02:00
Anton
8d942d857f Hide action toolbar on collapsed result [SCI-10968] 2024-08-07 11:53:00 +02:00
Anton
ee16df9014 Fix button style on archive cards [SCI-10965] 2024-08-07 11:39:43 +02:00
Anton
3c9d2b9a39 Fix shared task tooltip [SCI-10960] 2024-08-06 15:39:58 +02:00
aignatov-bio
f2ed356f85
Merge branch 'features/storage-locations' into ai-sci-10959-fix-css-for-storage-locations 2024-08-06 15:16:03 +02:00
Anton
0dd371abea Fix css for stroge locations [SCI-10959] 2024-08-06 15:13:21 +02:00
Klemen Benedicic
df81db30a8 Fix task protocol status button data-e2e [SCI-10963] 2024-08-06 14:00:17 +02:00
Alex Kriuchykhin
bc4b010fa2
Optimize repository export jobs [SCI-10940] (#7783) 2024-08-06 13:26:14 +02:00
Martin Artnik
b6af1031f5
Revert "Timeout slow libreoffice preview generation [SCI-10809] (#7678)"
This reverts commit 1265f29a9e.
2024-08-06 10:58:50 +02:00
KlemenSciNote
83eee9c72b
Merge pull request #7777 from KlemenSciNote/kb_SCI-10956_data-e2e-protocol-templates
Add data-e2e to publish, delete draft and linked tasks modals [SCI-10956]
2024-08-06 10:53:51 +02:00
Klemen Benedicic
b964a41e88 Merge branch 'features/storage-locations' into kb_SCI-10943_data-e2e-storage-locations 2024-08-06 09:22:12 +02:00
Klemen Benedicic
666b8badcf Add data-e2e on storage locations for Pendo [SCI-10943] 2024-08-06 09:03:00 +02:00
aignatov-bio
3c1691ab2c
Merge pull request #7780 from aignatov-bio/ai-sci-10946-add-private-rows-to-storage-locations
Add private items to storage location [SCI-10946]
2024-08-05 12:44:33 +02:00
Anton
f7e66f6190 Add private items to storage location [SCI-10946] 2024-08-05 12:36:22 +02:00
Anton
74a0afca6c Add assign action to item cards locations [SCI-10924] 2024-08-05 11:23:35 +02:00
Martin Artnik
10290d82d4
Merge branch 'features/storage-locations' into ma_SCI_10859 2024-08-05 10:34:18 +02:00
Andrej
333d62bfde Make storage locations toggleable [SCI-10950] 2024-08-02 14:40:02 +02:00
Klemen Benedicic
d41ee987f5 Add data-e2e to publish protocol, delete draft and linked tasks modals [SCI-10956] 2024-08-02 14:03:21 +02:00
Anton
83d9c88546 Add filters to storage locations [SCI-10927] 2024-08-02 14:01:41 +02:00
Anton
35b2d215f7 Fix sticky header tinymce [SCI-10953] 2024-08-02 10:55:16 +02:00
Martin Artnik
1265f29a9e
Timeout slow libreoffice preview generation [SCI-10809] (#7678) 2024-08-02 10:24:03 +02:00
Andrej
351aed9520 Fix searching through tree for location and folders [SCI-10816] 2024-08-01 16:42:33 +02:00
Andrej
b3da5cf8c3 Fix toolbar buttons on archived task canvas page [SCI-10945] 2024-08-01 15:55:30 +02:00
Martin Artnik
52f9a8411c Merge branch 'release/1.35.0' into develop 2024-08-01 15:40:09 +02:00
Anton
124810e07e Add locations to item card [SCI-10923] 2024-08-01 15:07:43 +02:00