Commit graph

13373 commits

Author SHA1 Message Date
aignatov-bio
d8a270d8f7
Merge branch 'develop' into ai-sci-10818-poc-instruction-in-inventory-export 2024-07-12 13:27:47 +02:00
Anton
c17c15f3ad POC for instruction of inventory export [SCI-8865] 2024-07-12 13:27:05 +02:00
aignatov-bio
3925a3a169
Merge pull request #7706 from aignatov-bio/ai-sci-10824-fix-users-filter-long-username
Fix users long username [SCI-10824]
2024-07-12 13:24:05 +02:00
Martin Artnik
ba2ede1044
Merge pull request #7705 from artoscinote/ma_SCI_10878
Fix duplicate import items check [SCI-10878]
2024-07-12 13:00:29 +02:00
Anton
3245e444c6 Fix users long username [SCI-10824] 2024-07-12 12:54:51 +02:00
aignatov-bio
7b1b71cfff
Merge pull request #7704 from aignatov-bio/ai-sci-10812-fix-import-css-issues
Small fixes for import [SCI-10812]
2024-07-12 12:46:51 +02:00
Martin Artnik
ec9bdbfd27 Fix duplicate import items check [SCI-10878] 2024-07-12 12:30:26 +02:00
Martin Artnik
14c9bf5799
Merge pull request #7703 from artoscinote/ma_SCI_10877
Clear import modal state on modal open [SCI-10877]
2024-07-12 10:57:39 +02:00
Anton
981c5e4b25 Small fixes for import [SCI-10812] 2024-07-12 10:55:47 +02:00
Martin Artnik
3c6798a2c2 Clear import modal state on modal open [SCI-10877] 2024-07-12 10:27:35 +02:00
Andrej
e46774cc3d Fix handling of custom repository text on import for too many characters [SCI-10884] 2024-07-11 16:19:19 +02:00
Martin Artnik
34e9c9f4e8
Merge pull request #7696 from artoscinote/ma_SCI_10853
Change import activites and flash messages [SCI-10853]
2024-07-11 15:04:55 +02:00
Anton
87a1a5a3e6 Fix mapping behavior [SCI-10872] 2024-07-11 15:00:07 +02:00
Martin Artnik
6ebc08a0f4
Fix count condition for generating activity [SCI-10853] 2024-07-11 14:57:49 +02:00
ajugo
99915cb43f
Merge pull request #7698 from rekonder/aj_SCI_10874
Fix importing items when input format is incorrect [SCI-10874]
2024-07-11 11:49:13 +02:00
Andrej
181b55b1a1 Fix importing items when input format is incorrect [SCI-10874] 2024-07-11 11:43:37 +02:00
Andrej
96dc475f0f Remove updated on and updated by from default filters [SCI-10751] 2024-07-10 15:55:50 +02:00
Martin Artnik
6a4d50e44a Change import activites and flash messages [SCI-10853] 2024-07-10 15:46:24 +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
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
Martin Artnik
6ad15211ac Fix time export in repository xlsx exporter [SCI-10856] 2024-07-09 15:54:06 +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
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
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
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
Andrej
302e7366b9 Save table content after adding row or columns [SCI-10827] 2024-07-02 11:16:36 +02:00