Commit graph

17412 commits

Author SHA1 Message Date
Martin Artnik
7ca35a9c33 Fix permission checks for nested storage locations [SCI-10865] 2024-09-24 12:32:34 +02:00
dependabot[bot]
a9287105e2
Bump puma from 6.4.2 to 6.4.3 (#7873)
Bumps [puma](https://github.com/puma/puma) from 6.4.2 to 6.4.3.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.4.2...v6.4.3)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-24 10:43:40 +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
aignatov-bio
9a90ac15ab
Merge pull request #7871 from aignatov-bio/ai-sci-11066-fix-reminders-for-storage-locations
Fix reminders on storage location [SCI-11066]
2024-09-20 11:55:38 +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
dependabot[bot]
d13cc41a37
Bump omniauth-saml from 2.1.1 to 2.1.2 (#7870)
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases)
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v2.1.1...v2.1.2)

---
updated-dependencies:
- dependency-name: omniauth-saml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-09-20 10:10:30 +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
aignatov-bio
79a88fc07e
Merge pull request #7867 from aignatov-bio/ai-sci-11072-fix-smart-annotation-in-storage-locations
Fix smart annotations on storage locations [SCI-11072]
2024-09-19 13:43:08 +02:00
Anton
f2796e54c2 Fix smart annotations on storage locations [SCI-11072] 2024-09-19 11:32:36 +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
b9fd5148cf
Merge pull request #7864 from aignatov-bio/ai-sci-11067-fix-search-and-filter
Fix search and filter on storage locations [SCI-11067][SCI-11068]
2024-09-18 14:59:51 +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
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
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
Oleksii Kriuchykhin
62acbe0059 Bump version to 1.36.2.2 2024-09-16 15:21:35 +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
1d4e9077cc
Merge pull request #7854 from artoscinote/ma_SCI_11057
Fix viewable scope for sharable models [SCI-11057]
2024-09-16 11:48:44 +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
98415c0d8d
Merge pull request #7850 from artoscinote/ma_SCI_11050
Refactor import and add activities [SCI-11050]
2024-09-13 14:01:18 +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