gmorel 9d02aa75a8 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
  Working : upload file/image : fix sanitizeFileName
  Working : images : enhance display
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  ...

Conflicts:
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
	templates/admin/default/assets/js/coupon.js
	tests/functionnal/casperjs/exe/00_parameters.js
	tests/functionnal/casperjs/exe/31_coupons_rule.js
2013-09-27 10:37:09 +02:00
2013-09-17 16:02:44 +02:00
2013-09-04 08:30:24 +02:00
2013-09-18 15:58:58 +02:00
2013-09-11 15:35:25 +02:00

Readme

Thelia

Build Status

Thelia is an open source tool for creating e-business websites and managing online content. This software is published under GPL.

Here is the current developping next major version. You can download this version for testing or see the code. 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).

Most part of the code can possibly change, a large part will be refactor soon, graphical setup does not exist yet.

Requirements

  • php 5.4
  • apache 2
  • 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 linux (the best one)
  • use last MAMP version and put the php bin directory in your path :
export PATH=/Applications/MAMP/bin/php/php5.4.x/bin/:$PATH

Installation

$ git clone https://github.com/thelia/thelia.git
$ cd thelia
$ curl -sS https://getcomposer.org/installer | php
$ php composer.phar install --prefer-dist --optimize-autoloader

Finish the installation using cli tools :

$ php Thelia thelia:install

You just have to follow all instructions.

Usage

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

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

To run tests (phpunit required) :

$ phpunit

We still have lot of work to achieve but enjoy this part.

Description
No description provided
Readme 164 MiB
Languages
PHP 81.3%
HTML 6.6%
JavaScript 4.9%
Less 2.9%
CSS 2.6%
Other 1.7%