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

319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Manuel Raynaud
0d1e0c6a2c fiw typo in schema model 2013-07-03 15:05:08 +02:00
Manuel Raynaud
89ca995f29 fix typo in phpdoc 2013-07-03 14:45:18 +02:00
Manuel Raynaud
bc6545e914 create class form for customer modification 2013-07-03 14:38:06 +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
Manuel Raynaud
8b8ea994ef allow to reuse creation customer method for modification. Password is 
not mandatory
 2013-07-03 10:33:25 +02:00
Manuel Raynaud
ad8fa59e9a put form in error if saving customer fails 2013-07-03 10:11:40 +02:00
Manuel Raynaud
42c41d4de1 add some phpdoc 2013-07-03 09:54:17 +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
dcb3baaf4c change text name event by using TheliaEvents constant 2013-07-02 17:26:41 +02:00
Manuel Raynaud
09e8cb4a98 change return in customer::preInsert model 2013-07-02 17:23:45 +02:00
Manuel Raynaud
1128c10fa8 fix typo 2013-07-02 17:22:54 +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
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
franck
b20c44b12b Merge branch 'admin' of https://github.com/thelia/thelia into admin 2013-07-02 15:54:24 +02:00
franck
b54fec5243 Added "remember me" field 2013-07-02 15:50:30 +02:00
franck
97f948e647 Added security 2013-07-02 15:49:29 +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
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
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
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
Manuel Raynaud
0dc10d5097 add some phpdoc for form creation explanation 2013-07-01 11:20:40 +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
a14d3da90a ichange CustomerCreation::buildForm visibility 2013-06-28 11:47:28 +02:00