Updated issue template and added TinyMCE autolinking

Closes #267

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4f9f4c480bef388437fa0dc95bb472c6d2abc13f..e7e75cc9f432ec77a847f40a2966a87602895bea 100644 (file)
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,11 +1,13 @@
 ### For Feature Requests
 ### For Feature Requests

+

 Desired Feature:
 
 ### For Bug Reports
 Desired Feature:
 
 ### For Bug Reports

-PHP Version:

 
 

-MySQL Version:
+* BookStack Version:
+* PHP Version:
+* MySQL Version:

 
 

-Expected Behavior:
+##### Expected Behavior

 
 

-Actual Behavior:
+##### Actual Behavior

diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index e1c0cfe8f14c04345910be43c6aff3b13a732b9d..0f44b3d09a5aa45e47a787264333f45a2eb1a59e 100644 (file)
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -77,7 +77,7 @@ export default function() {
         extended_valid_elements: 'pre[*]',
         automatic_uploads: false,
         valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
         extended_valid_elements: 'pre[*]',
         automatic_uploads: false,
         valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",

-        plugins: "image table textcolor paste link fullscreen imagetools code customhr autosave lists",
+        plugins: "image table textcolor paste link autolink fullscreen imagetools code customhr autosave lists",

         imagetools_toolbar: 'imageoptions',
         toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
         content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
         imagetools_toolbar: 'imageoptions',
         toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
         content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",