2768 commits

Author	SHA1	Message	Date
Anton	5a23cd442d	Add suffix for checklist and table duplication [SCI-7424]	2022-11-29 12:29:13 +01:00
Oleksii Kriuchykhin	4430483bf4	Add creation of assigned tags and designated users to task creation action [SCI-7444]	2022-11-28 14:48:59 +01:00
Anton	2901c7b627	Add restore action to experiment table [SCI-7453]	2022-11-28 12:45:18 +01:00
Anton	e2cd0dfd91	Update archive module cards header [SCI-7493]	2022-11-25 15:29:15 +01:00
Oleksii Kriuchykhin	3b474fc9f0	Improve activity records creation in controllers [SCI-7505]	2022-11-24 15:19:17 +01:00
ajugo	80f66736b6	Add new task modal for experiment table view [SCI-7448] (#4638) ... * Add new task modal for experiment table view [SCI-7448] * Fix placeholder and size of the icon [SCI-7448] * Reload experiment table [SCI-7448]	2022-11-24 14:49:42 +01:00
aignatov-bio	0facc2bda0	Merge pull request #4647 from aignatov-bio/ai-sci-7452-add-archived-view-for-experiment-table ... Add archived view for experiment table [SCI-7452]	2022-11-24 13:24:50 +01:00
Alex Kriuchykhin	3685176ce7	Merge pull request #4645 from okriuchykhin/ok_SCI_7439 ... Update the existing endpoint for listing the users with access to the task [SCI-7439]	2022-11-24 13:15:34 +01:00
Anton	2e2086a03b	Add archived view for experiment table [SCI-7452]	2022-11-24 12:07:52 +01:00
ajugo	c44aa2cb9c	Implement session end for multiple tabs [SCI-7502] (#4632)	2022-11-23 20:08:26 +01:00
Oleksii Kriuchykhin	daecd6a766	Update the existing endpoint for listing the users with access to the task [SCI-7439]	2022-11-23 17:20:14 +01:00
Anton	440800537c	Add menu to experiment table row [SCI-7446]	2022-11-23 15:05:13 +01:00
Alex Kriuchykhin	dc9831d3bc	Merge pull request #4568 from rekonder/aj_SCI_7181 ... Remove old step code [SCI-7181]	2022-11-22 10:52:06 +01:00
Alex Kriuchykhin	d9897d6e7c	Merge pull request #4624 from okriuchykhin/ok_SCI_7457 ... Fix protocol owner re-assignment when removing a user from a team [SCI-7457]	2022-11-21 11:03:50 +01:00
Oleksii Kriuchykhin	49fbc2c561	Add basic modal for direct task creation [SCI-7197]	2022-11-18 17:00:11 +01:00
Oleksii Kriuchykhin	69812786ba	Fix protocol owner re-assignment when removing a user from a team [SCI-7457]	2022-11-18 12:52:30 +01:00
Oleksii Kriuchykhin	66f9f13508	Implement current team switch when navigating to tasks and experiments from another team [SCI-7447]	2022-11-18 11:48:49 +01:00
Anton	7523535e24	Add archive action to experiment table [SCI-7384]	2022-11-14 11:31:53 +01:00
aignatov-bio	0ee586a394	Merge pull request #4439 from rekonder/aj_SCI_7027 ... Session end implementation [SCI-7027]	2022-11-10 11:03:02 +01:00
Anton	63ce422367	Add basic filters for experiment table [SCI-7215]	2022-11-09 15:27:39 +01:00
Anton	7ceb94ab1f	Add toolbar to experiment table [SCI-7379]	2022-11-08 12:52:49 +01:00
ajugo	dd22d53bda	Implemented pagination for experiment table [SCI-7214] (#4591) ... * Implement pagination for experiment table [SCI-7214] * Fix table experiment pagination [SCI-7214] * Move pagination to service [SCI-7214]	2022-11-07 11:46:54 +01:00
artoscinote	eec5fd9ab3	Merge pull request #4570 from artoscinote/ma_SCI_7357 ... Only render last label in ZPL [SCI-7357]	2022-10-25 11:53:52 +02:00
Martin Artnik	7f384f1964	Only render last label in ZPL [SCI-7357]	2022-10-24 15:50:10 +02:00
Anton	8feaedc0d1	Add core columns to experiment table [SCI-7212]	2022-10-24 15:27:57 +02:00
Andrej	09a1adb194	Fix hound [SCI-7181]	2022-10-24 13:12:28 +02:00
Andrej	745be5a0f7	Remove old step code [SCI-7181]	2022-10-24 13:07:10 +02:00
Anton	bc86f11404	Add experiment table view [SCI-7174]	2022-10-21 12:22:38 +02:00
Oleksii Kriuchykhin	94978ea2ea	Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]	2022-10-20 16:19:02 +02:00
ajugo	98c32fda78	Fix label preview for custom repository columns [SCI-7358] (#4549)	2022-10-19 13:18:33 +02:00
Anton	91c46e2005	Fix copy experiment only to active projects [SCI-7345]	2022-10-17 11:08:59 +02:00
Alex Kriuchykhin	4cee224180	Merge pull request #4534 from okriuchykhin/ok_SCI_7338 ... Fix user role selection when inviting new users [SCI-7338]	2022-10-17 10:21:37 +02:00
Alex Kriuchykhin	63a1b35a45	Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2 ... Unify tags loading order [SCI-6943]	2022-10-17 10:21:13 +02:00
Alex Kriuchykhin	15813166fe	Merge pull request #4537 from okriuchykhin/ok_SCI_7343 ... Allow team owners to manage project users [SCI-7343]	2022-10-17 10:16:50 +02:00
Oleksii Kriuchykhin	bded75ac2c	Allow team owners to manage project users [SCI-7343]	2022-10-14 15:51:37 +02:00
Oleksii Kriuchykhin	8e838fe09f	Fix permission checking in reports controller [SCI-7330][SCI-7331]	2022-10-14 14:26:02 +02:00
Oleksii Kriuchykhin	a5336608f8	Fix user role selection when inviting new users [SCI-7338]	2022-10-14 11:35:35 +02:00
Oleksii Kriuchykhin	e43aa30193	Unify tags loading order [SCI-6943]	2022-10-13 13:55:36 +02:00
Alex Kriuchykhin	99ffbf47ab	Merge pull request #4512 from okriuchykhin/ok_SCI_7297 ... Fix report creation permission check [SCI-7297]	2022-10-11 11:01:31 +02:00
ajugo	0493d6f31d	Fix label template preview issues [SCI-7313] (#4514) ... * Add preview label at open modal [SCI-7313] * Add density and unit to the label template [SCI-7313]	2022-10-11 10:58:37 +02:00
Oleksii Kriuchykhin	f68e85532c	Fix report creation permission check [SCI-7297]	2022-10-10 16:16:54 +02:00
Alex Kriuchykhin	3a9b568358	Merge pull request #4508 from rekonder/aj_SCI_7318 ... Fix view permission at label template table [SCI-7318]	2022-10-10 15:59:02 +02:00
Andrej	42193bbe81	Fix view permission at label template table [SCI-7318]	2022-10-07 17:16:40 +02:00
Alex Kriuchykhin	4d529cfcb5	Merge pull request #4499 from okriuchykhin/ok_SCI_7291 ... Update teams table with new user assignments system [SCI-7291]	2022-10-07 14:53:19 +02:00
Oleksii Kriuchykhin	0e95b7ea66	Connect update fluics template button with controller action [SCI-7261]	2022-10-07 14:52:23 +02:00
artoscinote	77b91b467a	Merge pull request #4485 from rekonder/aj_SCI_7270 ... Add label printer modal to task [SCI-7270][7296]	2022-10-06 15:01:31 +02:00
aignatov-bio	bd535dc9ad	Add dimension saving to label templates [SCI-7268] (#4489)	2022-10-06 11:09:10 +02:00
Oleksii Kriuchykhin	0a8ebef095	Update teams table with new user assignments system [SCI-7291]	2022-10-05 18:28:40 +02:00
Andrej	eebdee5129	Add label printer modal to task [SCI-7270]	2022-09-29 16:35:51 +02:00
Anton	3773fff093	Add label validation and preview in print modal [SCI-7255][SCI-7256]	2022-09-27 15:46:48 +02:00
Alex Kriuchykhin	db0a5ede84	Merge pull request #4462 from okriuchykhin/ok_SCI_7240 ... Fix user adding/removing from a team [SCI-7240]	2022-09-27 10:30:35 +02:00
Oleksii Kriuchykhin	b675fb14eb	Fix user adding/removing from a team [SCI-7240]	2022-09-26 12:14:03 +02:00
Alex Kriuchykhin	fcd235b654	Merge pull request #4457 from okriuchykhin/ok_SCI_7241 ... Improve error handling in label template preview generation [SCI-7241]	2022-09-26 10:33:30 +02:00
Anton	40022a7012	Add initial VUE container for print dialog [SCI-7193]	2022-09-23 14:07:52 +02:00
ajugo	b7861f5fdb	Add zebra javascript print library [SCI-7245] (#4455)	2022-09-23 12:34:43 +02:00
Oleksii Kriuchykhin	1d7bca0664	Improve error handling in label template preview generation [SCI-7241]	2022-09-22 15:24:30 +02:00
ajugo	a3ea6e608c	Add validation to print modal and implement zpl printing [SCI-7052][SCI-7221] (#4448) ... * Add validation to print modal [SCI-7052] * Fix dropdown on label modal print [SCI-7052] * Fix hound [SCI-7052] * Rename validation endpoint [SCI-7052] * Add zpl label printing and fix fluics printing [SCI-7221] * Fix hound [SCI-7221]	2022-09-22 15:06:36 +02:00
ajugo	6f3a32f09f	Add label template dropdown to print dialog [SCI-7104] (#4387) ... * Add label template dropdown to print dialog [SCI-7051] * Add zebra printers in printing progress and modal [SCI-7104] * Fix hound [SCI-7104] * Fix hound [SCI-7104] * Fix hound [SCI-7104] * Clean code for zebra printer [SCI-7104]	2022-09-20 14:10:34 +02:00
Andrej	ec77c2a076	Merge branch 'develop' of https://github.com/rekonder/scinote-web into aj_SCI_7027	2022-09-16 10:44:07 +02:00
Andrej	ac7c873385	Session end implementation [SCI-7027]	2022-09-16 09:57:40 +02:00
aignatov-bio	e1ce81280e	Merge pull request #4430 from aignatov-bio/ai-sci-7171-duplicate-protocols-in-activities ... Fix duplicate protocols in activities search [SCI-7171]	2022-09-15 14:07:23 +02:00
aignatov-bio	c0339b17be	Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps	2022-09-15 11:25:25 +02:00
aignatov-bio	7d23f3c8a6	Merge branch 'develop' into ai-sci-7089-include-label-templates-to-team-import-export	2022-09-15 11:20:20 +02:00
Anton	0c596bb701	Merge branch 'develop' into features/label-templates	2022-09-15 10:40:17 +02:00
aignatov-bio	4182194b31	Merge branch 'features/label-templates' into features/team-permissions	2022-09-14 14:34:02 +02:00
aignatov-bio	9e63dcab22	Merge pull request #4207 from okriuchykhin/ok_SCI_6918 ... Update repository sharing actions [SCI-6918]	2022-09-14 14:23:52 +02:00
Anton	75a15310ac	Merge branch 'features/team-permissions' into features/label-templates	2022-09-13 14:26:15 +02:00
Anton	d68bb6ddf4	Fix dupicate protocols in activities search [SCI-7171]	2022-09-13 12:38:26 +02:00
Anton	7d02b9f26d	Fix repository selection in reports [SCI-7167]	2022-09-13 09:59:11 +02:00
aignatov-bio	06548c247f	Merge pull request #4407 from aignatov-bio/ai-sci-7148-make-zebra-printers-switchable ... Add ability to disable zebra printers [SCI-7148]	2022-09-12 13:54:52 +02:00
Oleksii Kriuchykhin	bb6e638528	Add activities for label template actions [SCI-7086]	2022-09-08 16:35:53 +02:00
Oleksii Kriuchykhin	3d3fa6e871	Do not change team if inventory is shared with current one [SCI-7164]	2022-09-07 11:01:53 +02:00
artoscinote	9126b7fca4	Add missing protocol description activity [SCI-7140] (#4401)	2022-09-06 11:03:13 +02:00
Anton	47e20d1b27	Add ability to disable zebra printers [SCI-7148]	2022-09-05 12:37:03 +02:00
Oleksii Kriuchykhin	f85a6b5a2e	Make experiment card dropdown menu async [SCI-7158]	2022-09-02 18:15:01 +02:00
Oleksii Kriuchykhin	e27d063b61	Make permission checks for card selection async [SCI-7157]	2022-09-02 18:10:16 +02:00
Martin Artnik	a2a5e8c4c8	Add caching and improve dynamic reload [SCI-7159]	2022-09-02 16:54:41 +02:00
Martin Artnik	ef9cd21ecf	Make project action dropdowns async [SCI-7159]	2022-09-02 13:47:45 +02:00
Alex Kriuchykhin	a5fc66a6f3	Merge pull request #4388 from okriuchykhin/ok_SCI_7047 ... Add syncing service and schedule for Fluics templates sync [SCI-7047]	2022-09-01 14:13:18 +02:00
Oleksii Kriuchykhin	e276054a80	Optimize PE cards loading [SCI-7133]	2022-09-01 11:59:39 +02:00
Oleksii Kriuchykhin	ba54f42d2f	Wrap unsaring actions in transaction [SCI-6918]	2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin	bf8f838214	Update repository sharing actions [SCI-6918]	2022-08-31 17:21:01 +02:00
Oleksii Kriuchykhin	eb04bc974d	Update tests with new team user assignments [SCI-6843]	2022-08-31 16:37:00 +02:00
Anton	d555227652	Add acitvities and flash messages for component duplication [SCI-7108]	2022-08-31 11:09:38 +02:00
Anton	bcc681b14d	Add labels template to team import/export [SCI-7089]	2022-08-31 10:28:29 +02:00
Oleksii Kriuchykhin	b2b059b7e1	Add syncing service and schedule for Fluics templates sync [SCI-7047]	2022-08-29 09:59:13 +02:00
ajugo	185bf0b197	Add label template dropdown to print dialog [SCI-7051] (#4369)	2022-08-26 10:53:55 +02:00
artoscinote	7a7df03396	Implement label preview component [SCI-7050] (#4370)	2022-08-24 13:55:54 +02:00
Anton	e22af8830a	Add activties to step duplication [SCI-7109]	2022-08-24 13:45:39 +02:00
Anton	bc112dd6af	Add step duplication [SCI-7109]	2022-08-23 17:54:33 +02:00
Anton	1bac9aeb4c	Add duplication to components [SCI-7108]	2022-08-22 15:03:49 +02:00
Oleksii Kriuchykhin	497fc3a2a5	Fix API endpoints for step elements creation [SCI-7101]	2022-08-18 17:31:29 +02:00
Oleksii Kriuchykhin	f02f625e1e	Add client for ZPL preview generation service [SCI-7049]	2022-08-12 12:57:19 +02:00
ajugo	83c78d660f	Added activity for update protocol name [SCI-7095] (#4346) ... * Added activity for update protocol name [SCI-7095] * Fix activity log for updated protocol name [SCI-7095] * Fix activity log for updated protocol name [SCI-7095]	2022-08-11 14:09:01 +02:00
aignatov-bio	f1013c59fd	Merge pull request #4341 from aignatov-bio/ai-sci-7094-fix-protocol-description-save-in-repository ... Fix protocol description save in protocol repository [SCI-7094]	2022-08-10 13:57:18 +02:00
Anton	f39e86d40b	Fix protocol description save in protocol repository [SCI-7094]	2022-08-10 13:46:50 +02:00
artoscinote	610ee6bdaa	Don't adjust step position in bulk deletion [SCI-7079] (#4339)	2022-08-10 12:05:24 +02:00
artoscinote	4e768bec04	Add endpoint for fetching label template tags [SCI-7053] (#4319)	2022-08-10 11:35:38 +02:00
artoscinote	3a26b62bf5	Activity and checklist fixes [SCI-7079] (#4330)	2022-08-10 10:37:27 +02:00
Alex Kriuchykhin	f67654ffeb	Merge pull request #4332 from okriuchykhin/ok_SCI_6986_v2 ... Fix protocol linked protocol changes tracking [SCI-6986]	2022-08-09 17:03:48 +02:00
Oleksii Kriuchykhin	d1a46b3fc2	Fix protocol linked protocol changes tracking [SCI-6986]	2022-08-09 14:15:49 +02:00
artoscinote	187197488b	Pdf viewer and protocol fixes [SCI-7074] (#4327)	2022-08-09 10:13:43 +02:00
Alex Kriuchykhin	897a8f71ec	Merge pull request #4318 from okriuchykhin/ok_SCI_7058 ... Fix team switching when viewing repository from another team [SCI-7058]	2022-08-08 13:10:31 +02:00
Anton	6db1ec0a34	Fix marvinJS save issue [SCI-7062]	2022-08-08 11:48:58 +02:00
artoscinote	eb619184a5	Implement typed label templates [SCI-7046] (#4316) ... * Implement typed label templates [SCI-7046] * Add structure.sql, fix migration [SCI-7046] * Fix method name [SCI-7046] * Add dependent option to team - label_template relation [SCI-7046] * Migration code style, add input sanitization [SCI-7046] * Fix new label creation [SCI-7046]	2022-08-08 10:06:00 +02:00
Oleksii Kriuchykhin	13c33c3c05	Fix team switching when viewing repository from another team [SCI-7058]	2022-08-05 14:13:36 +02:00
aignatov-bio	e5448f3d1f	Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen ... Add general layout for template view screen [SCI-7030]	2022-08-04 14:13:25 +02:00
Anton	a38aa80fb5	Add main functionality to view/edit screen [SCI-7041]	2022-08-04 13:37:21 +02:00
ajugo	b58e3cd4d8	Add zebra settings screen [SCI-7016] (#4310) ... * Add zebra settings screen [SCI-7016] * Fix hound [SCI-7016]	2022-08-04 11:14:35 +02:00
Anton	31202922af	Add general layout for template [SCI-7030]	2022-08-04 10:51:30 +02:00
Anton	8c080ea04c	Add promo page for label templates [SCI-7029]	2022-08-02 14:51:18 +02:00
Anton	67df01711f	Add edit actions to label templates [SCI-7019]	2022-07-28 14:42:13 +02:00
ajugo	ad4f52d912	Add Label template list screen - view mode [SCI-7018] (#4292) ... * Initial label template datatable [SCI-7018] * Add new columns to LabelTemplate and update datatable view [SCI-7018] * Fix after rebase [SCI-7018] * Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]	2022-07-27 10:10:32 +02:00
Anton	6131b6c0b7	Add new templates section and navigation [SCI-7017]	2022-07-26 13:53:51 +02:00
ajugo	e4c5c66d35	Fix wopi file creation [SCI-7014] (#4276)	2022-07-21 14:19:06 +02:00
artoscinote	28ca1aaec6	Disable checklist item drag for less than 2 items, fix base element controller [SCI-6997] (#4275)	2022-07-21 09:57:14 +02:00
ajugo	a55d6ea9de	Replaced default ruby error pages [SCI-6967] (#4230) ... * Replaced default ruby error pages [SCI-6967] * Remove error 500 in controller [SCI-6967]	2022-07-15 10:43:07 +02:00
Alex Kriuchykhin	7b158133cb	Merge pull request #4252 from okriuchykhin/ok_SCI_6973 ... Fix step elements interactions for technician role [SCI-6973]	2022-07-15 10:12:23 +02:00
artoscinote	c707a3aac6	Fix step update activities [SCI-6980] (#4250)	2022-07-15 10:09:49 +02:00
Oleksii Kriuchykhin	a40b218f97	Fix step elements interactions for technician role [SCI-6973]	2022-07-15 10:09:38 +02:00
artoscinote	c89968453e	Fix checklist issues [SCI-6960] (#4222)	2022-07-12 10:41:58 +02:00
artoscinote	dd27fadd98	Add step reordering and step element reordering service endpoints to API [SCI-6891][SCI-6892] (#4179) ... * Add step reordering service endpoint to API [SCI-6891] * Generalize reorder validation [SCI-6891] * Add endpoint for reordering step elements, fix issues [SCI-6892] * Add appropriate serializers [SCI-6891][SCI-6892] * Add step elements to step serializer [SCI-6891] * Simplify routes, add locking [SCI-6891]	2022-07-12 10:13:47 +02:00
Alex Kriuchykhin	26820b9abb	Fix subject references for repository row activities [SCI-6906] (#4203)	2022-07-07 12:00:35 +02:00
artoscinote	bcb8ed95fc	Fix reorder permission check [SCI-6941] (#4195)	2022-07-06 11:53:45 +02:00
Alex Kriuchykhin	9aeb107635	Fix saving protocol to repository [SCI-6935] (#4190)	2022-07-06 11:45:04 +02:00
aignatov-bio	ef71e59c4d	Merge pull request #4192 from aignatov-bio/ai-sci-6928-add-activities-to-bulk-step-deleteting ... Add activity to bulk step deletion [SCI-6928]	2022-07-05 20:11:44 +02:00
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
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	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
Anton	5296b50c2f	Add delete all steps button [SCI-6921]	2022-06-24 11:21:47 +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	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
Oleksii Kriuchykhin	31ae9ffbda	Fix switching between views on experiment canvas [SCI-6879]	2022-06-09 14:13:29 +02:00
Oleksii Kriuchykhin	07716e56a5	Improve Inventory table loading time [SCI-6886]	2022-06-08 13:23:39 +02:00
Anton	46631a1f46	Finalize protocol repository [SCI-6870]	2022-06-07 12:10: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
ajugo	9d4c97f191	Add task assignment API [SCI-6846] (#4123) ... * Add user assignment to task API [SCI-6846] * Add test for task assignments [SCI-6846]	2022-06-03 10:09:42 +02:00
Martin Artnik	1df4433074	Fix file activity logging in steps controller	2022-06-02 13:44:03 +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
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