Skip to content

Commit

Permalink
Merge pull request #47 from bibich/2.3.3
Browse files Browse the repository at this point in the history 
Bump version 2.3.3
  • Loading branch information
@bibich
bibich authored Aug 31, 2016
2 parents a968a2a + 2dcde51 commit 8a95c54
Show file tree
Hide file tree
Showing 3 changed files with 262 additions and 193 deletions.
109 changes: 88 additions & 21 deletions Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ Readme

Thelia
------

[![Build Status](https://travis-ci.org/thelia/thelia.png?branch=2.3)](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/) is an open source tool for creating e-business websites and managing online content. This software is published under LGPL.

This is the new major version of Thelia.

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
Expand All @@ -27,23 +26,12 @@ Requirements
* curl
* safe_mode off
* memory_limit at least 128M, preferably 256.
* post_max_size 20M
* upload_max_filesize 2M
* post\_max\_size 20M
* upload\_max\_filesize 2M
* date.timezone must be defined
* Web Server Apache 2 or Nginx
* MySQL 5

If you use Mac OSX, it still doesn't use php 5.4 as default php version... There are many solutions for you :

* use [phpbrew](https://github.com/c9s/phpbrew)
* use last MAMP version and put the php bin directory in your path:

```bash
export PATH=/Applications/MAMP/bin/php/php5.5.x/bin/:$PATH
```

* configure a complete development environment : http://php-osx.liip.ch/
* use a virtual machine with vagrant and puppet : https://puphpet.com/

### MySQL 5.6

Expand Down Expand Up @@ -75,6 +63,7 @@ Thelia's archive builder's needs external libraries.
For zip archives, you need PECL zip. See [PHP Doc](http://php.net/manual/en/zip.installation.php)

For tar archives, you need PECL phar. Moreover, you need to deactivate php.ini option "phar.readonly":

```ini
phar.readonly = Off
```
Expand All @@ -83,16 +72,48 @@ For tar.bz2 archives, you need tar's dependencies and the extension "bzip2". See

For tar.gz archives, you need tar's dependencies and the extension "zlib". See [PHP Doc](http://fr2.php.net/manual/fr/book.zlib.php)

## Create a Thelia project
## Download Thelia 2 and install its dependencies

You can get the sources from git and then let composer install dependencies, or use composer to install the whole thelia project into a specific directory

### Using git for download and composer for dependencies

``` bash
$ git clone --recursive https://github.com/thelia/thelia path
$ cd path
$ git checkout 2.3.3 (2.2.6 or 2.1.11)
$ curl -sS https://getcomposer.org/installer | php
$ php composer.phar install
```

### Using composer for both download and dependencies

``` bash
$ curl -sS https://getcomposer.org/installer | php
$ php composer.phar create-project thelia/thelia-project path/ 2.3.2 (or 2.2.4)
$ php composer.phar create-project thelia/thelia path/ 2.3.3 (2.2.6 or 2.1.11)
```

## Install it

You can install Thelia using the cli tool and the scripts provided by thelia/setup
You can install Thelia by two different way

### Using install wizard

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](http://doc.thelia.net/en/documentation/configuration.html) section.

The install wizard in accessible with your favorite browser :

``` bash
http://yourdomain.tld/[/subdomain_if_needed]/install
```

For example, I have thelia downloaded at http://thelia.net and my vhost is correctly configured, I have to reach this address :

``` bash
http://thelia.net/install
```

### Using cli tools

Expand All @@ -102,13 +123,52 @@ $ php Thelia thelia:install

You just have to follow all instructions.

### Docker and docker compose

This repo contains all the configuration needed to run Thelia with docker and docker-compose.

It requires obviously [docker](https://docker.com/) and [docker-compose](http://docs.docker.com/compose/)

How to start the configuration :

```
docker-compose up -d
```

tip : create an alias for docker-compose, it's boring to write it all the time

All the script are launched through docker. For examples :

```
docker exec -it thelia_web_1 php Thelia cache:clear
docker exec -it thelia_web_1 php setup/faker.php
docker exec -it thelia_web_1 unit-tests.sh
docker exec -it thelia_web_1 php composer.phar install
```

Database information :

* host : mariaDB
* login : root
* password : toor

Once started, you can access it with your browser at this url : http://127.0.0.1:8080 and phpmyadmin : http://127.0.0.1:8081

What is missing :

* confguration for export compression (zip, gzip, etc)

Obviously you can modify all the configuration for your own case, for example the php version or add environment variable for the database configuration. Each time you modify the configuration, you have to rebuild it :

```
docker-compose build --no-cache
```

Documentation
-------------

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
-------
Expand All @@ -121,12 +181,19 @@ Contribute

see the documentation : http://doc.thelia.net/en/documentation/contribute.html

If you submit modifications that adds new data or change the structure of the database, take a look to http://doc.thelia.net/en/documentation/contribute.html#sql-scripts-modification

Usage
-----

Consult the page : http://localhost/thelia/web/index_dev.php

You can create a virtual host and choose web folder for root directory.

We still have lot of work to achieve but enjoy this part.
To run tests (phpunit required) :

``` bash
$ phpunit
```

We still have lot of work to achieve but enjoy this part.
62 changes: 31 additions & 31 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@
}
],
"require": {
"thelia/core": "2.3.2",
"thelia/frontoffice-default-template": "2.3.2",
"thelia/backoffice-default-template": "2.3.2",
"thelia/email-default-template": "2.3.2",
"thelia/pdf-default-template": "2.3.2",
"thelia/setup": "2.3.2",
"thelia/config": "2.3.2",
"thelia/smarty-module": "2.3.2",
"thelia/front-module": "2.3.2",
"thelia/virtual-product-control-module": "2.3.2",
"thelia/virtual-product-delivery-module": "2.3.2",
"thelia/tinymce-module": "2.3.2",
"thelia/colissimo-module": "2.3.2",
"thelia/cheque-module": "2.3.2",
"thelia/hook-lang-module": "2.3.2",
"thelia/hook-search-module": "2.3.2",
"thelia/hook-currency-module": "2.3.2",
"thelia/hook-products-new-module": "2.3.2",
"thelia/hook-analytics-module": "2.3.2",
"thelia/hook-links-module": "2.3.2",
"thelia/hook-social-module": "2.3.2",
"thelia/hook-cart-module": "2.3.2",
"thelia/hook-navigation-module": "2.3.2",
"thelia/hook-contact-module": "2.3.2",
"thelia/hook-customer-module": "2.3.2",
"thelia/hook-products-offer-module": "2.3.2",
"thelia/hook-newsletter-module": "2.3.2",
"thelia/carousel-module": "2.3.2",
"thelia/free-order-module": "2.3.2",
"thelia/thelia-migrate-country-module": "2.3.2",
"thelia/hook-admin-home-module": "2.3.2"
"thelia/core": "2.3.3",
"thelia/frontoffice-default-template": "2.3.3",
"thelia/backoffice-default-template": "2.3.3",
"thelia/email-default-template": "2.3.3",
"thelia/pdf-default-template": "2.3.3",
"thelia/setup": "2.3.3",
"thelia/config": "2.3.3",
"thelia/smarty-module": "2.3.3",
"thelia/front-module": "2.3.3",
"thelia/virtual-product-control-module": "2.3.3",
"thelia/virtual-product-delivery-module": "2.3.3",
"thelia/tinymce-module": "2.3.3",
"thelia/colissimo-module": "2.3.3",
"thelia/cheque-module": "2.3.3",
"thelia/hook-lang-module": "2.3.3",
"thelia/hook-search-module": "2.3.3",
"thelia/hook-currency-module": "2.3.3",
"thelia/hook-products-new-module": "2.3.3",
"thelia/hook-analytics-module": "2.3.3",
"thelia/hook-links-module": "2.3.3",
"thelia/hook-social-module": "2.3.3",
"thelia/hook-cart-module": "2.3.3",
"thelia/hook-navigation-module": "2.3.3",
"thelia/hook-contact-module": "2.3.3",
"thelia/hook-customer-module": "2.3.3",
"thelia/hook-products-offer-module": "2.3.3",
"thelia/hook-newsletter-module": "2.3.3",
"thelia/carousel-module": "2.3.3",
"thelia/free-order-module": "2.3.3",
"thelia/thelia-migrate-country-module": "2.3.3",
"thelia/hook-admin-home-module": "2.3.3"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
Loading

0 comments on commit 8a95c54

Please sign in to comment.