Commit graph

17046 commits

Author SHA1 Message Date
Anton
3eacee9ca0 Small inventory fixes [SCI-10835][SCI-10847][SCI-10844] 2024-07-10 12:44:35 +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
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
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
Anton
0057de4e49 Fix wording [SCI-10789] 2024-07-02 11:39:55 +02:00
Andrej
302e7366b9 Save table content after adding row or columns [SCI-10827] 2024-07-02 11:16:36 +02:00
Oleksii Kriuchykhin
9642f173d9 Merge branch 'release/1.30.0' into hotfix/1.35.0.2 2024-07-01 13:10:37 +02:00
ajugo
37302250d7
Merge pull request #7669 from rekonder/aj_SCI_10828
Fix disclaimer modal for sso [SCI-10828]
2024-07-01 10:22:11 +02:00
Andrej
aaf1adafc0 Fix disclaimer modal for sso [SCI-10828] 2024-07-01 09:30:53 +02:00
ajugo
a2efba009a
Merge pull request #7668 from rekonder/aj_SCI_10827
Save table content after removing row or columns [SCI-10827]
2024-06-28 13:40:40 +02:00
Andrej
d53a8f0b1c Save table content after removing row or columns [SCI-10827] 2024-06-28 13:18:46 +02:00
Andrej
6ad1b86a91 Revert export delimiter for checklists [SCI-10504] 2024-06-28 09:49:29 +02:00
Andrej
ae5ea1f0cb Add error messages to import items modal [SCI-10813] 2024-06-28 09:30:20 +02:00
Andrej
aedbab9375 Open collapsed steps/results on content insert [SCI-10799] 2024-06-27 15:56:41 +02:00
Oleksii Kriuchykhin
4e7aed740c Merge branch 'release/1.30.0' 2024-06-27 11:27:42 +02:00
ajugo
9a05c154d0
Merge pull request #7663 from aignatov-bio/ai-sci-10808-exclude-default-columns-from-automapping
Exclude default columns from mapping [SCI-10808]
2024-06-27 10:43:49 +02:00
ajugo
fba04d401d
Merge pull request #7661 from aignatov-bio/ai-sci-10791-fix-css-inventoyry-import
Small fixes for inventory import [SCI-10797][SCI-10791]
2024-06-27 10:42:18 +02:00
Alex Kriuchykhin
ad93fffed7
Fix password generation with increased minimum user password length [SCI-10821] (#7664) 2024-06-26 15:41:42 +02:00
Anton
32c8af1280 Exclude default columns from mapping [SCI-10808] 2024-06-26 15:24:29 +02:00
aignatov-bio
759234aad1
Merge pull request #7662 from aignatov-bio/ai-sci-10432-fix-activities-for-deleted-results
Add discarded to results [SCI-10432]
2024-06-26 13:48:16 +02:00