scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 17:36:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
12633 commits 69 branches 179 tags 165 MiB
Commit graph

12633 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sboursen-scinote 0f9dcda99b Update the style of the unlink protocol modal [SCI-7909] 2023-02-14 16:26:06 +01:00
sboursen-scinote 4b264db343 Update the text of the inlink protocol modal [SCI-7909] 2023-02-14 14:59:05 +01:00
aignatov-bio 20339a6723
Merge pull request #4971 from aignatov-bio/ai-sci-7836-fix-infinite-scroll 
Fix infinite scroll [SCI-7836]
 2023-02-14 14:32:49 +01:00
artoscinote 90e2833866
Merge pull request #4972 from artoscinote/ma_SCI_7883 
Enable Lato font in TinyMCE iframe [SCI-7883]
 2023-02-14 14:08:44 +01:00
Martin Artnik ac9c569b39 Enable Lato font in TinyMCE iframe [SCI-7883] 2023-02-14 14:06:47 +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 7f58440b0e Fix infinite scroll [SCI-7836] 2023-02-14 12:29:43 +01:00
ajugo 7e48ce70c9
Add handson table metadata to print protocol [SCI-7914] (#4957) 2023-02-14 11:15:42 +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
Martin Artnik f880ea46ce Add connected device logging [SCI-7632] 2023-02-13 11:32:18 +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
sboursen-scinote 677827d8a3 Center Datatable no item text [SCI-7772] 2023-02-10 17:03:21 +01:00
sboursen-scinote 78f534b5ea Fix the width of the checkbox column in inventory table [SCI-7772] 2023-02-10 14:56:54 +01:00
sboursen-scinote a6eb682234 Fix the spacing for PET tables [SCI-7772] 2023-02-10 14:27:25 +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
sboursen-scinote e8cae5cc86 Fix hound issues [SCI-7904] 2023-02-09 16:17:20 +01:00
sboursen-scinote 1397b2b2e6 Change the style of the header and footer borders [SCI-7904] 2023-02-09 16:09:44 +01:00
sboursen-scinote 622b7f3341 Change the width of modal [SCI-7904] 2023-02-09 15:50:25 +01:00
sboursen-scinote 74773b773c Update the text of the delete all steps modal [SCI-7904] 2023-02-09 15:49:38 +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
sboursen-scinote befb2edfcf Strip trailling carriage and newlines in TinyMCE text [SCI-7237] 2023-02-07 15:44:53 +01:00
sboursen-scinote dbb547b3ee Reduce print margin for step [SCI-7237] 2023-02-07 15:43:44 +01:00
ajugo 5dd9a7adaf
Fixed protocols.io import for multiple-step cases. [SCI-7843] (#4946) 
* Fix attachments for protocols.io importer [SCI-7843]

* Fix protocols io import for multiple step cases [SCI-7843]
 2023-02-07 15:34:04 +01:00
aignatov-bio 054c8c476d
Merge pull request #4945 from aignatov-bio/ai-sci-7894-fix-experiment-sorting 
Fix experiments sidebar sorting [SCI-7894]
 2023-02-07 15:20:48 +01:00
Anton a679e0ea62 Add inherit information to access modal [SCI-7882] 2023-02-07 15:19:20 +01:00
artoscinote 77b4a557f1
Merge pull request #4881 from artoscinote/ma_SCI_7631 
Throw error when authenticating with revoked tokens [SCI-7631]
 2023-02-07 13:39:03 +01:00