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

12079 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
artoscinote 5d276c803c
Merge pull request #4989 from artoscinote/ma_SCI_7934 
Fix MarvinJS image toolbar [SCI-7934]
 2023-02-17 15:53:27 +01:00
Martin Artnik fbf7e69100 Fix MarvinJS image toolbar [SCI-7934] 2023-02-17 15:43:57 +01:00
artoscinote e5139b4bd2
Merge pull request #4986 from artoscinote/ma_SCI_7940 
Improve file extension detection for pasted images [SCI-7940]
 2023-02-17 14:59:34 +01:00
artoscinote ac1bf591e2
Merge pull request #4985 from artoscinote/ma_SCI_7946 
Fix RTE image alignments [SCI-7946]
 2023-02-17 14:59:19 +01:00
artoscinote 6400745b0c
Merge pull request #4984 from artoscinote/ma_SCI_7937 
Fix table of contents, add image download tooltip [SCI-7937]
 2023-02-17 14:59:01 +01:00
Martin Artnik cfdcffc85a Improve file extension detection for pasted images [SCI-7940] 2023-02-17 12:14:08 +01:00
Martin Artnik fdf03b5c46 Fix RTE image alignments [SCI-7964] 2023-02-17 11:29:43 +01:00
Martin Artnik 43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36:47 +01:00
Alex Kriuchykhin ed76fac640
Speed up loading of current tasks widget [SCI-7885] (#4982) 2023-02-16 13:57:17 +01:00
ajugo 46a1c1b7d3
Add jquery to sing_in_halt layout [SCI-7932] (#4979) 2023-02-15 15:59:37 +01:00
aignatov-bio 2f25e7ef7c
Merge pull request #4976 from aignatov-bio/ai-sci-7922-fix-name-editing 
Fix tab button on name edit fields [SCI-7922]
 2023-02-15 13:49:15 +01:00
artoscinote e58f0fc1f2
Merge pull request #4912 from G-Chubinidze/gc_SCI_7195 
Text block on step without title in rearrange modal [SCI-7195]
 2023-02-15 10:43:44 +01:00
Anton 568ab0ff66 Fix tab button on name edit fields [SCI-7922] 2023-02-14 18:24:50 +01:00
Alex Kriuchykhin 7f8f723cbe
Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974) 2023-02-14 16:50:15 +01:00
ajugo aa3ea584a9
Fix visibility of archived by and on column in repository [SCI-7674][7924] (#4973) 2023-02-14 16:27:17 +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
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
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
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
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
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 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 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