Commit graph

17062 commits

Author SHA1 Message Date
ajugo 97d2513a04
Merge pull request #7694 from rekonder/aj_SCI_10465
Add local storage backend [SCI-10465]
2024-07-11 10:03:48 +02:00
Andrej 88f6a12bdf Fix serializing local storage on update and create [SCI-10465] 2024-07-11 10:00:01 +02:00
Andrej b1e5199c59 Add schema [SCI-10465] 2024-07-11 09:49:57 +02:00
Andrej d6c3468002 Implement storage location backend [SCI-10465] 2024-07-11 09:48:49 +02:00
Martin Artnik 8c6b36a4c1 Remove unsupported rubocop cop 2024-07-10 15:50:39 +02:00
Martin Artnik 29401c07a2 Revert "Bump hound ruby linter version"
This reverts commit 9ed5773071.
2024-07-10 15:49:37 +02:00
aignatov-bio 6c47e6058f
Merge pull request #7695 from aignatov-bio/ai-sci-10849-fix-preview-for-import-cells
Fix preview for cells creating [SCI-10849]
2024-07-10 15:11:39 +02:00
aignatov-bio 26d6f3e446
Merge pull request #7686 from aignatov-bio/ai-sci-10834-update-asset-views
Update assets action toolbar [SCI-10834]
2024-07-10 15:09:18 +02:00
Anton ea8ae04791 Fix preview for cells creating [SCI-10849] 2024-07-10 15:08:46 +02:00
aignatov-bio fbc7b5456c
Merge pull request #7693 from aignatov-bio/ai-sci-10835-small-inventory-fixes
Small inventory fixes [SCI-10835][SCI-10847][SCI-10844]
2024-07-10 14:43:24 +02:00
ajugo 647b6955d9
Merge pull request #7692 from rekonder/aj_SCI_10854
Show correct checklist preview on inventory import [SCI-10854]
2024-07-10 13:09:20 +02:00
Martin Artnik 9ed5773071 Bump hound ruby linter version 2024-07-10 12:47:31 +02:00
aignatov-bio 3d66ec03c2
Merge pull request #7688 from aignatov-bio/ai-sci-10806-add-tooltip-to-protocol-name
Add tooltip to protocol name [SCI-10806]
2024-07-10 12:45:15 +02:00
Anton 3eacee9ca0 Small inventory fixes [SCI-10835][SCI-10847][SCI-10844] 2024-07-10 12:44:35 +02:00
Andrej 1f28517fcd Show correct checklist preview on invnetory import [SCI-10854] 2024-07-10 12:07:40 +02:00
ajugo 526f5a864f
Merge pull request #7691 from rekonder/aj_SCI_10871
Fix default state for relationship column [SCI-10871]
2024-07-10 10:33:05 +02:00
Andrej aca6af0517 Fix default state for relationship column [SCI-10871] 2024-07-10 09:29:28 +02:00
Martin Artnik ff89c8c137
Merge pull request #7690 from artoscinote/ma_SCI_10856
Fix time export in repository xlsx exporter [SCI-10856]
2024-07-09 16:01:33 +02:00
Martin Artnik 6ad15211ac Fix time export in repository xlsx exporter [SCI-10856] 2024-07-09 15:54:06 +02:00
Martin Artnik eab9acbc94
Merge pull request #7689 from artoscinote/ma_SCI_10856
Fix archived on in xlsx repository export [SCI-10856]
2024-07-09 15:49:38 +02:00
Martin Artnik 84f47db907 Fix archived on in xlsx repository export [SCI-10856] 2024-07-09 15:40:43 +02:00
aignatov-bio 76bb77d7cf
Merge pull request #7687 from scinote-eln/features/inventory-import-improvements
Features/inventory import improvements
2024-07-09 15:08:24 +02:00
Anton d5853ef689 Add tooltip to protocol name [SCI-10806] 2024-07-09 15:07:24 +02:00
aignatov-bio 1ae48dc683
Merge pull request #7676 from aignatov-bio/ai-sci-10811-ui-blockers
Fix truncate for preview message [SCI-10811]
2024-07-09 14:57:12 +02:00
Anton a6a8194a4e Update assets action toolbar [SCI-10834] 2024-07-09 14:56:39 +02:00
Martin Artnik 6ac1c6a13b Merge branch 'features/inventory-import-improvements' into develop 2024-07-09 14:36:42 +02:00
Martin Artnik 85079a2f2b
Merge pull request #7667 from rekonder/aj_SCI_10504
Revert export delimiter for checklists [SCI-10504]
2024-07-09 14:35:36 +02:00
Martin Artnik b9e2c71972
Merge pull request #7685 from artoscinote/ma_SCI_10856
Fix export date formatting, empty export file name [SCI-10856]
2024-07-09 13:47:28 +02:00
Martin Artnik 66850d7dc6
Merge pull request #7684 from artoscinote/ma_SCI_10848
Perserve mapping state between inventory import steps [SCI-10848]
2024-07-09 13:47:02 +02:00
Martin Artnik 648b5be1b9 Fix Excell date parsing [SCI-10856] 2024-07-09 13:34:40 +02:00
Martin Artnik 0bdf220b20 Fix export date formatting, empty export file name [SCI-10856] 2024-07-08 16:49:17 +02:00
Martin Artnik 2aa6466de8 Preserve mapping state between inventory import steps [SCI-10848] 2024-07-08 12:54:09 +02:00
Martin Artnik 6087a06034 Merge branch 'features/inventory-import-improvements' into develop 2024-07-08 10:07:30 +02:00
Martin Artnik ae1034e994
Merge pull request #7683 from artoscinote/ma_SCI_10842
Touch asset after file rename [SCI-10842]
2024-07-04 14:41:32 +02:00
Martin Artnik 15f96f4ce3 Touch asset after file rename [SCI-10842] 2024-07-04 14:31:36 +02:00
Oleksii Kriuchykhin 80044108ab Merge branch 'master' into develop 2024-07-04 13:07:05 +02:00
Oleksii Kriuchykhin b0bc0eef8b Merge branch 'hotfix/1.35.0.2' 2024-07-04 13:04:16 +02:00
Oleksii Kriuchykhin e8135d7848 Bump version to 1.35.0.2 2024-07-04 13:01:30 +02:00
Alex Kriuchykhin da98f627e4
Add config option for disabling whitelisting external services in CSP and option for disabling links preload in headers [SCI-10795] (#7677) 2024-07-03 13:34:26 +02:00
Anton fa99b29e26 Fix truncate for preview message [SCI-10811] 2024-07-03 12:38:14 +02:00
aignatov-bio 3b0aabde0b
Merge pull request #7665 from rekonder/aj_SCI_10799
Open collapsed steps/results on content insert [SCI-10799]
2024-07-03 12:36:50 +02:00
aignatov-bio 7ed8bf730f
Merge pull request #7666 from rekonder/aj_SCI_10813
Add error messages to import items modal [SCI-10813]
2024-07-03 12:34:45 +02:00
aignatov-bio 8c121d47df
Merge pull request #7674 from aignatov-bio/ai-sci-10825-add-highlight-to-rows-during-import
Add highlight for rows during import [SCI-10825]
2024-07-03 12:33:04 +02:00
aignatov-bio 7073809f06
Merge pull request #7673 from aignatov-bio/ai-sci-8865-fix-dashboard-task-creation
Fix dashboard task creation [SCI-8865]
2024-07-03 12:32:54 +02:00
ajugo a97f62b775
Merge pull request #7675 from rekonder/aj_SCI_10782
Add check if any SSO is enabled [SCI-10782]
2024-07-03 10:17:26 +02:00
Andrej 43ab36eabc Add check if sso is enabled [SCI-10782] 2024-07-03 09:23:42 +02:00
Anton be71d12b13 Add highlight for rows during import [SCI-10825] 2024-07-02 13:06:02 +02:00
Anton c4dd2e4728 Fix dashboard task creation [SCI-8865] 2024-07-02 12:28:49 +02:00
aignatov-bio da9605b7c3
Merge pull request #7672 from aignatov-bio/ai-sci-10789-fix-wording
Fix wording [SCI-10789]
2024-07-02 11:45:35 +02:00
ajugo 8b042db2d9
Merge pull request #7671 from rekonder/aj_SCI_10827
Save table content after adding row or columns [SCI-10827]
2024-07-02 11:45:00 +02:00