Commit graph

17885 commits

Author SHA1 Message Date
Martin Artnik
e6d87ce699 Merge branch 'develop' into features/forms 2025-01-16 11:29:34 +01:00
Martin Artnik
ef652a0a19
Merge pull request #8155 from scinote-eln/hotfix/1.38.0.2
Merge Hotfix/1.38.0.2
2025-01-16 11:09:53 +01:00
andrej-scinote
4a295b1629
Merge pull request #8153 from andrej-scinote/aj_SCI_11461
Fix form moving between steps [SCI-11461]
2025-01-16 10:00:09 +01:00
Martin Artnik
c11d6e9833
Merge branch 'develop' into hotfix/1.38.0.2 2025-01-16 09:58:54 +01:00
Andrej
7c9b482f58 Fix form moving between steps [SCI-11461] 2025-01-16 09:29:56 +01:00
Martin Artnik
e4ea3b61e1
Merge pull request #8152 from artoscinote/ma_SCI_11454
Fix handling of '&' in quick search and tags [SCI-11454][SCI-11460]
2025-01-15 15:49:18 +01:00
Martin Artnik
4bc4a9a2b4 Fix handling of '&' in quick search [SCI-11454] 2025-01-15 15:41:04 +01:00
Martin Artnik
bd929d9c9f Fix task tag component [SCI-11460] 2025-01-15 15:40:28 +01:00
aignatov-bio
04d36308c8
Merge pull request #8151 from aignatov-bio/ai-sci-11448-add-sorting-to-forms-modal
Fix forms sorting in modal [SCI-11448]
2025-01-15 14:39:45 +01:00
Anton
50dc31e487 Fix forms sorting in modal [SCI-11448] 2025-01-15 14:38:02 +01:00
aignatov-bio
06ea469e02
Merge pull request #8150 from aignatov-bio/ai-sci-11415-form-builder-improvments
Form builder improvements [SCI-11415]
2025-01-15 14:27:38 +01:00
Anton
69f0a05580 Form builder improvments [SCI-11415] 2025-01-15 14:25:13 +01:00
andrej-scinote
833d7e481f
Merge pull request #8146 from andrej-scinote/aj_SCI_11455
Make form switchable [SCI-11455]
2025-01-15 13:48:43 +01:00
Martin Artnik
79937a3ede
Merge pull request #8148 from artoscinote/ma_SCI_11417
Fix archived tag in protocol templates [SCI-11417]
2025-01-15 13:45:24 +01:00
Martin Artnik
6b9e12875e Fix archived tag in protocol templates [SCI-11417] 2025-01-15 13:09:54 +01:00
Andrej
d6d8691a35 Fix form tests [SCI-11455] 2025-01-15 12:00:19 +01:00
aignatov-bio
fd36e6645b
Merge pull request #8147 from aignatov-bio/ai-sci-11463-fix-archived-forms
Fix archived forms [SCI-11463]
2025-01-15 11:35:54 +01:00
Anton
c6df5a2af9 Fix archived forms [SCI-11463] 2025-01-15 11:33:32 +01:00
Andrej
351f449b9c Change setting when form is enabled [SCI-11455] 2025-01-15 11:09:55 +01:00
aignatov-bio
50e5cde7b4
Merge pull request #8145 from aignatov-bio/ai-sci-11457-load-form-from-task-protocol
Add duplicate action to form responses [SCI-11457]
2025-01-15 11:01:15 +01:00
Andrej
882de3b9f0 Make form switchable [SCI-11455] 2025-01-15 10:56:37 +01:00
Martin Artnik
27c77ae950
Merge pull request #8144 from artoscinote/ma_SCI_11329
Fix escaping in global search [SCI-11329]
2025-01-15 10:50:25 +01:00
Anton
48bbccac9c Add duplicate action to form responses [SCI-11457] 2025-01-15 10:40:02 +01:00
Martin Artnik
5d69699aa7 Fix escaping in global search [SCI-11329] 2025-01-15 10:36:46 +01:00
andrej-scinote
cc21b02f01
Merge pull request #8142 from andrej-scinote/aj_SCI_11456
Fix reopening of delete modal on step/result elements [SCI-11456]
2025-01-15 09:50:27 +01:00
Andrej
79b4ba3fdc Fix reopening of delete modal on step/result elements [SCI-11456] 2025-01-15 08:09:07 +01:00
Martin Artnik
f00420198b Add missing translations [SCI.-11417] 2025-01-14 14:13:10 +01:00
aignatov-bio
060f095f65
Merge pull request #8141 from aignatov-bio/ai-sci-11452-fix-forms-na-behavior
Update forms not applicable behavior [SCI-11452]
2025-01-14 13:47:57 +01:00
Anton
0187a8bc69 Update forms not aplicable behavior [SCI-11452] 2025-01-14 13:40:34 +01:00
Martin Artnik
e6c11c91a7
Merge pull request #8140 from artoscinote/ma_SCI_11417
Fix archived forms view [SCI-11417]
2025-01-14 12:58:06 +01:00
Martin Artnik
d680f28f81 Fix archived forms view [SCI-11417] 2025-01-14 12:46:36 +01:00
Martin Artnik
c572c85eec
Merge pull request #8137 from artoscinote/ma_SCI_11429
Form permission fixes [SCI-11429]
2025-01-14 11:56:24 +01:00
aignatov-bio
c26b8eab11
Merge pull request #8139 from aignatov-bio/ai-sci-11453-add-character-limit-to-step-form-fields
Add character limit to step form fields [SCI-11453]
2025-01-14 11:53:28 +01:00
Martin Artnik
676549be9c Form permission fixes [SCI-11429] 2025-01-14 11:51:55 +01:00
Anton
0971302336 Add character limit to step form fields [SCI-11453] 2025-01-14 11:51:01 +01:00
andrej-scinote
be04e85ce1
Merge pull request #8138 from andrej-scinote/aj_SCI_11447
Fix step title alignment and form dropdown for long option names [SCI-11447]
2025-01-14 11:34:49 +01:00
Andrej
9dbe3b8361 Fix step title alignment and form dropdown for long option names [SCI-11447] 2025-01-14 11:31:47 +01:00
Martin Artnik
6d7b81869e
Merge pull request #8136 from artoscinote/ma_SCI_11428
Add back auto_link to repository text values [SCI-11428]
2025-01-13 15:34:14 +01:00
Martin Artnik
8f7ad06719 Add back auto_link to repository text values [SCI-11428] 2025-01-13 15:26:37 +01:00
Martin Artnik
2103e7d144
Merge pull request #8134 from artoscinote/ma_SCI_11417
Fix archived breadcrumbs for protocols and forms, filter archived forms [SCI-11417]
2025-01-13 13:55:39 +01:00
Martin Artnik
ef4499afb5 Fix archived breadcrumbs for protocols and forms, filter archived forms [SCI-11417] 2025-01-13 13:00:42 +01:00
aignatov-bio
2d15a9f01f
Merge pull request #8133 from aignatov-bio/ai-sci-11426-add-character-limit
Add character limit to form editor [SCI-11426]
2025-01-13 10:33:58 +01:00
Anton
a032202d8b Add character limit to form editor [SCI-11426] 2025-01-13 10:26:13 +01:00
andrej-scinote
fb07b02c77
Merge pull request #8132 from andrej-scinote/aj_SCI_11422
Add empty block for form builder and set correct order on loading of form fields [SCI-11422]
2025-01-13 10:24:56 +01:00
andrej-scinote
b648f99215
Merge pull request #8131 from andrej-scinote/aj_SCI_11411
Add import/export logic for eln file [SCI-11411]
2025-01-13 10:23:48 +01:00
Andrej
aa1d8fbd71 Add empty block for form builder and set correct order on loading of form fields [SCI-11422] 2025-01-13 09:58:24 +01:00
Andrej
f714e15a24 Add import/export logic for eln file [SCI-11411] 2025-01-13 08:54:06 +01:00
Oleksii Kriuchykhin
cf3ea84242 Bump version to 1.38.0.2 2025-01-10 16:55:54 +01:00
aignatov-bio
9c0de33ea0
Merge pull request #8129 from aignatov-bio/ai-sci-11449-fix-office-icons-allignment
Fix office icons alignment [SCI-11449]
2025-01-10 15:37:34 +01:00
Anton
0ed1f82d43 Fix office icons allignment [SCI-11449] 2025-01-10 15:36:48 +01:00