Commit graph

12123 commits

Author SHA1 Message Date
ajugo
95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020)
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
2023-02-24 17:56:51 +01:00
aignatov-bio
ced0da6dbc
Merge pull request #5026 from aignatov-bio/ai-sci-7989-fix-version-number-for-draft
Fix version number for draft [SCI-7989]
2023-02-24 17:52:37 +01:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] (#5018) 2023-02-24 16:17:36 +01:00
Anton
60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
aignatov-bio
aa6e9bf1bf
Merge pull request #5023 from aignatov-bio/ai-sci-8003-update-protocol-name-validation
Fix protocol name validation [SCI-8003]
2023-02-24 10:23:07 +01:00
Anton
dd27b13537 Fix protocol name validation [SCI-8003] 2023-02-24 10:15:23 +01:00
aignatov-bio
8906bc25e7
Fix version counting in protocol datatable [SCI-7993] (#5019) 2023-02-23 15:13:57 +01:00
aignatov-bio
fb63c49be5
Merge pull request #5015 from aignatov-bio/ai-sci-7907-add-save-as-draft-action
Add save as draft action [SCI-7907]
2023-02-22 18:51:19 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
aignatov-bio
5d3e6b7226
Merge pull request #5007 from aignatov-bio/ai-sci-7717-protocol-new-activities
Add new protocol activities [SCI-7717]
2023-02-22 10:48:20 +01:00
Anton
f7d7113239 Add new protocol activities [SCI-7717] 2023-02-22 10:46:24 +01:00
ajugo
0be0aa7629
Implement filters for protocol template datatable [SCI-7605] (#4918)
Implement filters for protocol template datatable [SCI-7605]
2023-02-21 14:57:43 +01:00
aignatov-bio
8f25b9c1cb
Merge pull request #4995 from aignatov-bio/ai-sci-7810-add-create-protocol-modal
Add new protocol modal [SCI-7810][SCI-7895]
2023-02-21 14:17:18 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
aignatov-bio
ae607839c1
Merge pull request #5002 from aignatov-bio/ai-sci-7715-update-protocol-io-front-end
Update protocolsIo front-end [SCI-7715]
2023-02-21 14:06:42 +01:00
ajugo
166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
Anton
c775a92914 Update protocolsIo front-end [SCI-7715] 2023-02-21 11:06:54 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
ajugo
9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969)
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
aignatov-bio
90f9c051d3
Merge pull request #4978 from aignatov-bio/ai-sci-7901-add-export-action-to-protocol-repository
Update export action in protocol repository [SCI-7901]
2023-02-16 17:59:31 +01:00
Anton
a4e622b903 Update export action in protocol repository [SCI-7901] 2023-02-16 11:39:54 +01:00
ajugo
cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870)
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
2023-02-14 13:19:24 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
artoscinote
03631d28aa
Merge pull request #4968 from scinote-eln/ma_SCI_7916
Fix webpack if no addons are present [SCI-7916]
2023-02-14 10:59:31 +01:00
Martin Artnik
8f6d1f7872 Fix webpack if no addons are present [SCI-7916] 2023-02-14 10:43:55 +01:00
artoscinote
5eb7fa8363
Merge pull request #4962 from sboursen-scinote/sb_SCI-7685
Update pdf/docx reports - font size [SCI-7685]
2023-02-14 10:27:34 +01:00
artoscinote
d3a1da6244
Merge pull request #4965 from artoscinote/ma_SCI_7916
Add image TinyMCE plugin [SCI-7916]
2023-02-14 10:26:31 +01:00
artoscinote
ed1de9836b
Merge pull request #4966 from artoscinote/ma_SCI_7918
Fix base64 image extraction for non-saved models [SCI-7918]
2023-02-14 10:01:29 +01:00
Alex Kriuchykhin
b71f360261
Add visibility and default public user role fields to protocols [SCI-7819] (#4963) 2023-02-13 16:18:26 +01:00
aignatov-bio
724fe3ebd4
Merge pull request #4964 from aignatov-bio/ai-sci-7905-public-action-for-protocol
Add publish and delete action [SCI-7905]
2023-02-13 16:10:42 +01:00
Martin Artnik
8d434c7be4 Fix base64 image extraction for non-saved models [SCI-7918] 2023-02-13 16:03:58 +01:00
Martin Artnik
5e63240996 Add image TinyMCE plugin [SCI-7916] 2023-02-13 15:33:56 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
ajugo
dc8b147282
Add handson table metadata to reports [SCI-7835] (#4956)
* Add handson table metadata to reports [SCI-7835]

* Fix step table loading for empty metadata [SCI-7835]
2023-02-13 11:32:18 +01:00
aignatov-bio
65bf9b2511
Merge pull request #4755 from aignatov-bio/ai-sci-7590-update-protocol-screen-draft
Update protocol view screen [SCI-7590][SCI-7617]
2023-02-13 10:58:03 +01:00
Anton
743d901310 Add published view for protocol [SCI-7617] 2023-02-13 10:41:30 +01:00
Anton
3902310463 Update protocol view screen [SCI-7590] 2023-02-13 09:52:30 +01:00
artoscinote
8313572df4
Merge pull request #4953 from sboursen-scinote/sb_SCI-7625
Assign users to task - dropdown not refreshed after removing user  [SCI-7625]
2023-02-09 16:44:47 +01:00
aignatov-bio
e7f6bac0b6
Merge pull request #4954 from aignatov-bio/ai-sci-7898-add-archive-action-for-protocol-repository
Update archive action for protocol templates [SCI-7898]
2023-02-09 14:14:25 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
sboursen-scinote
b0505adc4d Fix hound issues [SCI-7625] 2023-02-09 12:37:35 +01:00
sboursen-scinote
dc333f77d5 Update the Selector when a user is selected/deselected [SCI-7625] 2023-02-09 12:30:51 +01:00
aignatov-bio
23e50cf710
Merge pull request #4882 from aignatov-bio/ai-sci-7608-update-archive-view-for-protoco-templates
Add archive view for protocols template [SCI-7608]
2023-02-09 11:40:47 +01:00
Anton
1a0b28c74e Add archive view for protocols template 2023-02-09 11:38:27 +01:00
aignatov-bio
15d1efa408
Merge pull request #4894 from okriuchykhin/ok_SCI_7718
Add permission for protocol draft management [SCI-7718]
2023-02-09 11:34:22 +01:00
aignatov-bio
82c63d3adc
Merge pull request #4947 from aignatov-bio/ai-sci-7882-add-inherit-permission-label
Add inherit information to access modal [SCI-7882]
2023-02-09 11:33:39 +01:00
sboursen-scinote
4083f0a065 Use YAGNI on the file [SCI-7685] 2023-02-08 11:53:04 +01:00
sboursen-scinote
da1d8231cc Convert font-size unit to pt [SCI-7685] 2023-02-08 11:50:19 +01:00
artoscinote
6e44c8895d
Merge pull request #4948 from artoscinote/ma_SCI_7187
Add targetable class to tinyMCE packs [SCI-7187]
2023-02-07 15:51:55 +01:00
Martin Artnik
eceeb7ceb5 Add targetable class to tinyMCE packs [SCI-7187] 2023-02-07 15:47:44 +01:00