diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..d672bf53 --- /dev/null +++ b/.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. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 813e5e1b..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -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 diff --git a/.github/ISSUE_TEMPLATE/question---help.md b/.github/ISSUE_TEMPLATE/question---help.md deleted file mode 100644 index 61878996..00000000 --- a/.github/ISSUE_TEMPLATE/question---help.md +++ /dev/null @@ -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] diff --git a/README.md b/README.md index 83f1d4dd..89185df4 100644 --- a/README.md +++ b/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 diff --git a/client/components/tags.vue b/client/components/tags.vue index 0a667e7b..b8ed976e 100644 --- a/client/components/tags.vue +++ b/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( diff --git a/server/core/db.js b/server/core/db.js index 6ae657a8..f1ac88b3 100644 --- a/server/core/db.js +++ b/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 diff --git a/server/models/pages.js b/server/models/pages.js index c452365e..16f5b2f1 100644 --- a/server/models/pages.js +++ b/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, diff --git a/server/modules/search/elasticsearch/definition.yml b/server/modules/search/elasticsearch/definition.yml index 834f3935..856f651b 100644 --- a/server/modules/search/elasticsearch/definition.yml +++ b/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 diff --git a/server/modules/search/elasticsearch/engine.js b/server/modules/search/elasticsearch/engine.js index 7129c0f6..4a41df88 100644 --- a/server/modules/search/elasticsearch/engine.js +++ b/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) {