Commit graph

3073 commits

Author SHA1 Message Date
Martin Artnik
5960446401
Merge pull request #6320 from wandji20/wb-SCI-9406
Add helper method to show grey layout background [SCI-9406]
2023-10-03 16:43:18 +02:00
Martin Artnik
64449af994
Merge pull request #6341 from artoscinote/ma_SCI_9441
Fix error translations [SCI-9441]
2023-10-03 15:32:00 +02:00
Martin Artnik
2b76fe6b5b Fix error translations [SCI-9441] 2023-10-03 15:23:49 +02:00
wandji20
b5acdd2bf6 Refactor application helper method [SCI-9406] 2023-10-03 13:24:39 +01:00
Martin Artnik
a85b2643ce
Merge pull request #6319 from artoscinote/ma_SCI_9425
Implement default name for results [SCI-9425]
2023-10-03 10:56:03 +02:00
Alex Kriuchykhin
40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386
Refactor export stock consumption modal [SCI-9386]
2023-10-03 10:33:00 +02:00
Andrej
835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Martin Artnik
295de7b0bc Implement default name for results [SCI-9425] 2023-09-29 13:01:41 +02:00
Martin Artnik
a1df2b7b52
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2
DOCX not working if result name empty. [SCI-9245]
2023-09-29 12:24:18 +02:00
Giga Chubinidze
0be8ab5839 used i18n 2023-09-29 14:18:45 +04:00
Martin Artnik
d44d29a0fd
Merge pull request #6301 from G-Chubinidze/gc_SCI_9299
OVE - Activities related to Task result [SCI-9299]
2023-09-27 12:49:58 +02:00
Giga Chubinidze
b53ac04577 styling fix 2023-09-27 14:47:35 +04:00
Martin Artnik
923006dc38
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
2023-09-27 12:41:34 +02:00
Alex Kriuchykhin
9f03d88f12
Merge pull request #6201 from wandji20/wb-SCI-9225
Improve UI for stock consumption export [SCI-9225]
2023-09-27 09:21:22 +02:00
Alex Kriuchykhin
dc40b4354d
Merge pull request #6298 from okriuchykhin/ok_SCI_9282
Fix column placement in stock consumption export, add missing localization [SCI-9282]
2023-09-27 09:20:00 +02:00
Giga Chubinidze
da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04:00
Anton
f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +02:00
wandji20
213c752941 Improve UI for for exports in inventory with stock enabled [SCI-9225] 2023-09-26 15:20:18 +01:00
Oleksii Kriuchykhin
efae35816f Fix column placement in stock consumption export, add missing localization [SCI-9282] 2023-09-26 13:35:02 +02:00
Anton
2b9ae65a51 Fix selected state for dropdown [SCI-9385][SCI-9276][SCI-9375][SCI-9379] 2023-09-25 15:04:41 +02:00
Martin Artnik
3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
Anton
5b434c4e4c Fixes for new flyout [SCI-9343] 2023-09-23 19:15:35 +02:00
aignatov-bio
a19a2d16e9
Merge pull request #6272 from aignatov-bio/ai-sci-9340-update-checklists-interactions
Refactor checklist [SCI-9340]
2023-09-22 12:09:41 +02:00
sboursen-scinote
adc0a460bd Improve logic for custom logos on error pages [SCI-9147]
- Switch to dynamic ERB templates.
- Move text to I18n
2023-09-22 10:26:32 +02:00
Anton
77948572f1 Refactor checklist [SCI-9340] 2023-09-22 08:36:37 +02:00
Alex Kriuchykhin
5cc41451cd
Merge pull request #6254 from sboursen-scinote/sb_SCI-9133
Fix missing icon files in exported projects [SCI-9133]
2023-09-21 17:12:08 +02:00
sboursen-scinote
aa769f92f7 Fix missing icon files in exported projects [SCI-9133] 2023-09-21 15:11:02 +02:00
Anton
3d43c791ad Fix input fields globaly 2023-09-21 11:38:58 +02:00
Anton
cb3508616f Add addons to tailwind 2023-09-21 11:07:10 +02:00
Martin Artnik
810e0ffaff
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269
CSS: Results revamp issues [SCI-9269]
2023-09-21 10:00:14 +02:00
Giga Chubinidze
eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Alex Kriuchykhin
8e1f8296f4
Merge pull request #6243 from rekonder/aj_SCI_9272
Fix message for successful import protocol from protocol parser [SCI-9272]
2023-09-20 19:36:12 +02:00
Martin Artnik
5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348
Clean up legacy comment logic [SCI-9348]
2023-09-20 13:10:28 +02:00
Martin Artnik
44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton
4cc968bcb2 Filters modal fixes [SCI-9276] 2023-09-20 11:07:48 +02:00
Andrej
b47651750b Fix message for successful import protocol from protocol parser [SCI-9272] 2023-09-19 15:47:51 +02:00
Giga Chubinidze
b414cc4295 fixed hound and changed logic for ove to marvin 2023-09-19 12:50:45 +04:00
Giga Chubinidze
01e57e0395 Add activities for moving content between steps and results [SCI-9300] 2023-09-19 03:17:30 +04:00
Andrej
aebea07be4 Change dropdown options for importing protocols [SCI-9288] 2023-09-18 13:15:55 +02:00
Giga Chubinidze
73c1f67510 Missing modal when deleting an archived result [SCI-9291] 2023-09-18 01:28:22 +04:00
Ivan Kljun
af18a42129 Add constants for status state polling [SCI-9304] 2023-09-14 16:21:17 +02:00
Anton
af0fbfeec0 Merge branch 'develop' into features/september-release 2023-09-14 13:45:40 +02:00
Anton
4dab80e814 Update protocol css 2023-09-14 12:12:15 +02:00
Alex Kriuchykhin
40a82f67c0
Merge pull request #6216 from scinote-eln/features/ove-integration
Features/ove integration
2023-09-13 17:05:48 +02:00
ajugo
efed11be3c
Remove cancel button in import protocol parser modals and fix wording [SCI-9284] (#6203) 2023-09-13 15:02:30 +02:00
wandji
642e3b5ff4
Add link to knowledge base [SCI-9231] (#6190)
* Add link to knowledge base [SCI-9231]

* Remove custom OVE help link [SCI-9231]
2023-09-13 14:45:28 +02:00
Anton
3bee8feb7d Add flyout menu to step/results elements [SCI-9262] 2023-09-13 12:12:36 +02:00
Martin Artnik
c5eb1759b6
Merge pull request #6198 from artoscinote/ma_SCI_9285
Fix result pagination, fix new step/result buttons [SCI-9285]
2023-09-13 10:00:01 +02:00
Martin Artnik
2fc4f3c033
Merge pull request #6168 from ivanscinote/SCI-9010-rework-result-activities-to-be-aligned-with-step-activities
Add and fix result activities [SCI-9010]
2023-09-13 09:51:08 +02:00
Martin Artnik
6114dd7afc Fix result pagination, fix new step/result buttons [SCI-9285] 2023-09-12 17:33:47 +02:00