Commit graph

10747 commits

Author SHA1 Message Date
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
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
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
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
Anton 8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +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
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 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
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
artoscinote e114f9b880
Update protocols.io importer and import from repository [SCI-6872] (#4138) 2022-06-08 15:55:50 +02:00
aignatov-bio 81773151a4
Merge pull request #4152 from aignatov-bio/ai-sci-6875-update-team-import-export
Update team import/export scripts [SCI-6875]
2022-06-08 15:43:50 +02:00
Anton fb9fcb9371 Update team import/export scripts [SCI-6875] 2022-06-08 15:32:59 +02:00
Anton 4ab4f4c6ed Fix element closing on select [SCI-5257] 2022-06-07 15:14:00 +02:00
aignatov-bio 2cb5d44109
Merge pull request #4148 from aignatov-bio/ai-sci-6870-finalize-protocol-repository
Finalize protocol repository [SCI-6870]
2022-06-07 15:11:40 +02:00
Anton 46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
aignatov-bio f2785bbff6
Merge pull request #4145 from aignatov-bio/ai-sci-6869-add-metadata-block-to-protocol-in-repository
Add metadata block in protocol repository [SCI-6869]
2022-06-07 10:53:14 +02:00
Anton 656d036b2a Fix markup [SCI-6869] 2022-06-07 10:02:10 +02:00
Anton e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
aignatov-bio a8fe943658
Merge pull request #4140 from aignatov-bio/ai-sci-6868-remove-new-protocal-modal
Remove protocol creation modal [SCI-6868]
2022-06-05 22:41:57 +02:00
aignatov-bio d7926654ee
Merge pull request #4139 from aignatov-bio/ai-sci-6867-add-view-mode-for-protocol-and-step
Add view mode to protocol and step [SCI-6867]
2022-06-03 15:27:15 +02:00
Anton 32273fe169 Fix markup [SCI-6867] 2022-06-03 15:26:16 +02:00
Anton 3910fa34f3 Remove protocol creation modal [SCI-6868] 2022-06-03 15:11:51 +02:00
Anton 2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik 1df4433074 Fix file activity logging in steps controller 2022-06-02 13:44:03 +02:00
Martin Artnik 8c78920927 Fixed checklist editing 2022-06-02 12:02:34 +02:00
Martin Artnik ded23dc528 Fix checklist update issue 2022-06-02 11:53:24 +02:00
Martin Artnik 02c813bf06 Fix text serializer and file activity logging 2022-06-02 11:32:31 +02:00
Martin Artnik 9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
aignatov-bio 6b4a3f2651
Merge pull request #4130 from aignatov-bio/ai-sci-6856-update-pdf-report
Update PDF report layout [SCI-6856]
2022-06-02 11:18:16 +02:00
artoscinote ab5cb19d6e
Add step activities, fix checklists [SCI-6852] (#4136)
* Add step activities, fix checklists [SCI-6852]

* Linter fix [SCI-6852]
2022-06-02 11:15:32 +02:00
aignatov-bio c5f3b4affb
Merge pull request #4133 from aignatov-bio/ai-sci-6878-fix-docx-preview-after-replace-file
Fix Docx preview after replace file [SCI-6878]
2022-06-02 11:07:40 +02:00
aignatov-bio cd7ca54610
Merge pull request #4135 from aignatov-bio/ai-sci-6865-add-step-text-option-to-report-wizard
Add step text option to report wizard [SCI-6865]
2022-06-02 11:06:48 +02:00
aignatov-bio edc01ffc6a
Merge pull request #4122 from aignatov-bio/ai-sci-replace-protocol-view-in-protocol-repository
Add new protocol view to repository [SCI-6858]
2022-06-02 11:06:24 +02:00