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

193 Commits

Author SHA1 Message Date
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
franck
8f894382f6 Fixed loop arguments 2013-07-08 11:03:54 +02:00
franck
7646c05cd4 Loop arguments should now be accessed using $this->getArgValue($argname), 
or getArg($name)->value. Loop args initialisation is now located in
BaseLoop class
 2013-07-08 10:57:05 +02:00
Manuel Raynaud
0e7ea83fac add helper getLang in session 2013-07-08 10:21:58 +02:00
Manuel Raynaud
7b89469d06 add missing files 2013-07-08 10:20:57 +02:00
Manuel Raynaud
a2e40872c0 extends symfony session for adding some helpers 2013-07-08 10:10:05 +02:00
franck
61fc13309d Fixed admin/master merge 2013-07-06 11:10:02 +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
franck
6e5b259d44 Added Feed loop to retreive feeds using SimplePie 2013-07-06 10:18:19 +02:00
Etienne Roudeix
ddc6d02f80 Merge branch 'loops' 2013-07-05 17:16:10 +02:00
Etienne Roudeix
7f0dd5c13b product loop 2013-07-05 17:15:22 +02:00
Manuel Raynaud
a2012259bf change getting propel connection 2013-07-05 12:57:04 +02:00
Manuel Raynaud
e0416c08f8 fix broken test 2013-07-05 12:13:28 +02:00
Etienne Roudeix
c27c62f3f3 use propel 2 2013-07-05 12:04:13 +02:00
Etienne Roudeix
faf2c1de77 product loop 2013-07-05 11:54:26 +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
Etienne Roudeix
a7a9688d41 product lopp 2013-07-05 11:12:51 +02:00
Manuel Raynaud
5fbb923e40 end propel 2 migration 2013-07-05 09:43:49 +02:00
Manuel Raynaud
715e7ac294 Merge branch 'customer' 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html
 2013-07-04 19:46:08 +02:00
Manuel Raynaud
5fda702b8d migrte propel to propel 2 2013-07-04 19:31:09 +02:00
Manuel Raynaud
abe6064955 allow to display result or not if translation is present 2013-07-04 18:47:20 +02:00
Manuel Raynaud
ca44544f84 manage lang for customer 2013-07-04 18:21:24 +02:00
Manuel Raynaud
b7a8648c10 start lang management 2013-07-04 18:10:08 +02:00
Etienne Roudeix
3073f9a43c fix thelia diese problems 2013-07-03 16:07:18 +02:00
Etienne Roudeix
b5d9f69212 thelia loop 2013-07-03 15:07:49 +02:00
Etienne Roudeix
b4a2862131 product loop 2013-07-03 13:20:55 +02:00
Etienne Roudeix
40f8c42fae Merge branch 'admin' into loops 2013-07-03 10:53:00 +02:00
Etienne Roudeix
92d15d44c7 new types 2013-07-03 10:52:24 +02:00
franck
34ffdd12f5 Moved Security package to the proper location 2013-07-03 10:48:00 +02:00
Etienne Roudeix
32f1fb3441 Merge branch 'admin' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	templates/smarty-sample/category.html
 2013-07-03 09:52:06 +02:00
franck
18e49e7ebe Introduction of loop scopes. 2013-07-02 19:18:41 +02:00
Manuel Raynaud
34d7629c1d add untrack file for before commit 2013-07-02 17:19:13 +02:00
Manuel Raynaud
aa2ebdc56c allow to change programmatically customer ref using event dispatcher 2013-07-02 17:18:10 +02:00
Etienne Roudeix
40c0da5553 loop product 2013-07-02 16:33:43 +02:00
franck
b20c44b12b Merge branch 'admin' of https://github.com/thelia/thelia into admin 2013-07-02 15:54:24 +02:00
Etienne Roudeix
23aaa4951b product loop (not functional yet) 2013-07-01 17:03:48 +02:00
Etienne Roudeix
7382159685 create type formatter 
create product loop (not functional yet)
 2013-07-01 17:02:15 +02:00
Manuel Raynaud
6f4c2f0376 Merge branch 'form' 2013-07-01 16:57:32 +02:00
franck
c10086f6c9 Introduction du package Thelia Security 2013-07-01 16:50:19 +02:00
Manuel Raynaud
6e29294418 update create customer form 2013-07-01 15:39:58 +02:00
Manuel Raynaud
762b5bc71c name all form field 2013-07-01 11:54:40 +02:00
Manuel Raynaud
26be670f57 reset form session after binding errors 2013-07-01 11:22:05 +02:00
Etienne Roudeix
8ba9a4beef phpdoc update 2013-07-01 11:19:32 +02:00
Manuel Raynaud
3b5b29c6e0 retrieve form error in front office 2013-07-01 11:10:52 +02:00
Etienne Roudeix
edc731d139 Merge branch 'argument', remote-tracking branch 'origin' 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Core/Template/TestLoop/Equal.php
 2013-06-28 14:38:23 +02:00
Manuel Raynaud
32da874ba1 Merge branch 'form' into admin 2013-06-28 11:51:38 +02:00
Manuel Raynaud
995e1eb679 refactor how to create Form 2013-06-28 11:36:35 +02:00
Etienne Roudeix
fc4a0734db no more test loops 2013-06-27 16:08:36 +02:00
Etienne Roudeix
3fb5466ef3 pagination 2013-06-27 13:18:29 +02:00
Etienne Roudeix
3aca4bfb25 pagination 2013-06-26 16:09:46 +02:00