Commit graph

8315 commits

Author SHA1 Message Date
Anton 32273fe169 Fix markup [SCI-6867] 2022-06-03 15:26:16 +02:00
Anton 2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +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
Anton 61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
Anton 08e7ea3014 Add step text option to report wizard [SCI-6865] 2022-06-01 15:53:40 +02:00
aignatov-bio 3645200700
Merge pull request #4127 from aignatov-bio/ai-sci-6855-update-docx-report
Update step structure in report [SCI-6855]
2022-06-01 15:42:59 +02:00
artoscinote 98d66a3276
Implement reordering activities [SCI-6851] (#4129)
* Implement reordering activities [SCI-6851]

* Added asset activity types [SCI-SCI-6853]
2022-06-01 12:30:09 +02:00
Anton cf36ad0fb4 Fix Docx preview after replace file [SCI-6878] 2022-06-01 12:16:19 +02:00
Alex Kriuchykhin d5c80b8ab0
Merge pull request #4101 from okriuchykhin/ok_SCI_6805
Improve stock consumption recording [SCI-6805]
2022-06-01 12:01:33 +02:00
artoscinote 95a2cc5298
Fix counts for archived tasks [SCI-6881] (#4132) 2022-06-01 11:43:15 +02:00
Anton b684841718 Update PDF report layout [SCI-6856] 2022-05-31 14:42:46 +02:00
artoscinote 3c63d9a3eb
CSS fix, routes fix [SCI-6844] (#4106) 2022-05-31 09:05:38 +02:00
aignatov-bio 36ffbb0eab
Merge pull request #4125 from aignatov-bio/ai-sci-6854-update-pdf-report
Update PDF report with new step structure [SCI-6854]
2022-05-30 13:46:32 +02:00
artoscinote 23872f519b
Implement step element sorting modal [SCI-6849] (#4124)
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
2022-05-30 13:45:51 +02:00
Anton a2f7f38e31 Update step structure in report [SCI-6855] 2022-05-30 11:33:56 +02:00
Anton 65ab42a938 Update PDF report with new step structure [SCI-6854] 2022-05-27 13:26:40 +02:00
Martin Artnik b7e78f567c Add missing base controller 2022-05-27 12:22:44 +02:00
aignatov-bio 57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space
Add the ability to show storage limit [SCI-6835]
2022-05-26 15:03:45 +02:00
Anton 3983d920e9 Fix localization [SCI-6835] 2022-05-26 15:01:52 +02:00
Anton 9e2c8bf25a Add ability to show storage limit [SCI-6835] 2022-05-26 14:48:57 +02:00
artoscinote 894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
ajugo e3c337aa3d
Renaming settings section and remove caching for Settings class [SCI-5625] (#4100)
* Renaming settings section and remove caching for Settings class [SCI-5625]

* Code fix for setting model [SCI-5625]

* Clean code [SCI-5625]
2022-05-26 13:27:18 +02:00
ajugo 5ceab30aa7
Add tooltip to task names [SCI-6607] (#4109) 2022-05-26 13:21:50 +02:00
ajugo 054ce72d25
Add handle for going over storage limit for inventories [SCI-6604] (#4120) 2022-05-26 13:19:38 +02:00
aignatov-bio 45801950fd
Merge pull request #4116 from aignatov-bio/ai-sci-6814-add-dropable-area-to-step
Add dropable area to step [SCI-6814]
2022-05-26 12:57:51 +02:00
Anton 2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
aignatov-bio 82a3a9de9a
Merge pull request #4090 from aignatov-bio/ai-sci-6810-add-tinymce-component-to-protocol-description
Add tinyMce field to protocol [SCI-6810]
2022-05-26 12:46:15 +02:00
aignatov-bio adc87b85f1
Merge pull request #4077 from aignatov-bio/ai-sci-6791-add-show-password-button
Add show icon for password [SCI-6791]
2022-05-26 12:46:00 +02:00
aignatov-bio 5fe3613eb8
Merge pull request #4118 from aignatov-bio/ai-sci-6837-add-comments-section
Add comments to step [SCI-6837]
2022-05-25 22:01:48 +02:00
Anton 7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
artoscinote df0f001afa
Refactor step elements controllers [SCI-6848] (#4117) 2022-05-25 14:23:35 +02:00
ajugo 047c1620de
Fix remove tag on backspace [SCI-6542] (#4108) 2022-05-25 10:46:42 +02:00
ajugo 0fa2e5f30b
Remove icons from task tabs [SCI-6621] (#4105) 2022-05-25 10:45:08 +02:00
ajugo b03ce665da
Add missing classes for shrinking save button [SCI-6839] (#4102)
* Add missing classes for shrinking save button [SCI-6839]

* Change type of button for save filter [SCI-6839]
2022-05-25 10:44:27 +02:00
ajugo b77394a7b2
Responsive filter flyout [SCI-6494] (#4098)
* Responsive filter flyout [SCI-6494]

* Correct delimiter [SCI-6494]
2022-05-25 10:42:54 +02:00
ajugo bacb1547f2
Changed clone permissions and UI changes for experiment actions [SCI-6756] (#4074) 2022-05-25 10:22:50 +02:00
ajugo a23eea7523
Hide stock column at importing items after stock is disabled [SCI-6801] (#4093)
* Add stock column check at importing inventory items [SCI-6801]

* Fix hound message [SCI-6801]
2022-05-24 11:49:36 +02:00
artoscinote c33b426c03
Add marvinJS integration [SCI-6831] (#4113) 2022-05-24 11:30:15 +02:00
artoscinote 6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] (#4111) 2022-05-24 11:13:47 +02:00
Anton a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
Anton 5a275aaeae Move attachments to separate component 2022-05-19 11:16:50 +02:00
ajugo 90db2bace9
API endpoint to generate with ELN data for Validaide [SCI-6663][SCI-6798] (#4012)
* Manuscript JSON data SCI-6663

* Clean code for generate manuscript data [SCI-6663]

* Include project data into json [SCI-6663]

* Fix hound [SCI-6663]

* Fix hound [SCI-6663]

* Remove manuscript naming [SCI-6663]

* Add local storage assets capabilites [SCI-6663]

* Rename project [SCI-6663]

* Enable multple projects and clean input [SCI-6798]

* Fix hound [SCI-6798]
2022-05-19 09:08:05 +02:00
Anton 9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00