Merge branch 'master' of https://github.com/abecms/abecms

README.md

@@ -1,3 +1,6 @@
+> **The version 3 is here ! See the [release notes](./version3.md)**
+_______________
+
 [![Develop Branch Build Status](https://travis-ci.org/abecms/abecms.svg)](https://travis-ci.org/abecms/abecms)
 [![Build status](https://ci.appveyor.com/api/projects/status/o22xl2y3tc2javh2/branch/master?svg=true)](https://ci.appveyor.com/project/gregorybesson/abecms-d118d/branch/master)
 [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/abecms/abecms/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/abecms/abecms/)
@@ -10,7 +13,8 @@
 [![Twitter Follow](https://img.shields.io/twitter/follow/abe_cms.svg?style=social)](https://twitter.com/abe_cms)
 
 # AbeCMS
-> AbeCMS is your __static websites generator__ with revolutionnary __self-descriptive__ templates
+
+> AbeCMS is your __static websites generator__ with revolutionary __self-descriptive__ templates
 
 When creating blogs becomes as easy as 1-2-3. A static site generator with a great back-office for users.
 

ROADMAP.md

@@ -1,30 +1,26 @@
 We have a 1 year roadmap (estimation) with the following versions. You'll notice that as we're developing in agile mode, we've chosen to create and present groups of features but no date of delivery (feature-driven release planning : http://www.scrum-institute.org/Release_Planning.php). This roadmap doesn't take into account the bugs which could be opened during this timeframe. Depending on the severity of these bugs, we'll be able to fix shortly after their discovery and include those fixes in specific Hotfix versions or include these bugs in the roadmap.
 
-The 2.x releases will focus on quality and stability and will be covered by Unit tests + functional tests.
-The separation between the engine, the API server and the front will be reinforced by putting each part in its own repository
-The documentation will be rewritten and included in the modules
-As a major new feature, it will be possible to create a template from partials.
+The 2.x releases have been focused on quality and stability and covered by Unit tests + functional tests.
 
-## Roadmap of the next 2.x releases
-- A homepage will arrive (at last !) on the frontend
+The 3.x releases will focus on the REST layer of AbeCMS.
+
+## Roadmap of the next 3.x releases
 - It will be possible to create filtered views on the manager frontend
-- Refactoring the editor has to be done
-- Precompiling of templates has to be fully tested
 - since Abe has become stateful, clustering has been removed. Implement a solution to permit clusters of Abe
 - Add template creation from partials
-- Structure will be editable from abe, as references
 - templates and partials will be uploadable
 - Video training will be produced
-
-## Roadmap of the 3.x releases
-- Separate the engine, the REST server and the client
-- rewrite the client in react
-- create an Electron version
-- More to come !
+- Create an Electron version
+- Refactor the REST layer
 
 ## Changelog
 See the complete [changelog](./CHANGELOG.md)
 
+### 3.0.0
+See the complete [v3.0.0 release notes](./version3.md)
+
+### 2.16.*
+
 ### 2.15.*
 - The order by statement in abe type="data" is now fully usable on any property of the json post. usage of order by date ASC is deprecated. Please use order by abe_meta.date ASC instead. And you can now limit a set of record without having to use the 'where' statement
 - abe type="import" are not usable in a {{#each}} statement for technical reasons. But you can reproduce this behavior by using the array notation in an import. ie. {{abe type="import" file="myPartial/{{list[].id}}"}} This is particularly useful when you propose a contributor to select several partials in a list (with the {{#each}} notation + type="data). You can then display these selected partials with this iarray style notation.

version3.md

@@ -21,7 +21,7 @@ Enjoy! (and come contribute)
 # Contributors
 Thank you to all contributors to this version:
 - @opompilius for the design and the long hours of brainstorming early in the morning and during the week-ends
-- @wonknu who's contributing on this projects with many PR's inspired by the projects he's working on @adfabconnect
+- @wonknu who's contributing on this project with many PR's inspired by the projects he's working on @adfabconnect
 - @gonzalezemmanuel, the man who created 1 great deployers plugin to deploy Abe sites with SFTP! and with whom I spend hours discussing devops
 - @AlexandreBeaurain for his first PR (and hopefully not the last ;)
 - @nicolaslabbe who - with @wonknu - is a key contributor to this project (even if there is nothing yet from him in this version 3!)