Commit graph

17658 commits

Author SHA1 Message Date
Martin Artnik
8d6c0b4380
Change download path for report templates 2024-10-18 14:38:35 +02:00
Andrej
a5389b780c Merge branch 'features/custom-docx-reports' of https://github.com/scinote-eln/scinote-web into features/custom-docx-reports 2024-10-17 14:06:53 +02:00
Andrej
527643180f Merge branch 'develop' into features/custom-docx-reports 2024-10-17 14:01:06 +02:00
Martin Artnik
2ac183fd83
Merge pull request #7980 from scinote-eln/features/file-versioning
Features/file versioning
2024-10-17 10:42:06 +02:00
Martin Artnik
7804b46937 Merge branch 'develop' into features/file-versioning 2024-10-16 13:22:28 +02:00
Martin Artnik
da50309204
Bump version to 1.37.0 2024-10-16 10:27:16 +02:00
Martin Artnik
857b77d558
Merge pull request #7978 from artoscinote/ma_SCI_11195
Fix location image dissapearing [SCI-11195]
2024-10-16 09:49:44 +02:00
Martin Artnik
97129d2a2b Fix location image dissapearing [SCI-11195] 2024-10-16 09:47:12 +02:00
Martin Artnik
b7e1596e52
Merge pull request #7974 from artoscinote/ma_SCI_11188
Improve behaviour for private team sharing [SCI-11188]
2024-10-15 23:39:42 +02:00
Martin Artnik
764e7dd663 Improve behaviour for private team sharing [SCI-11188] 2024-10-15 21:17:14 +02:00
ajugo
880f31fe87
Merge pull request #7973 from rekonder/aj_SCI_11144
Update caracal version [SCI-11144]
2024-10-15 15:54:21 +02:00
Andrej
76d4e7ca76 Update caracal version [SCI-11144] 2024-10-15 15:51:55 +02:00
aignatov-bio
78c0b8bc88
Merge pull request #7967 from aignatov-bio/ai-sci-11184-create-collapsable-breadcrumbs-component
Add collapsable breadcrumbs component [SCI-11184]
2024-10-15 15:19:24 +02:00
Martin Artnik
1805e723f9
Merge pull request #7972 from artoscinote/ma_SCI_11188
Hide unshared private teams [SCI-11188]
2024-10-15 13:03:29 +02:00
Martin Artnik
d250653a7c Hide unshared private teams [SCI-11188] 2024-10-15 13:01:57 +02:00
Martin Artnik
57079bea51 Add missing translation [SCI-11188] 2024-10-15 12:55:43 +02:00
ajugo
4600d5c8c8
Merge pull request #7971 from rekonder/aj_SCI_11173
Fix report wizard for selecting of deleted inventories [SCI-11173]
2024-10-15 11:16:56 +02:00
Andrej
f99c701ab6 Fix report wizard for selecting of deleted inventories [SCI-11173] 2024-10-14 16:49:41 +02:00
Alex Kriuchykhin
5e02fff4b3
Fix active repository datatables on shared tasks [SCI-11189] (#7970) 2024-10-14 16:24:17 +02:00
Martin Artnik
a23d998fb7
Merge pull request #7969 from artoscinote/ma_SCI_11188
Fix sharing settings with invisible teams [SCI-11188]
2024-10-14 15:58:03 +02:00
Martin Artnik
f388594884 Fix sharing settings with invisible teams [SCI-11188] 2024-10-14 15:52:47 +02:00
ajugo
e47663e5fb
Merge pull request #7968 from rekonder/aj_SCI_11170
Add file versioning to ove and marvinjs files [SCI-11170]
2024-10-14 15:30:59 +02:00
Andrej
2c56246204 Add file versioning to ove and marvinjs files [SCI-11170] 2024-10-14 15:12:48 +02:00
ajugo
7b30da7220
Merge pull request #7966 from rekonder/aj_SCI_11169
Add restore asset permission [SCI-11169]
2024-10-14 15:09:13 +02:00
Anton
adcc401a79 Add collapsable breadcrumbs component [SCI-11184] 2024-10-14 14:40:21 +02:00
Andrej
50d2bf53dc Add restore asset permission [SCI-11169] 2024-10-14 14:02:28 +02:00
ajugo
cfefef8d01
Merge pull request #7965 from rekonder/aj_SCI_11157
Add activities for asset restore [SCI-11157]
2024-10-14 13:53:54 +02:00
Andrej
262ae9c2c0 Add activities for asset restore [SCI-11157] 2024-10-14 13:45:39 +02:00
Martin Artnik
8c356f7293 Merge branch 'develop' into features/file-versioning 2024-10-14 13:09:42 +02:00
Martin Artnik
ca2c409bb0
Merge pull request #7964 from artoscinote/ma_SCI_11181
Add missing permisson changes [SCI-11181]
2024-10-14 13:07:06 +02:00
Martin Artnik
ba2e2cd686 Add missing permisson changes [SCI-11181] 2024-10-14 13:04:39 +02:00
aignatov-bio
8e0f0e27a7
Merge pull request #7960 from aignatov-bio/ai-sci-10735-update-notifications-flyout
Update notifications flyout [SCI-10735]
2024-10-14 12:09:35 +02:00
Martin Artnik
b0f41eb14b
Merge pull request #7963 from artoscinote/ma_SCI_11181
Further fix team viewer location permissions [SCI-11181]
2024-10-14 12:03:26 +02:00
Martin Artnik
bab4dbd9ef Further fix team viewer location permissions [SCI-11181] 2024-10-14 11:59:32 +02:00
Martin Artnik
a846f4bc58
Merge pull request #7962 from artoscinote/ma_SCI_11182
Fix switching between global share and team shares [SCI-11182]
2024-10-14 11:47:22 +02:00
Martin Artnik
d38ccea98f Fix switching between global share and team shares [SCI-11182] 2024-10-14 11:43:52 +02:00
Martin Artnik
87f2851d9b
Merge pull request #7961 from artoscinote/ma_SCI_11181
Fix location permissions for viewer team role [SCI-11181]
2024-10-14 11:03:59 +02:00
Martin Artnik
7ee81c1a2b Fix location permissions for viewer team role [SCI-11181] 2024-10-14 11:00:43 +02:00
Anton
c71366acc5 Update notifications flyout [SCI-10735] 2024-10-14 10:29:01 +02:00
Alex Kriuchykhin
c18d2b31b2
Fix rendering of HTML elements in inventory tables [SCI-11176] (#7959) 2024-10-11 10:00:46 +02:00
aignatov-bio
bff0ddc496
Merge pull request #7958 from aignatov-bio/ai-sci-11175-fix-validation-for-non-grid-box
Remove position validation for non grid box [SCI-11175]
2024-10-10 14:56:58 +02:00
KlemenSciNote
32aab4bbb8
Merge pull request #7957 from KlemenSciNote/kb_SCI-11055_data-e2e-protocol-templates
Add data-e2e in reorder and manage access dialogs [SCI-11055]
2024-10-10 14:38:30 +02:00
aignatov-bio
8aad40ccbe
Merge pull request #7955 from aignatov-bio/ai-sci-11149-fix-moving-location-to-root
Fix moving location to root [SCI-11149]
2024-10-10 14:34:33 +02:00
Anton
26f832be96 Remove position validation for non grid box [SCI-11175] 2024-10-10 14:34:03 +02:00
Klemen Benedicic
3433239dde Merge branch 'develop' into kb_SCI-11055_data-e2e-protocol-templates 2024-10-10 13:35:18 +02:00
Klemen Benedicic
0292107245 Add data-e2e to reorderable items and manage access modals [SCI-11055] 2024-10-10 13:29:34 +02:00
ajugo
4564deeeb9
Merge pull request #7956 from rekonder/aj_SCI_11110
Add warning for unsharing repository relationships [SCI-11110]
2024-10-10 13:15:28 +02:00
Andrej
40a7b88d1a Add warning for unsharing repository relationships [SCI-11110] 2024-10-10 12:55:03 +02:00
Anton
ac1fda3561 Fix moving location to root [SCI-11149] 2024-10-10 11:16:23 +02:00
Alex Kriuchykhin
63a470a8ac
Fix inventory snapshot loading in full view [SCI-11168] (#7954) 2024-10-09 15:10:35 +02:00