TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,478 Commits 1 Branch 0 Tags
main
Commit Graph

4478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
3473e48a3f change thrown Exception if template not foud by a RuntimeException 2013-06-21 10:42:34 +02:00
Manuel Raynaud
c745dd7dde add some phpdoc in smarty part 2013-06-21 10:39:32 +02:00
Etienne Roudeix
f2beba931b Merge branch 'admin' of github.com:thelia/thelia into admin 2013-06-21 10:38:36 +02:00
Etienne Roudeix
8e787c588c manage empty id 
do not match current criteria if not define
 2013-06-21 10:37:39 +02:00
Manuel Raynaud
299c20c885 Merge branch 'admin' of github.com:thelia/thelia into admin 2013-06-21 10:37:32 +02:00
Manuel Raynaud
eff5529e1b change smarty cache and compile directory 2013-06-21 10:37:08 +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
Manuel Raynaud
686cb0bff1 fix somme phpdoc and remove unused namespace 2013-06-20 14:05:01 +02:00
Manuel Raynaud
e2706515eb refactor baseAdminController 2013-06-20 12:21:58 +02:00
Manuel Raynaud
9d5cf4af33 remove old Tpex references 2013-06-20 11:22:23 +02:00
Manuel Raynaud
1ac5c86afd move Loop Element from Tpex to Template namespace 2013-06-20 10:52:22 +02:00
Manuel Raynaud
617a814f0f Merge branch 'admin' of github.com:thelia/thelia into admin 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-06-19 17:18:00 +02:00
Manuel Raynaud
c5f73f441f remove Tpex in config file 2013-06-19 17:17:01 +02:00
Manuel Raynaud
2d16c1b1e7 remove Tpex 2013-06-19 17:14:50 +02:00
franck
86e612bd59 Merge branch 'admin' of https://github.com/thelia/thelia into admin 2013-06-19 17:14:40 +02:00
franck
b7dc6bd123 forgot adding files 2013-06-19 17:14:07 +02:00
franck
391296d291 Beginning integration of template directives. Config xsd changed. 2013-06-19 17:12:32 +02:00
Manuel Raynaud
a114e559d2 Merge branch 'admin' of github.com:thelia/thelia into admin 
Conflicts:
	core/lib/Thelia/Core/DependencyInjection/Compiler/RegisterSmartyPluginPass.php
	core/lib/Thelia/Core/Template/Assets/AsseticHelper.php
 2013-06-19 16:40:36 +02:00
Manuel Raynaud
6e3fb9aaba add some phpdoc 2013-06-19 16:21:15 +02:00
franck
cff9d3cb96 Added ThekliaLoop smarty plugin, and reorganized code a bit 2013-06-19 16:03:28 +02:00
Manuel Raynaud
e816595535 fix typo 2013-06-19 12:19:26 +02:00
Manuel Raynaud
5c0f6779aa remove unused code 2013-06-19 12:15:07 +02:00
franck
3f1b2d6b92 Added registerPlugin in RegisterSmartyPluginPass 2013-06-19 12:00:54 +02:00
franck
9e95f034ec Removed AdminSmartyParser, to use directly SmartyParser 2013-06-19 11:52:55 +02:00
franck
f32daae118 Merge, suite 2013-06-19 11:21:40 +02:00
franck
2eca5464b7 Merge branch 'smarty' into admin 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/EventListener/ViewListener.php
	core/lib/Thelia/Core/Template/SmartyParser.php
	templates/smarty-sample/index.html
 2013-06-19 11:20:41 +02:00
franck
8244efdb1d Cleanup 2013-06-19 10:33:29 +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
Manuel Raynaud
dfafe36730 poc integrate smarty in DI 2013-06-18 23:32:47 +02:00
franck
7351edeb46 Test du sparty parser 2013-06-18 15:36:22 +02:00
franck
0719c8b740 Merge branch 'admin' of https://github.com/thelia/thelia into admin 
Conflicts:
	core/lib/Thelia/Admin/Templating/Template.class.php
 2013-06-18 15:35:36 +02:00
franck
797f0e2e38 Testing smarty parser 2013-06-18 15:31:32 +02:00
Manuel Raynaud
fa69e6e7f0 change rule in .htaccess and fix link for asset 2013-06-18 12:24:45 +02:00
Manuel Raynaud
0502879c0d ignore web/assets directory 2013-06-18 12:08:38 +02:00
Manuel Raynaud
234d74b9eb modify .htaccess 2013-06-18 12:02:20 +02:00
franck
8daea97d3f Integration de Assetic 2013-06-17 15:36:35 +02:00
franck
9d8c07775b Integration de assetic 2013-06-17 15:36:05 +02:00
franck
088f5a3402 Intégration de Assetic 2013-06-17 15:29:13 +02:00
Manuel Raynaud
36618668fc fix typo 2013-06-10 18:10:21 +02:00
franck
3bc7399fe8 added admin template 2013-06-10 17:03:02 +02:00
franck
a86122e90d fix admin template location 2013-06-10 17:01:04 +02:00
franck
cc0073c7ae typo 2013-06-10 16:46:57 +02:00
franck
88199c2240 Merge branch 'admin' of https://github.com/thelia/thelia into admin 
Conflicts:
	.gitignore
 2013-06-10 16:43:53 +02:00
franck
a84205f5ce track admin ârt 2013-06-10 16:42:08 +02:00
Manuel Raynaud
dda7fd02ae remove composer.lock from index 2013-06-10 16:37: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
5564de29ab complete phpdoc for install command 2013-06-06 17:04:19 +02:00
Manuel Raynaud
63a0f73dd5 track sample config file 2013-06-06 12:04:31 +02:00