franck
|
75573b3652
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-07-12 14:22:58 +02:00 |
|
franck
|
385a83f896
|
Finalized admin security
|
2013-07-12 14:22:08 +02:00 |
|
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 |
|
Manuel Raynaud
|
07b64d7429
|
return $this on setPassword
|
2013-07-08 14:49:00 +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
|
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 |
|
Manuel Raynaud
|
85bb7594ee
|
change compatibility for propel2
|
2013-07-05 15:59:41 +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 |
|
Manuel Raynaud
|
0d1e0c6a2c
|
fiw typo in schema model
|
2013-07-03 15:05:08 +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
|
42c41d4de1
|
add some phpdoc
|
2013-07-03 09:54:17 +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
|
aa2ebdc56c
|
allow to change programmatically customer ref using event dispatcher
|
2013-07-02 17:18:10 +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
|
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
|
c72c13551c
|
add Propel generated files
|
2013-01-16 10:58:36 +01:00 |
|
Manuel Raynaud
|
8279cc37b4
|
remove notnorm gen model
|
2013-01-15 10:39:16 +01:00 |
|
Manuel Raynaud
|
c3c7102f7b
|
move Base model to Base directory
|
2012-12-27 11:37:32 +01:00 |
|
Manuel Raynaud
|
6ba59276e1
|
delete propel auto generated files
|
2012-12-20 17:59:30 +01:00 |
|
Manuel Raynaud
|
481ac07994
|
integrate propel generate model
|
2012-12-17 16:40:47 +01:00 |
|