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

73 Commits

Author SHA1 Message Date
Etienne Roudeix
a02ac99360 set x right to 7 2013-07-09 11:59:37 +02:00
franck
aa6fe04eec Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
 2013-07-09 11:45:01 +02:00
franck
dd05888450 Added Auth loop 2013-07-09 11:42:25 +02:00
Etienne Roudeix
6752531e04 loop arguments 
product loop
 2013-07-09 09:29:40 +02:00
franck
b130abb9c3 Added sample to pagination.html 2013-07-08 14:13:38 +02:00
franck
2b0fdc670b Merge 2013-07-08 13:25:08 +02:00
franck
6890482101 Working on security 2013-07-08 13:22:11 +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
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
7f0dd5c13b product loop 2013-07-05 17:15:22 +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
ca44544f84 manage lang for customer 2013-07-04 18:21:24 +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
92d15d44c7 new types 2013-07-03 10:52:24 +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
Etienne Roudeix
63e9707cc7 parser trouble sample 2013-07-02 16:35:08 +02:00
Etienne Roudeix
40c0da5553 loop product 2013-07-02 16:33:43 +02:00
Manuel Raynaud
363e0ab8ae fiw non saving customer title 2013-07-02 15:00:34 +02:00
Manuel Raynaud
33aba6b3d5 add missing field to customerCreation field 2013-07-02 14:35:18 +02:00
Manuel Raynaud
e15c53625e complete CustomerCreation form 2013-07-02 11:48:34 +02:00
Manuel Raynaud
6f4c2f0376 Merge branch 'form' 2013-07-01 16:57:32 +02:00
Manuel Raynaud
b820afa945 continue to implement form customer 2013-07-01 16:27:43 +02:00
Manuel Raynaud
62a3dc3074 create creation account form 2013-07-01 16:16:24 +02:00
Manuel Raynaud
762b5bc71c name all form field 2013-07-01 11:54:40 +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
995e1eb679 refactor how to create Form 2013-06-28 11:36:35 +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
Manuel Raynaud
200ace2fc0 add 404 rule in admin 2013-06-26 10:45:43 +02:00
Manuel Raynaud
8dd43d6779 add form_error block 2013-06-25 16:54:42 +02:00
Manuel Raynaud
7bc1b4f513 integrate form into admin part 2013-06-25 14:30:35 +02:00
Manuel Raynaud
1fc1482ac4 change label in form test 2013-06-25 11:43:07 +02:00
Manuel Raynaud
3d7262b3ea iallow to display labek and attribute into form_field block 2013-06-25 11:32:53 +02:00
Manuel Raynaud
2fb6ec2a7d add smarty function form_enctype 2013-06-25 10:48:30 +02:00
Manuel Raynaud
fe92cc546a create smarty function for displaying hidden form fields 2013-06-25 10:35:00 +02:00
Manuel Raynaud
d3a304f51e Merge branch 'argument' into form 
Conflicts:
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
 2013-06-24 16:28:47 +02:00
Etienne Roudeix
cf9be4e6bd Use # as tag delimiter 
Merge branch 'admin' into argument
 2013-06-24 16:18:32 +02:00
Manuel Raynaud
e29dafdd08 render form field basic info (name and value) 2013-06-24 16:13:43 +02:00
Etienne Roudeix
cd46f45ee6 test prefilters 2013-06-24 15:08:14 +02:00
Manuel Raynaud
84bc1a8268 generate a FormView 2013-06-24 14:50:06 +02:00