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 |
|
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 |
|
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 |
|
Alex Kriuchykhin
|
27a0f462eb
|
Fix Chromium execution failure in Docker containers (#7887)
|
2024-09-25 14:57:46 +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 |
|
Alex Kriuchykhin
|
c2763c7302
|
Add options for selecting custom database connection adapters and params [SCI-11083] (#7875)
|
2024-09-24 13:02:18 +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
|
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
|
48fb68c07c
|
Implement restore functionality in file versions modal [SCI-11042]
|
2024-09-17 16:26:45 +02:00 |
|
Martin Artnik
|
444b561060
|
Implement file versions modal [SCI-11039]
|
2024-09-17 15:19:44 +02:00 |
|
Oleksii Kriuchykhin
|
7cc037100d
|
Merge branch 'hotfix/1.36.2.2' into develop
|
2024-09-16 15:36:52 +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
|
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 |
|
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 |
|
Alex Kriuchykhin
|
535d24fe4f
|
Move from running application containers with root user to dedicated scinote user [SCI-11020] (#7834)
|
2024-09-06 12:54:15 +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 |
|
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 |
|
Martin Artnik
|
fa2ef02c3e
|
Merge pull request #7789 from scinote-eln/hotfix/1.36.0.1
Hotfix/1.36.0.1
|
2024-08-07 13:36:40 +02:00 |
|
Martin Artnik
|
c43a730972
|
Fix Grover config [SCI-10931]
|
2024-08-06 17:42:58 +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 |
|
Martin Artnik
|
b6af1031f5
|
Revert "Timeout slow libreoffice preview generation [SCI-10809] (#7678)"
This reverts commit 1265f29a9e.
|
2024-08-06 10:58:50 +02:00 |
|
Anton
|
83d9c88546
|
Add filters to storage locations [SCI-10927]
|
2024-08-02 14:01:41 +02:00 |
|
Martin Artnik
|
1265f29a9e
|
Timeout slow libreoffice preview generation [SCI-10809] (#7678)
|
2024-08-02 10:24:03 +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 |
|
Anton
|
49ddeb7403
|
Merge branch 'develop' into features/storage-locations
|
2024-07-31 12:19:31 +02:00 |
|