Martin Artnik
|
910c36af08
|
Merge branch 'features/step-editing-improvements' into develop
|
2022-07-05 10:12:10 +02:00 |
|
Anton
|
f3fdf25d2f
|
Add activity to bulk step deletion [SCI-6928]
|
2022-07-04 21:15:19 +02:00 |
|
artoscinote
|
79b801121a
|
Fix protocol title, disable reordering of elements if less than 2 [SCI-6934] (#4187)
|
2022-07-04 13:55:26 +02:00 |
|
artoscinote
|
a0578e09bb
|
Fix tags modal css issue [SCI-6926] (#4182)
|
2022-07-04 13:54:54 +02:00 |
|
artoscinote
|
709c0b0b8a
|
Scroll to bottom when appending step [SCI-6927] (#4181)
|
2022-07-04 13:54:40 +02:00 |
|
artoscinote
|
a5ffb90a96
|
Fix multi modal support, add end of body data-hook to layout [SCI-6922] (#4180)
|
2022-07-04 13:54:22 +02:00 |
|
ajugo
|
7d09882ec2
|
Fix edit button on stepText element [SCI-6938] (#4189)
|
2022-07-04 12:46:59 +02:00 |
|
aignatov-bio
|
d5f8cef15a
|
Merge pull request #4175 from aignatov-bio/ai-sci-6909-fix-image-saving-to-protocol-description
Fix image saving to tinymce field [SCI-6909]
|
2022-07-04 09:57:42 +02:00 |
|
artoscinote
|
6b79f32e52
|
Fix asset V2 export/import [SCI-6936] (#4185)
* Fix asset V2 export/import [SCI-6936]
* Fix import of legacy eln step description images [SCI-6937]
|
2022-07-01 11:35:04 +02:00 |
|
artoscinote
|
800f856ab1
|
Handle step description with the new step_texts structure [SCI-6890] (#4176)
|
2022-06-28 09:56:24 +02:00 |
|
Anton
|
0e36783c5c
|
Fix image saving to tinymce field [SCI-6909]
|
2022-06-27 13:31:09 +02:00 |
|
Anton
|
bf13708e31
|
Fix load/save protocol to repository [SCI-6759]
|
2022-06-27 13:14:45 +02:00 |
|
artoscinote
|
b880f6fc39
|
Add API endpoints for step texts [SCI-6889] (#4173)
|
2022-06-27 12:30:45 +02:00 |
|
aignatov-bio
|
de626acd7f
|
Merge pull request #4169 from aignatov-bio/ai-sci-6853-fix-new-acitvities
Fix new step activities [SCI-6893]
|
2022-06-27 11:14:21 +02:00 |
|
aignatov-bio
|
3a5492f875
|
Merge pull request #4168 from aignatov-bio/ai-sci-6862-fix-css-step-editing
CSS fixes for step editing [SCI-6862]
|
2022-06-27 11:13:18 +02:00 |
|
aignatov-bio
|
bd1f65c811
|
Merge pull request #4171 from aignatov-bio/ai-sci-6921-add-delete-all-button
Add delete all steps button [SCI-6921]
|
2022-06-27 11:13:06 +02:00 |
|
aignatov-bio
|
6aa57904dd
|
Merge pull request #4172 from aignatov-bio/ai-sci-6924-update-pdf-reports
PDF report fixes [SCI-6924]
|
2022-06-27 11:12:38 +02:00 |
|
Anton
|
1863e031c5
|
PDF report fixes [SCI-6924]
|
2022-06-24 14:38:24 +02:00 |
|
Anton
|
5296b50c2f
|
Add delete all steps button [SCI-6921]
|
2022-06-24 11:21:47 +02:00 |
|
Oleksii Kriuchykhin
|
a8cdb9ebd4
|
Merge branch 'develop'
|
2022-06-22 14:33:36 +02:00 |
|
Oleksii Kriuchykhin
|
ebeb075c2d
|
Merge branch 'release/1.25.2' into develop
|
2022-06-22 14:32:19 +02:00 |
|
Oleksii Kriuchykhin
|
fe50ea2737
|
Bump version to 1.25.3
|
2022-06-22 14:18:15 +02:00 |
|
Anton
|
8ce0490e9a
|
Fix new step activities [SCI-6853]
|
2022-06-22 14:16:01 +02:00 |
|
Anton
|
a727fc0d68
|
Fix css for protocol repository [SCI-6862]
|
2022-06-21 18:20:52 +02:00 |
|
ajugo
|
a260217cec
|
Fix report logo inserting [SCI-6914] (#4167)
|
2022-06-21 14:27:51 +02:00 |
|
aignatov-bio
|
f94f0d2a1e
|
Add fontawesome incons to simple sign in [SCI-6791] (#4166)
Co-authored-by: Anton <anton@scinote.net>
|
2022-06-21 13:07:33 +02:00 |
|
Anton
|
8d2154d653
|
CSS fixes for step editing [SCI-6862]
|
2022-06-21 11:32:27 +02:00 |
|
ajugo
|
a4ff347d6e
|
Fix datatable sort in task assigned repository to task and on first repository load [SCI-6904] (#4164)
* Enable repository sorting on assigned repository [SCI-6904]
* Fix order at repository table initialization [SCI-6904]
|
2022-06-21 10:49:03 +02:00 |
|
ajugo
|
c39f0a4e4d
|
Fix missing bell reminder [SCI-6911] (#4163)
|
2022-06-17 10:01:36 +02:00 |
|
Alex Kriuchykhin
|
49f05f3df9
|
Merge pull request #4162 from okriuchykhin/ok_SCI_6907
Fix repository export with enabled stock management [SCI-6907]
|
2022-06-13 10:14:53 +02:00 |
|
Oleksii Kriuchykhin
|
10f7460648
|
Fix repository export with enabled stock management [SCI-6907]
|
2022-06-10 15:46:22 +02:00 |
|
Alex Kriuchykhin
|
6148c6accf
|
Merge pull request #4161 from okriuchykhin/ok_SCI_6907
Fix repository export in export all [SCI-6907]
|
2022-06-10 11:13:14 +02:00 |
|
Oleksii Kriuchykhin
|
9df833111d
|
Fix repository export in export all [SCI-6907]
|
2022-06-10 11:04:44 +02:00 |
|
Alex Kriuchykhin
|
ef5d6e634b
|
Merge pull request #4156 from okriuchykhin/ok_SCI_6879
Fix switching between views on experiment canvas [SCI-6879]
|
2022-06-10 10:42:15 +02:00 |
|
artoscinote
|
7cb9b9777f
|
Add step_texts to all past reports as default [SCI-6866] (#4137)
|
2022-06-10 10:42:13 +02:00 |
|
artoscinote
|
934023e9d8
|
Update print template to fit with new steps [SCI-6871] (#4153)
|
2022-06-10 10:41:57 +02:00 |
|
Alex Kriuchykhin
|
a57881fac4
|
Merge pull request #4155 from okriuchykhin/ok_SCI_6805_v2
Improve inventory stock saving with comment [SCI-6805]
|
2022-06-10 10:41:56 +02:00 |
|
aignatov-bio
|
247a8f9a0b
|
Merge pull request #4159 from aignatov-bio/ai-sci-6887-add-collapse-extend-buttons
Add collapse/expand buttons to steps [SCI-6887]
|
2022-06-10 10:19:13 +02:00 |
|
artoscinote
|
5c051ef8c1
|
Implement V2 protocols exporter [SCI-6876] (#4142)
* Implement V2 protocols exporter [SCI-6876]
* Implement new importer [SCI-6877]
|
2022-06-10 10:18:55 +02:00 |
|
Anton
|
d62f712166
|
Add collapse/expand buttons to steps [SCI-6887]
|
2022-06-09 16:16:30 +02:00 |
|
aignatov-bio
|
b27706c6f1
|
Merge pull request #4158 from aignatov-bio/ai-sci-update-core-version-1.25.2
Update version to 1.25.2
|
2022-06-09 16:08:07 +02:00 |
|
Anton
|
70ab0b5886
|
Update version to 1.25.2
|
2022-06-09 16:07:18 +02:00 |
|
Alex Kriuchykhin
|
86c339f0d3
|
Merge pull request #4143 from biosistemika/release/1.25.2
Release 1.25.2
|
2022-06-09 16:01:42 +02:00 |
|
Alex Kriuchykhin
|
ded673ebf3
|
Merge pull request #4151 from okriuchykhin/ok_SCI_6886
Improve Inventory table loading time [SCI-6886]
|
2022-06-09 15:59:41 +02:00 |
|
Anton
|
cfe2e72c96
|
Fix Docx preview after replace file [SCI-6878]
|
2022-06-09 15:58:40 +02:00 |
|
aignatov-bio
|
ada26d8036
|
Merge pull request #4157 from aignatov-bio/ai-sci-6782-fix-css-for-inline-editing
Finalize inline edit field [SCI-6782]
|
2022-06-09 15:25:46 +02:00 |
|
Anton
|
66212fd703
|
Finalize inline edit field [SCI-6782]
|
2022-06-09 14:40:45 +02:00 |
|
Oleksii Kriuchykhin
|
31ae9ffbda
|
Fix switching between views on experiment canvas [SCI-6879]
|
2022-06-09 14:13:29 +02:00 |
|
Oleksii Kriuchykhin
|
f82c2af244
|
Improve inventory stock saving with comment [SCI-6805]
|
2022-06-09 13:18:00 +02:00 |
|
aignatov-bio
|
7446e4be9b
|
Merge pull request #4150 from aignatov-bio/ai-sci-5257-close-all-modals-to-esc
Fix element closing on select [SCI-5257]
|
2022-06-09 12:44:59 +02:00 |
|