From 51dd1863db1dd3e87f04be9d352a8f929bc8a52f Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Tue, 22 Apr 2014 09:20:36 +0200 Subject: [PATCH] update readme --- Readme.md | 20 ++++++++++++++------ composer.json | 2 +- composer.lock | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Readme.md b/Readme.md index 80800bf90..9149884f2 100644 --- a/Readme.md +++ b/Readme.md @@ -5,11 +5,13 @@ Thelia ------ [![Build Status](https://travis-ci.org/thelia/thelia.png?branch=master)](https://travis-ci.org/thelia/thelia) [![License](https://poser.pugx.org/thelia/thelia/license.png)](https://packagist.org/packages/thelia/thelia) [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/thelia/thelia/badges/quality-score.png?s=61e3e04a69bffd71c29b08e5392080317a546716)](https://scrutinizer-ci.com/g/thelia/thelia/) -[Thelia](http://thelia.net/v2) is an open source tool for creating e-business websites and managing online content. This software is published under GPL. +[Thelia](http://thelia.net/) is an open source tool for creating e-business websites and managing online content. This software is published under LGPL. -Here is the most recent developed code for the next major version (v2). You can download this version for testing or having a look on the code (or anything you wish, respecting GPL). See http://thelia.net/v2 web site for more information. +This is the new major version of Thelia. -Most part of the code can possibly change, a large part will be refactor soon, graphical setup does not exist yet. +You can download this version and have a try or take a look at the source code (or anything you wish, respecting LGPL). See http://thelia.net/ web site for more information. + +A repository containing all thelia modules is available at this address : https://github.com/thelia-modules Requirements ------------ @@ -34,7 +36,7 @@ If you use Mac OSX, it still doesn't use php 5.4 as default php version... There * use last MAMP version and put the php bin directory in your path: ```bash -export PATH=/Applications/MAMP/bin/php/php5.4.x/bin/:$PATH +export PATH=/Applications/MAMP/bin/php/php5.5.x/bin/:$PATH ``` * configure a complete development environment : http://php-osx.liip.ch/ @@ -44,7 +46,7 @@ export PATH=/Applications/MAMP/bin/php/php5.4.x/bin/:$PATH ``` bash $ curl -sS https://getcomposer.org/installer | php -$ php composer.phar create-project thelia/thelia path/ 2.0.0-RC1 +$ php composer.phar create-project thelia/thelia path/ 2.0.0 ``` ## Install it @@ -55,7 +57,7 @@ You can install Thelia by two different way Installing thelia with the web install wizard allow to create an administrator, add some informations about your shop, etc -First of all, you have to configure a vhost as describe in [configuration](/en/documentation/configuration.html) section. +First of all, you have to configure a vhost as describe in [configuration](http://doc.thelia.net/en/documentation/configuration.html) section. The install wizard in accessible with your favorite browser : @@ -85,6 +87,12 @@ Thelia documentation is available at http://doc.thelia.net The documentation is also in beta version and some part can be obsolete cause to some refactor. +Roadmap +------- + +The Roadmap is available at http://thelia.net/community/roadmap + + Contribute ---------- diff --git a/composer.json b/composer.json index cd4ab846f..75194a926 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name" : "thelia/thelia", "description" : "Thelia is an ecommerce CMS.", "license" : "LGPL-3.0+", - "homepage" : "http://thelia.net/v2", + "homepage" : "http://thelia.net/", "support" : { "forum" : "http://thelia.net/forum", "wiki" : "http://doc.thelia.net" diff --git a/composer.lock b/composer.lock index b2e0636a4..47290ff45 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "ec2ab661a3ce5fdb2390b9237081e929", + "hash": "5091d03a67414e4ed7aef32a8c737503", "packages": [ { "name": "ensepar/html2pdf",