scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
12293 commits 70 branches 179 tags 165 MiB
Commit graph

12293 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
aignatov-bio 193ff7bc46
Merge pull request #4891 from aignatov-bio/ai-sci-7520-implement-version-modals-interactions 
Add manage actions to version modal [SCI-7520]
 2023-02-07 13:38:33 +01:00
Anton 94f8d139a1 Fix experiments sidebar sorting [SCI-7894] 2023-02-07 13:35:00 +01:00
aignatov-bio 6e570dcc9d
Merge pull request #4915 from aignatov-bio/ai-sci-7840-fix-headers-in-tinymce 
Fix heading styles for tinymce [SCI-7840]
 2023-02-07 13:25:02 +01:00
artoscinote ca183f1f76
Merge pull request #4944 from G-Chubinidze/gc_SCI_7883 
fixed tinymce stylings for all elements inside editing mode [SCI-7883]
 2023-02-07 13:11:03 +01:00
artoscinote 1a8cacaeb8
Merge pull request #4942 from artoscinote/ma_SCI_7886 
Disable all TinyMCE context menus [SCI-7886]
 2023-02-07 13:10:12 +01:00
artoscinote 1ef59632ff
Merge pull request #4943 from G-Chubinidze/gc_SCI_7837 
step timestamp changes [SCI-7837]
 2023-02-07 13:04:31 +01:00
Giga Chubinidze 3483c7ba56 fixed tinymce stylings for all elements inside editing mode 2023-02-07 16:00:14 +04:00
Giga Chubinidze 9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04:00
Martin Artnik d0fd0efc1f Disable all TinyMCE context menus [SCI-7886] 2023-02-07 11:40:18 +01:00
ajugo 9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] (#4939) 2023-02-07 10:39:49 +01:00
ajugo c2fcba729a
Add empty space in PDF report after asset link [SCI-7660] (#4940) 2023-02-07 10:39:11 +01:00
artoscinote 5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187 
Support compiling webpacker content from addons [SCI-7187]
 2023-02-07 10:24:18 +01:00
artoscinote b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674 
Inventories: archived by and archived on seen on active item list [SCI-7674]
 2023-02-07 10:23:28 +01:00
artoscinote db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831 
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
 2023-02-06 16:59:08 +01:00
ajugo 29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
sboursen-scinote 1614e3e52b Fix hound [SCI-7831] 2023-02-06 16:42:48 +01:00
sboursen-scinote 2fc5772af3 Catch RecordInvalid errors and remove uneeded error_format function [SCI-7831] 2023-02-06 16:36:52 +01:00
Martin Artnik ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +01:00
aignatov-bio bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata 
Save handson table metadata [SCI-7834]
 2023-02-06 14:24:51 +01:00
ajugo d66dc98300
Update print protocol modal [SCI-7830] (#4932) 2023-02-06 14:23:56 +01:00
Anton 3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
sboursen-scinote 93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote 9023e8d1d4 Standarize the returned json when the request is not succesful [SCI-7831] 2023-02-06 13:31:11 +01:00
sboursen-scinote c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +01:00
artoscinote 2af2479808
Merge pull request #4937 from artoscinote/ma_SCI_6359 
Fix multiple route helper incluions [SCI-6359]
 2023-02-06 13:08:04 +01:00
Martin Artnik 7c6cca0615 Fix multiple route helper incluions [SCI-6359] 2023-02-06 13:03:12 +01:00
artoscinote 3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837 
Step timestamp display [SCI-7837]
 2023-02-06 12:03:02 +01:00