Commit graph

17354 commits

Author SHA1 Message Date
dependabot[bot]
cc6d79a69d
Bump braces from 3.0.2 to 3.0.3 (#7641)
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-12 16:56:04 +02:00
dependabot[bot]
2e92d6b39c
Bump postcss from 8.4.31 to 8.4.32 (#7621)
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.31 to 8.4.32.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.4.31...8.4.32)

---
updated-dependencies:
- dependency-name: postcss
  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-06-12 15:19:52 +02:00
dependabot[bot]
5084af9329
Bump actionpack from 7.0.8.1 to 7.0.8.4 (#7628)
Bumps [actionpack](https://github.com/rails/rails) from 7.0.8.1 to 7.0.8.4.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.1.3.4/actionpack/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.8.1...v7.0.8.4)

---
updated-dependencies:
- dependency-name: actionpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-12 15:18:56 +02:00
Anton
2a2c2b1347 Fix repository import mapping and preview [SCI-10773] 2024-06-12 15:01:36 +02:00
Oleksii Kriuchykhin
73bebde3d9 Merge branch 'develop' 2024-06-12 14:28:10 +02:00
Oleksii Kriuchykhin
d078d0f8b0 Bump version to 1.35.0.1 2024-06-12 14:27:28 +02:00
Miha Mencin
5d35d614f9
Merge pull request #7639 from okriuchykhin/ok_SCI_10432
Revert - Fix activties for deleted results [SCI-10432]
2024-06-12 13:52:53 +02:00
Oleksii Kriuchykhin
349352773f Revert - Fix activties for deleted results [SCI-10432] 2024-06-12 13:49:12 +02:00
Oleksii Kriuchykhin
729cb9b22c Merge branch 'develop' 2024-06-12 10:38:55 +02:00
Oleksii Kriuchykhin
002524d7dc Bump version to 1.35.0 2024-06-12 10:37:41 +02:00
aignatov-bio
046db454e5
Merge pull request #7637 from KlemenSciNote/kb_SCI-10761_data-e2e-protocol-templates
e2e - Add data-e2e attributes to protocol templates [SCI-10761]
2024-06-07 13:29:09 +02:00
aignatov-bio
060a694fc0
Merge pull request #7635 from rekonder/aj_SCI_10738
Refactor inventory import backend [SCI-10738]
2024-06-07 13:26:33 +02:00
Anton
8382173b57 Remove default columns from available selection [SCI-10772] 2024-06-07 13:25:34 +02:00
Klemen Benedicic
73362c3fb3 Merge branch 'develop' into kb_SCI-10761_data-e2e-protocol-templates 2024-06-07 12:07:05 +02:00
Klemen Benedicic
40c2f1a7de Added data-e2e to protocol page [SCI-10761] 2024-06-07 12:05:31 +02:00
Martin Artnik
ba353cf3c7
Merge pull request #7636 from artoscinote/ma_SCI_10687
Optimize and fix serializer for tag updates on canvas [SCI-10687]
2024-06-07 12:03:21 +02:00
Martin Artnik
b750041b72 Optimize and fix serializer for tag updates on canvas [SCI-10687] 2024-06-07 12:00:56 +02:00
Andrej
e9d134d064 Refarctor inventory import backend [SCI-10738] 2024-06-07 10:13:27 +02:00
Anton
b4da4efe13 Make protocol toolbar responsive [SCI-10261] 2024-06-06 15:22:14 +02:00
aignatov-bio
0bf43be8c9
Merge pull request #7633 from aignatov-bio/ai-sci-8865-fix-experiment-selection-for-new-task-modal
Fix experiment selection for new task modal [SCI-8865]
2024-06-06 14:07:34 +02:00
Martin Artnik
bbc5b777df
Merge pull request #7632 from artoscinote/ma_SCI_10687
Fix reloading of tags on canvas [SCI-10687]
2024-06-06 12:03:15 +02:00
Anton
3a8fd9b12a Fix experiment selection for new task modal [SCI-8865] 2024-06-06 11:04:41 +02:00
Martin Artnik
65c276b97b Fix reloading of tags on canvas [SCI-10687] 2024-06-06 10:54:09 +02:00
Anton
4c4fcd68ae Fix merge 2024-06-05 16:33:12 +02:00
Martin Artnik
84605cf0b6
Merge pull request #7631 from artoscinote/ma_SCI_10770
Fix asset sync conflict handling for results [SCI-10770]
2024-06-05 14:52:18 +02:00
Martin Artnik
3d4ec2e28b Fix asset sync conflict handling for results [SCI-10770] 2024-06-05 14:51:00 +02:00
Anton
49d0f9e6b8 Merge branch 'develop' into features/inventory-import-improvements 2024-06-05 14:42:00 +02:00
aignatov-bio
5adb98bf46
Merge pull request #7630 from aignatov-bio/ai-sci-10769-handle-files-without-extension
Handle files without extensions [SCI-10769]
2024-06-05 14:16:33 +02:00
Anton
1c832df20c Handle files without extensions [SCI-10769] 2024-06-05 13:40:07 +02:00
Martin Artnik
4bc603fd80
Merge pull request #7629 from aignatov-bio/ai-sci-10768-fix-manage-tags-on-task-page
Fix manage tags on task page [SCI-10768]
2024-06-05 12:34:14 +02:00
Anton
9cb9618220 Fix manage tags on task page [SCI-10768] 2024-06-05 11:33:52 +02:00
Martin Artnik
9ed9b76883
Merge pull request #7627 from aignatov-bio/ai-sci-10767-add-filename-to-asset-version-token
Add filename to asset token [SCI-10767]
2024-06-05 10:20:39 +02:00
Martin Artnik
ec2658b9d9
Add OpenSSL namespace version_token 2024-06-05 10:20:24 +02:00
Klemen Benedicic
86c99feb39 Merge branch 'develop' into kb_SCI-10761_data-e2e-protocol-templates 2024-06-05 05:09:26 +02:00
Klemen Benedicic
d594c695b1 Added data-e2e to project templates import modals [SCI-10761] 2024-06-05 05:08:16 +02:00
ajugo
596844cc07
Merge pull request #7626 from rekonder/aj_SCI_9833
Fix small zebra print issues [SCI-9833]
2024-06-04 15:59:25 +02:00
aignatov-bio
b3d10cc5b3
Merge pull request #7625 from aignatov-bio/ai-sci-8785-rename-file-not-trigger-protocol-change
Add step touch for file rename [SCI-8785]
2024-06-04 15:27:05 +02:00
Anton
0299a3f125 Add filename to asset token [SCI-10767] 2024-06-04 15:20:49 +02:00
Andrej
8d6672aab5 Fix small zebra print issues [SCI-9833] 2024-06-04 15:08:48 +02:00
Anton
4ea35c48f1 Add step touch for file rename [SCI-8785] 2024-06-04 13:24:47 +02:00
aignatov-bio
1c70e34d55
Merge pull request #7624 from aignatov-bio/ai-sci-10766-update-file-renaming
Remove extension from file renaming [SCI-10766]
2024-06-04 12:28:22 +02:00
aignatov-bio
1766e94ec6
Merge pull request #7623 from aignatov-bio/ai-sci-10765-add-empty-inventory-export
Add empty inventory export and added confirmation modal for inventory export [SCI-10765]
2024-06-04 12:19:01 +02:00
Anton
59f9589ea1 Remove extension from file renaming [SCI-10766] 2024-06-04 12:13:10 +02:00
aignatov-bio
3701b2cbfb
Merge pull request #7586 from aignatov-bio/ai-sci-10304-add-sorting-for-shared-inventories
Add sorting for shared invnetories [SCI-10304]
2024-06-04 11:04:21 +02:00
Anton
3e122ed4e0 Add empty inventory export and added confirmation modal for inventory export [SCI-10765] 2024-06-04 11:02:28 +02:00
ajugo
85c1362903
Merge pull request #7622 from rekonder/aj_SCI_10753
Espace special character for search [SCI-10753]
2024-06-04 10:47:29 +02:00
Andrej
96a52f07dd Escpace special charachter for search [SCI-10753] 2024-06-04 10:41:45 +02:00
Alex Kriuchykhin
11b69a5e70
Revert "Bump pdfjs-dist from 2.16.105 to 4.2.67 (#7617)" (#7620)
This reverts commit 14168322f7.
2024-06-04 10:10:57 +02:00
dependabot[bot]
4ee40814f7
Bump axios from 0.21.4 to 1.7.2 (#7618)
Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.7.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.4...v1.7.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-03 16:49:56 +02:00
ajugo
38751cedd0
Merge pull request #7612 from rekonder/aj_SCI_10751
Add advanced repository filter for updated on and updated by [SCI-10751]
2024-06-03 16:48:06 +02:00