18555 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alex Kriuchykhin	3046c13a44	Merge Develop to Master (#8515) ... * Bump rack from 2.2.13 to 2.2.14 (#8494) Bumps [rack](https://github.com/rack/rack) from 2.2.13 to 2.2.14. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.13...v2.2.14) --- updated-dependencies: - dependency-name: rack dependency-version: 2.2.14 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump version to 1.41.1.1 (#8514) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-05-23 14:56:07 +02:00
Martin Artnik	09b600e998	Merge pull request #8503 from scinote-eln/develop ... May 2025 Release	2025-05-13 12:53:44 +02:00
Martin Artnik	2bf4e23442	Remove db port config in dev docker-compose.yml	2025-05-13 11:51:26 +02:00
Martin Artnik	a1e22a7456	Merge branch 'master' into develop	2025-05-13 11:35:33 +02:00
Martin Artnik	c05aef3cd8	Bump version to 1.41.1	2025-05-13 11:19:58 +02:00
Martin Artnik	dd02f08e3e	Merge pull request #8491 from aignatov-bio/ai-sci-11734-remove-perfect-scroll-from-activitio ... Remove perfect scrollbar from task activities [SCI-11734]	2025-05-09 13:38:16 +02:00
Martin Artnik	b708c87f97	Merge pull request #8495 from scinote-eln/ma_SCI_11896 ... Make repository template migration skip check more robust [SCI-11896]	2025-05-09 12:20:26 +02:00
Martin Artnik	47c74a794d	Merge pull request #8496 from aignatov-bio/ai-sci-11906-fix-css-for-task-asset ... Fix css for menu dropdown [SCI-11906]	2025-05-09 12:20:01 +02:00
Anton	4464cdb52a	Fix css for menu dropdown [SCI-11906]	2025-05-09 11:42:27 +02:00
Martin Artnik	f2c90da8b6	Make repository template migration skip check more robust [SCI-11896]	2025-05-09 10:41:34 +02:00
Anton	4db5fe2444	Remove perfect scrollbar from task activities [SCI-11734]	2025-05-08 13:53:17 +02:00
aignatov-bio	8dc6b6270d	Merge pull request #8459 from aignatov-bio/ai-sci-11865-fix-decimal-format-in-numbers ... Fix decimal format in form numbers [SCI-11865]	2025-05-07 12:16:49 +02:00
Anton	ff41a0ab67	Fix decimal format in form numbers [SCI-11865]	2025-05-07 11:50:38 +02:00
aignatov-bio	cca05960c8	Merge pull request #8486 from aignatov-bio/ai-sci-11859-fix-extend-collapse-icon-storage-locations ... Fix extend/collapse icon for storage locations [SCI-11859]	2025-05-06 19:43:53 +02:00
Martin Artnik	662652ee6b	Merge pull request #8484 from artoscinote/ma_SCI_11892 ... Fix add steps modal validation [SCI-11892]	2025-05-06 14:40:14 +02:00
Anton	9c2a16a81c	Fix extend/collapse icon for storage locations [SCI-11859]	2025-05-06 14:26:36 +02:00
Martin Artnik	84e030b1e6	Merge pull request #8483 from artoscinote/ma_SCI_11896 ... Add option to skip repository templates feature [SCI-11896]	2025-05-06 14:21:55 +02:00
Martin Artnik	fc00f19f71	Fix add steps modal validation [SCI-11892]	2025-05-06 14:03:58 +02:00
Martin Artnik	ab666bb86f	Add option to skip repository templates feature [SCI-11896]	2025-05-06 13:59:50 +02:00
KlemenSciNote	85fbddee01	Merge pull request #8482 from KlemenSciNote/kb_SCI-11900_add-data-e2e-new-inventory-modal ... Add inventory templates data-e2e to new inventory modal [SCI-11900]	2025-05-06 13:39:07 +02:00
Klemen Benedicic	560d6a897c	Add inventory templates data-e2e to new inventory modal [SCI-11900]	2025-05-06 13:18:20 +02:00
Alex Kriuchykhin	67b4e2bd99	Improve write permissions checking in WOPI controller, update Tika to 2.9.4 [SCI-11898] (#8481)	2025-05-06 10:58:03 +02:00
aignatov-bio	5ef36d6769	Merge pull request #8477 from aignatov-bio/ai-sci-10511-fix-comments-label-posiiton ... Fix comments label position [SCI-10511]	2025-05-06 10:04:26 +02:00
aignatov-bio	a146d7ccb4	Merge pull request #8478 from aignatov-bio/ai-sci-11531-small-css-fixes ... Small css fixes [SCI-11531]	2025-05-06 10:04:16 +02:00
aignatov-bio	cc5ed4547d	Merge pull request #8479 from aignatov-bio/ai-sci-11734-fix-scrolling-in-activities ... Fix task activities page layout [SCI-11734]	2025-05-06 10:04:02 +02:00
Anton	250915d00b	Fix task activities page layout [SCI-11734]	2025-05-05 12:58:51 +02:00
Anton	4985676205	Small css fixes [SCI-11531]	2025-05-05 12:09:59 +02:00
Anton	2059e300a7	Fix comments label position [SCI-10511]	2025-05-05 11:38:59 +02:00
dependabot[bot]	262f8dbbc3	Bump net-imap from 0.4.19 to 0.4.20 (#8470) ... Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.19 to 0.4.20. - [Release notes](https://github.com/ruby/net-imap/releases) - [Commits](https://github.com/ruby/net-imap/compare/v0.4.19...v0.4.20) --- updated-dependencies: - dependency-name: net-imap dependency-version: 0.4.20 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-05-05 10:43:22 +02:00
Martin Artnik	ad5b43cf5e	RepositoryTemplate migration and dependant fix [SCI-11708] (#8461)	2025-05-05 10:42:24 +02:00
Martin Artnik	8f2efe62fc	Merge pull request #8475 from artoscinote/ma_SCI_11893 ... Add blank state for repository template columns, fix XSS [SCI-11893]	2025-04-30 12:21:39 +02:00
Martin Artnik	f27398c00b	Add blank state for repository template columns, fix XSS [SCI-11893]	2025-04-30 12:18:05 +02:00
Martin Artnik	b5550e202c	Merge pull request #8473 from artoscinote/ma_SCI_11866 ... Add location duplication activities [SCI-11866]	2025-04-30 11:43:00 +02:00
Martin Artnik	64504fcfef	Add location duplication activities [SCI-11866]	2025-04-30 11:38:19 +02:00
Martin Artnik	77e3b46752	Merge pull request #8419 from okriuchykhin/ok_SCI_11757 ... Improve handling of file versions deletion [SCI-11757]	2025-04-30 09:58:26 +02:00
Martin Artnik	941c430871	Merge pull request #8472 from artoscinote/ma_SCI_11892 ... Fix add steps modal validation [SCI-11892]	2025-04-29 14:13:57 +02:00
Martin Artnik	6a14ed34c3	Fix add steps modal validation [SCI-11892]	2025-04-29 14:11:51 +02:00
Martin Artnik	c038f66988	Merge pull request #8380 from aignatov-bio/ai-sci-10620-merge-exapnd-all-collapse-all-button-in-results ... Merge expand and collapse in results [SCI-10620]	2025-04-29 13:14:43 +02:00
Martin Artnik	efebf42044	Merge pull request #8469 from artoscinote/ma_SCI_11861 ... Handle permissions for form value repository row snapshots [SCI-11861]	2025-04-29 13:14:01 +02:00
Martin Artnik	3b94ddeaf8	Merge pull request #8467 from artoscinote/ma_SCI_11888 ... Refresh protocol status when importing steps [SCI-11888]	2025-04-29 11:19:21 +02:00
Martin Artnik	b365aee114	Merge pull request #8466 from artoscinote/ma_SCI_11887 ... Don't show protocol options dropdown if no options are available [SCI-11887]	2025-04-29 11:18:50 +02:00
Martin Artnik	08cb004343	Don't show protocol options dropdown if no options are available [SCI-11887]	2025-04-29 10:21:00 +02:00
Martin Artnik	e96b5bfb3a	Merge pull request #8455 from okriuchykhin/ok_SCI_11868 ... Fix parsing of PREVIEW_MAX_FILE_SIZE_MB and TEXT_EXTRACT_MAX_FILE_SIZE_MB variables [SCI-11868]	2025-04-29 10:07:46 +02:00
Martin Artnik	25db41b0e3	Handle permissions for form value repository row snapshots [SCI-11861]	2025-04-28 15:38:29 +02:00
Martin Artnik	94b8a36fd4	Refresh protocol status when importing steps [SCI-11888]	2025-04-28 14:32:20 +02:00
Martin Artnik	11bf5cebc7	Merge pull request #8462 from artoscinote/ma_SCI_11849 ... Fix activity subjects for bulk unassign in storage locations [SCI-11849]	2025-04-25 15:28:04 +02:00
Martin Artnik	63ab2ebf1a	Fix activity subjects for bulk unassign in storage locations [SCI-11849]	2025-04-25 15:07:03 +02:00
Martin Artnik	5f7f92d8af	Merge pull request #8460 from artoscinote/ma_SCI_11872 ... Handle legacy table metadata cells format [SCI-11872]	2025-04-25 14:53:05 +02:00
Martin Artnik	fc0c3de6f5	Handle legacy table metadata cells format [SCI-11872]	2025-04-25 14:33:33 +02:00
Martin Artnik	4e5f9c738d	Merge branch 'features/repository-templates' into develop	2025-04-25 14:20:37 +02:00