Commit graph

13174 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
349352773f Revert - Fix activties for deleted results [SCI-10432] 2024-06-12 13:49:12 +02:00
Klemen Benedicic
73362c3fb3 Merge branch 'develop' into kb_SCI-10761_data-e2e-protocol-templates 2024-06-07 12:07:05 +02:00
Klemen Benedicic
40c2f1a7de Added data-e2e to protocol page [SCI-10761] 2024-06-07 12:05:31 +02:00
Martin Artnik
b750041b72 Optimize and fix serializer for tag updates on canvas [SCI-10687] 2024-06-07 12:00:56 +02:00
Martin Artnik
65c276b97b Fix reloading of tags on canvas [SCI-10687] 2024-06-06 10:54:09 +02:00
Martin Artnik
3d4ec2e28b Fix asset sync conflict handling for results [SCI-10770] 2024-06-05 14:51: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
Klemen Benedicic
86c99feb39 Merge branch 'develop' into kb_SCI-10761_data-e2e-protocol-templates 2024-06-05 05:09:26 +02:00
Klemen Benedicic
d594c695b1 Added data-e2e to project templates import modals [SCI-10761] 2024-06-05 05:08:16 +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
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
Anton
59f9589ea1 Remove extension from file renaming [SCI-10766] 2024-06-04 12:13:10 +02:00
Andrej
96a52f07dd Escpace special charachter for search [SCI-10753] 2024-06-04 10:41:45 +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
23d311473e API key management tweaks [SCI-10763] 2024-06-03 13:47:00 +02:00
Klemen Benedicic
b56bb8d3c8 Added data-e2e to table info, top toolbar and project templates [SCI-10761] 2024-05-31 17:57:24 +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
d87697d402 Fix searching special characters [SCI-10753] 2024-05-29 16:07:51 +02:00
Martin Artnik
958559a340
Merge pull request #7604 from rekonder/aj_SCI_10752
Escape empty space [SCI-10752]
2024-05-29 12:22:28 +02:00
Andrej
aad7e53078 Escape empty space [SCI-10752] 2024-05-29 12:20:53 +02:00
Martin Artnik
d5ec92f2bf
Merge pull request #7602 from rekonder/fix_search
Escape special charecters in global search
2024-05-29 11:08:57 +02:00
Andrej
59da3423c4 Escape special charecters in global search 2024-05-29 11:08:02 +02:00
Anton
70495c36d6 Small css fixes [SCI-10745] 2024-05-28 12:26:16 +02:00
Martin Artnik
eae0587699 Make API key auth togglable [SCI-6968] 2024-05-24 14:55:48 +02:00
Klemen Benedicic
61d779c6ed Fixed PR commentaries, updated .gitignore [SCI-10717] 2024-05-24 13:44:51 +02:00
Klemen Benedicic
c304277712 Fixed PR commentaries [SCI-10717] 2024-05-24 13:27:55 +02:00
Klemen Benedicic
a42a8a535a Fixing PR commentaries [SCI-10717] 2024-05-24 13:27:55 +02:00
Klemen Benedicic
0ebd9a9b8b Added data-e2e to Global search filters [SCI-10717] 2024-05-24 13:27:55 +02:00
Klemen Benedicic
7284b6105e Added data-e2e to Delete inventory modal and Global search [SCI-10717] 2024-05-24 13:27:55 +02:00
Klemen Benedicic
5c122ef72b Added data-e2e to Rename inventory modal. Updated stock inventory item filter data-e2e attributes. [SCI-10717] 2024-05-24 13:27:55 +02:00
Martin Artnik
2781295325 Style cleanup [SCI-6968] 2024-05-24 13:00:12 +02:00
Martin Artnik
c5b215af32 Implement API key auth and generation [SCI-6968] 2024-05-24 12:36:01 +02:00
Martin Artnik
19442b6157 Merge branch 'develop' into features/mix 2024-05-24 12:07:05 +02:00