TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
486 Commits 1 Branch 0 Tags
fd15934b65f3431cb15447cd7d1d3a265befe36a
Commit Graph

33 Commits

Author SHA1 Message Date
Manuel Raynaud
fd15934b65 update smarty 2013-07-29 15:47:05 +02:00
Manuel Raynaud
0c1c4b1822 change default locale to en_US 2013-07-10 10:34:13 +02:00
Manuel Raynaud
1a6cde1c65 update composer.lock file 2013-07-09 11:47:24 +02:00
franck
abdff9bc1a Merge branch 'admin' 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
 2013-07-08 11:27:37 +02:00
Manuel Raynaud
6fa6756000 Merge branch 'master' of github.com:thelia/thelia 2013-07-08 09:25:56 +02:00
franck
162084140e Merge remote-tracking branch 'origin/master' into admin 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
 2013-07-06 10:34:09 +02:00
Manuel Raynaud
7d3d36231f update composer php verification 2013-07-05 16:11:05 +02:00
franck
f02ade10f8 Added SimplePie to dependencies 2013-07-05 11:48:21 +02:00
Etienne Roudeix
55a309c00a Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
 2013-07-05 11:16:55 +02:00
Manuel Raynaud
5fda702b8d migrte propel to propel 2 2013-07-04 19:31:09 +02:00
franck
18e49e7ebe Introduction of loop scopes. 2013-07-02 19:18:41 +02:00
Etienne Roudeix
ad47ab7cac set execution right // no more troubles 
change composer required PHP version from 5.4 to 5.3
 2013-06-20 15:21:16 +02:00
franck
89abfaad48 Integration of Assetic in SmartyParser, extended it to Admin (we can now 
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq
 2013-06-19 02:07:43 +02:00
franck
088f5a3402 Intégration de Assetic 2013-06-17 15:29:13 +02:00
franck
156f281162 Merge branch 'franck' into admin 
Conflicts:
	composer.lock
	core/lib/Thelia/Core/Thelia.php
 2013-06-10 16:35:49 +02:00
franck
0b40f1a525 Changement emplacmement templates 2013-06-10 15:36:02 +02:00
franck
f9068878c7 Debut du travail sur le B.O. 2013-06-07 15:31:05 +02:00
Manuel Raynaud
c4d8aef962 update composer dependencies and add filsesystem component 2013-06-03 12:18:16 +02:00
Manuel Raynaud
20d1655c9d rename plugins to modules 2013-05-16 11:13:09 +02:00
Manuel Raynaud
079168c0f2 change php compat to 5.4 2013-05-15 14:51:45 +02:00
Manuel Raynaud
5b4daf0659 create a faker for adding some fixtures 2013-04-30 14:12:52 +02:00
Manuel Raynaud
5c401020f9 integrate symfony-cmf/Routing component using chainRouter 2013-04-18 16:30:31 +02:00
Manuel Raynaud
9666511727 change php version compat 2013-04-10 14:50:45 +02:00
Manuel Raynaud
266e0bd5eb change Tpex integration 2013-04-08 17:06:04 +02:00
Manuel Raynaud
8433c5d555 refactor propel configuration 2013-03-26 17:25:10 +01:00
Manuel Raynaud
f8cbfbd858 update symfony component version 2013-03-25 15:36:47 +01:00
Manuel Raynaud
6f08dbcd28 include Tpex as submodule 2013-02-19 14:19:57 +01:00
Manuel Raynaud
d4bc75bc12 integrate Thelia/Tpex 2013-02-18 21:40:59 +01:00
Manuel Raynaud
4764118f3a update propel in V.1.6.8 2013-02-18 14:39:45 +01:00
Manuel Raynaud
3b08bad735 fix propel version in composer file and exclude some directory in 
phpunit code-coverage parameter
 2013-02-16 09:25:22 +01:00
Manuel Raynaud
b952888b14 start to implement action controller. 2013-02-07 17:40:27 +01:00
Manuel Raynaud
ec35cf998e add class-loader component, needed for HttpKernel component in dev mode 2013-02-05 11:28:36 +01:00
Manuel Raynaud
9309c75e07 remove symfony classLoader component, using composer autoloader with 
dump optimized option
 2013-02-04 14:55:20 +01:00