Merge remote-tracking branch 'upstream/dev' into dev

syncing upstream dev

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Help / Questions
+    url: https://github.com/Requarks/wiki/discussions?discussions_q=category%3A%22Help+%2F+Questions%22
+    about: Please ask and answer questions here.
+  - name: Request a new feature / improvement
+    url: https://requarks.canny.io/wiki
+    about: Submit ideas for new features or improvements.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,13 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-!! IMPORTANT !!
-Do not submit feature requests here. Use our feature request board instead:
-
-https://wiki.js.org/feedback

.github/ISSUE_TEMPLATE/question---help.md

@@ -1,15 +0,0 @@
----
-name: Question / Help
-about: Need help installing, configuring or using Wiki.js?
-title: ''
-labels: help
-
----
-
-**Question**
-Describe in details what you are trying to achieve and where do you need guidance.
-
-**Host Info (please complete the following information):**
-OS: [e.g. Ubuntu 18.04, Docker]
-Wiki.js version: [e.g. 2.0.1]
-Database engine: [e.g. postgres 9.7, mysql 5.7]

README.md

@@ -96,6 +96,7 @@ Support this project by becoming a sponsor. Your name will show up in the Contri
 
 - Akira Suenami ([@a-suenami](https://github.com/a-suenami))
 - Bryon Vandiver ([@asterick](https://github.com/asterick))
+- Cloud Data Hosting LLC ([@CloudDataHostingLLC](https://github.com/CloudDataHostingLLC))
 - CrazyMarvin ([@CrazyMarvin](https://github.com/CrazyMarvin))
 - David Christian Holin ([@SirGibihm](https://github.com/SirGibihm))
 - Dragan Espenschied ([@despens](https://github.com/despens))
@@ -115,6 +116,7 @@ Support this project by becoming a sponsor. Your name will show up in the Contri
 - Robert Lanzke ([@winkelement](https://github.com/winkelement))
 - Sam Martin ([@winkelement](https://github.com/ABitMoreDepth))
 - Sean Coffey ([@seanecoffey](https://github.com/seanecoffey))
+- Victor Bilgin ([@vbilgin](https://github.com/vbilgin))
 - aniketpanjwani ([@aniketpanjwani](https://github.com/aniketpanjwani))
 - aytaa ([@aytaa](https://github.com/aytaa))
 - magicpotato ([@fortheday](https://github.com/fortheday))
@@ -230,6 +232,7 @@ Thank you to all our patrons! 🙏 [[Become a patron](https://www.patreon.com/re
 - Ernie Reid
 - Etienne
 - Flemis Jurgenheimer
+- Florent
 - Günter Pavlas
 - hong
 - Ian

client/components/tags.vue

@@ -243,7 +243,7 @@ export default {
   router,
   created () {
     this.$store.commit('page/SET_MODE', 'tags')
-    this.selection = _.compact(this.$route.path.split('/'))
+    this.selection = _.compact(decodeURI(this.$route.path).split('/'))
   },
   mounted () {
     this.locales = _.concat(

server/core/db.js

@@ -140,6 +140,10 @@ module.exports = {
               await conn.query(`set application_name = 'Wiki.js'`)
               done()
               break
+            case 'mysql':
+              await conn.promise().query(`set autocommit = 1`)
+              done()
+              break
             default:
               done()
               break

server/models/pages.js

@@ -544,6 +544,8 @@ module.exports = class Page extends Model {
     await WIKI.models.pages.rebuildTree()
 
     // -> Rename in Search Index
+    const pageContents = await WIKI.models.pages.query().findById(page.id).select('render')
+    page.safeContent = WIKI.models.pages.cleanHTML(pageContents.render)
     await WIKI.data.searchEngine.renamed({
       ...page,
       destinationPath: opts.destinationPath,

server/modules/search/elasticsearch/definition.yml

@@ -26,16 +26,22 @@ props:
     hint: The index name to use during creation
     default: wiki
     order: 3
+  analyzer:
+    type: String
+    title: Analyzer
+    hint: 'The token analyzer in elasticsearch'
+    default: simple
+    order: 4
   sniffOnStart:
     type: Boolean
     title: Sniff on start
     hint: 'Should Wiki.js attempt to detect the rest of the cluster on first connect? (Default: off)'
     default: false
-    order: 4
+    order: 5
   sniffInterval:
     type: Number
     title: Sniff Interval
     hint: '0 = disabled, Interval in seconds to check for updated list of nodes in cluster. (Default: 0)'
     default: 0
-    order: 5
+    order: 6
 

server/modules/search/elasticsearch/engine.js

@@ -70,7 +70,16 @@ module.exports = {
             body: {
               mappings: (this.config.apiVersion === '6.x') ? {
                 _doc: idxBody
-              } : idxBody
+              } : idxBody,
+              settings: {
+                analysis: {
+                  analyzer: {
+                    default: {
+                      type: this.config.analyzer
+                    }
+                  }
+                }
+              }
             }
           })
         } catch (err) {