bookstack/website
Fork 4
Code Issues 5 Pull requests Activity

Merge branch 'master' of github.com:BookStackApp/website

Browse source
This commit is contained in:
Dan Brown 2017-11-11 19:02:28 +00:00
commit 7b8c7084ab
Signed by: danb
GPG key ID: 46D9F943C24A2EF9
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
content/blog/beta-bugfix-release-v0-17-4.md
View file

@ -20,7 +20,7 @@ Here are some details on the changes made over the last month:
As part of v0.17 a database change was included to add support for Emoji.
To achieve this the encoding used in the database was changed upon upgrade.
This upgrade caused issues for many users so has therefore now been removed. This can instead
be done manually by [following the documentation here](/admin/ut8mb4-support/).
be done manually by [following the documentation here](/docs/admin/ut8mb4-support/).
### Editor Shortcut Updates

8
content/docs/admin/social-auth.md
View file

@ -111,11 +111,9 @@ To create a Twitter application for signing in with you may require a phone numb
9. Copy these details and add them as new variables in your `.env` file like so:
```bash
# Replace the below (including '{}' braces) with your azure APP_ID and APP_SECRET and TENANT
SLACK_APP_ID={CLIENT_ID}
SLACK_APP_SECRET={CLIENT_SECRET}
AZURE_APP_ID={APP_ID}
AZURE_APP_SECRET={APP_SECRET}
AZURE_TENANT={TENANT}
AZURE_APP_ID={APP_ID}
AZURE_APP_SECRET={APP_SECRET}
AZURE_TENANT={TENANT}
# APP_URL Needs to be set to your BookStack base url
APP_URL=http://mybookstackurl.com