Skip to content

Commit

Permalink
Merge pull request #49 from roadster31/bump-2.3.4
Browse files Browse the repository at this point in the history 
Bump version 2.3.4
  • Loading branch information
@roadster31
roadster31 authored Sep 5, 2017
2 parents 8a95c54 + 3919d85 commit 2d0fa3a
Show file tree
Hide file tree
Showing 3 changed files with 368 additions and 255 deletions.
17 changes: 9 additions & 8 deletions Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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.
[Thelia](https://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.

Expand All @@ -17,13 +17,14 @@ A repository containing all thelia modules is available at this address : https:
Requirements
------------

* PHP 5.4
* PHP 5.5
* Required extensions :
* PDO_Mysql
* mcrypt
* openssl
* intl
* gd
* curl
* dom
* safe_mode off
* memory_limit at least 128M, preferably 256.
* post\_max\_size 20M
Expand Down Expand Up @@ -81,7 +82,7 @@ You can get the sources from git and then let composer install dependencies, or
``` bash
$ git clone --recursive https://github.com/thelia/thelia path
$ cd path
$ git checkout 2.3.3 (2.2.6 or 2.1.11)
$ git checkout 2.3.4 (2.2.6 or 2.1.11)
$ curl -sS https://getcomposer.org/installer | php
$ php composer.phar install
```
Expand All @@ -90,7 +91,7 @@ $ php composer.phar install

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

## Install it
Expand All @@ -109,10 +110,10 @@ The install wizard in accessible with your favorite browser :
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 :
For example, I have thelia downloaded at https://thelia.net and my vhost is correctly configured, I have to reach this address :

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

### Using cli tools
Expand Down Expand Up @@ -173,7 +174,7 @@ Thelia documentation is available at http://doc.thelia.net
Roadmap
-------

The Roadmap is available at http://thelia.net/community/roadmap
The Roadmap is available at https://thelia.net/community/roadmap


Contribute
Expand Down
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.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"
"thelia/core": "2.3.4",
"thelia/frontoffice-default-template": "2.3.4",
"thelia/backoffice-default-template": "2.3.4",
"thelia/email-default-template": "2.3.4",
"thelia/pdf-default-template": "2.3.4",
"thelia/setup": "2.3.4",
"thelia/config": "2.3.4",
"thelia/smarty-module": "2.3.4",
"thelia/front-module": "2.3.4",
"thelia/virtual-product-control-module": "2.3.4",
"thelia/virtual-product-delivery-module": "2.3.4",
"thelia/tinymce-module": "2.3.4",
"thelia/colissimo-module": "2.3.4",
"thelia/cheque-module": "2.3.4",
"thelia/hook-lang-module": "2.3.4",
"thelia/hook-search-module": "2.3.4",
"thelia/hook-currency-module": "2.3.4",
"thelia/hook-products-new-module": "2.3.4",
"thelia/hook-analytics-module": "2.3.4",
"thelia/hook-links-module": "2.3.4",
"thelia/hook-social-module": "2.3.4",
"thelia/hook-cart-module": "2.3.4",
"thelia/hook-navigation-module": "2.3.4",
"thelia/hook-contact-module": "2.3.4",
"thelia/hook-customer-module": "2.3.4",
"thelia/hook-products-offer-module": "2.3.4",
"thelia/hook-newsletter-module": "2.3.4",
"thelia/carousel-module": "2.3.4",
"thelia/free-order-module": "2.3.4",
"thelia/thelia-migrate-country-module": "2.3.4",
"thelia/hook-admin-home-module": "2.3.4"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
Loading

0 comments on commit 2d0fa3a

Please sign in to comment.