From 4079fe1fd7ffc20dd04c02c77c4c1bbf5ffedb9c Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Thu, 20 Apr 2017 20:34:13 -0400 Subject: [PATCH 1/3] Update README.md --- README.md | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c932f7c3..52c2c034 100644 --- a/README.md +++ b/README.md @@ -23,15 +23,17 @@ - [Requirements](#requirements) - [Change Log](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) - [Project Planning](https://waffle.io/Requarks/wiki) +- [Milestones](#milestones) +- [Chat with us](#gitter) - [Special Thanks](#special-thanks) -### Documentation +## Documentation - [Installation Guide](https://wiki.requarks.io/get-started.html) - [Admin Guide](https://docs.requarks.io/wiki/#admin-guide) - [User Guide](https://docs.requarks.io/wiki/#user-guide) -### Requirements +## Requirements Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linux, etc.). @@ -42,16 +44,35 @@ Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linu Read the full [prerequisites](https://docs.wiki.requarks.io/prerequisites) article for full details. -### Gitter +## Milestones + +Current and upcoming milestones *(features only, see the [changelog](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) for list of bug fixes)*: + +### Beta 11 + +- [x] Azure AD authentication +- [x] MathML / Tex math equations +- [x] Support for CJK (Chinese, Japanese & Korean) characters in content, meta and uploads +- [ ] All Pages section +- [ ] Heroku support + +### Beta 12 + +- [ ] Insert Link modal in Editor +- [ ] Better localization in the UI +- [ ] Better simultaneous user editing handling +- [ ] Preview changes directly from the editor, without saving + +## Gitter Want to discuss features, ideas or issues? Join our [gitter channel](https://gitter.im/Requarks/wiki). We are very active and friendly! -### Twitter +## Twitter Follow our Twitter feed to learn about upcoming updates and new releases! [![Twitter Follow](https://img.shields.io/badge/follow-%40requarks-blue.svg?style=flat-square)](https://twitter.com/requarks) -### Special Thanks +## Special Thanks ![Browserstack](https://wiki.requarks.io/assets/images/logo_browserstack.png) [Browserstack](https://www.browserstack.com/) for providing access to their great cross-browser testing tools. From c572a69a505e5cf2907e376622ee7609ab241f16 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Thu, 20 Apr 2017 20:34:54 -0400 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52c2c034..4a995abe 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linu - Git **2.7.4** or later - An empty Git repository (optional) -Read the full [prerequisites](https://docs.wiki.requarks.io/prerequisites) article for full details. +> Read the full [prerequisites](https://docs.wiki.requarks.io/prerequisites) article for full details. ## Milestones From 9ba21f2de81ea70d6a68171e2d504776daf30c16 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Thu, 20 Apr 2017 20:36:34 -0400 Subject: [PATCH 3/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4a995abe..9852c451 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ Current and upcoming milestones *(features only, see the [changelog](https://git - [ ] Better localization in the UI - [ ] Better simultaneous user editing handling - [ ] Preview changes directly from the editor, without saving +- [ ] Upgrade from web UI ## Gitter