Commit graph

13613 commits

Author SHA1 Message Date
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
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
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
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
Anton
e5196774fd Add restricted extensions for scinote edit [SCI-11010] 2024-09-04 11:10:03 +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
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
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
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