16923 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Anton	3a8fd9b12a	Fix experiment selection for new task modal [SCI-8865]	2024-06-06 11:04:41 +02:00
Anton	4c4fcd68ae	Fix merge	2024-06-05 16:33:12 +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
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
dependabot[bot]	14168322f7	Bump pdfjs-dist from 2.16.105 to 4.2.67 (#7617) ... Bumps [pdfjs-dist](https://github.com/mozilla/pdfjs-dist) from 2.16.105 to 4.2.67. - [Commits](https://github.com/mozilla/pdfjs-dist/commits) --- updated-dependencies: - dependency-name: pdfjs-dist 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-03 16:40:31 +02:00
dependabot[bot]	dff7e67bf5	Bump tar from 6.1.13 to 6.2.1 (#7463) ... Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.13 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/isaacs/node-tar/compare/v6.1.13...v6.2.1) --- updated-dependencies: - dependency-name: tar 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:37:46 +02:00
ajugo	ea79f15e6d	Merge pull request #7598 from rekonder/aj_SCI_10734 ... Improve error handling for empty text extraction [SCI-10734]	2024-06-03 16:22:59 +02:00
ajugo	46fdd3f8de	Merge pull request #7610 from rekonder/aj_SCI_10746 ... Update logic for saving update at and modified by on repository row [SCI-10746]	2024-06-03 16:22:51 +02:00
ajugo	e5a66eae76	Merge pull request #7616 from rekonder/aj_SCI_9855 ... Fix searching for files and tables content [SCI-9855]	2024-06-03 16:22:40 +02:00
Andrej	38ec558b36	Fix searching for files and tables content [SCI-9855]	2024-06-03 15:58:41 +02:00
Martin Artnik	fc1a739f27	Merge pull request #7615 from artoscinote/ma_SCI_10763 ... API key management tweaks [SCI-10763]	2024-06-03 15:27:40 +02:00
Martin Artnik	23d311473e	API key management tweaks [SCI-10763]	2024-06-03 13:47:00 +02:00
aignatov-bio	161cb698d9	Merge pull request #7614 from aignatov-bio/ai-sci-9851-add-import-preview ... Add preview step and success step [SCI-9851]	2024-06-03 10:50:15 +02:00
Anton	5e8cf6a221	Add preview step and success step [SCI-9851]	2024-05-31 21:07:21 +02:00
Martin Artnik	1b730a8977	Merge pull request #7613 from artoscinote/ma_SCI_10756 ... Add a NONE option to all permissions for flexibility [SCI-10756]	2024-05-31 14:35:08 +02:00
Martin Artnik	52fc888c79	Merge pull request #7611 from scinote-eln/features/file-actions ... Features/file actions	2024-05-31 10:19:12 +02:00
Martin Artnik	d5600388ec	Add a NONE option to all permissions for flexibility [SCI-10756]	2024-05-31 09:40:07 +02:00
Andrej	5493d543b0	Add advanced repository filter for updated on and updated by [SCI-10751]	2024-05-30 15:50:16 +02:00
Martin Artnik	a944de12a8	Merge fixes	2024-05-30 14:36:57 +02:00
Anton	871ef9806a	Update results counter logic [SCI-10675]	2024-05-30 14:02:23 +02:00
Martin Artnik	be47dbfa24	Add file duplicate activities [SCI-10257]	2024-05-30 13:34:31 +02:00
Martin Artnik	247443db4c	Add duplicate asset functionality [SCI-10257]	2024-05-30 13:31:27 +02:00
Ivan Kljun	93d0a5acd5	Refactor method for renaming attached files [SCI-10256]	2024-05-30 13:28:35 +02:00
Ivan Kljun	7ac7ebd32d	Enable renaming attached files [SCI-10256]	2024-05-30 13:28:35 +02:00
Martin Artnik	5643f8fd66	Merge pull request #7609 from scinote-eln/features/mix ... Features/mix	2024-05-30 11:31:40 +02:00
Martin Artnik	9e0b402d06	Merge pull request #7607 from rekonder/aj_SCI_10753 ... Fix searching special characters [SCI-10753]	2024-05-30 11:30:34 +02:00
Martin Artnik	b928eef496	Merge pull request #7584 from artoscinote/ma_SCI_10687 ... Make canvas tags modal the same element for all tasks [SCI-10687]	2024-05-30 11:30:19 +02:00
Martin Artnik	e80d43c759	Merge pull request #7608 from scinote-eln/hotfix/1.33.0.1 ... Hotfix/1.33.0.1	2024-05-30 10:31:20 +02:00
Andrej	3f58f9e624	Update logic for saving update at and modified by on repository row [SCI-10746]	2024-05-29 17:18:00 +02:00