franck
|
61fc13309d
|
Fixed admin/master merge
|
2013-07-06 11:10:02 +02:00 |
|
franck
|
d3a505906b
|
Added missing MAP directory
|
2013-07-06 11:00:33 +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
|
7d3d36231f
|
update composer php verification
|
2013-07-05 16:11:05 +02:00 |
|
Manuel Raynaud
|
85bb7594ee
|
change compatibility for propel2
|
2013-07-05 15:59:41 +02:00 |
|
Manuel Raynaud
|
02c9184e53
|
complete insert sql
|
2013-07-05 14:47:15 +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
|
f003312f82
|
Merge branch 'master' into loops
|
2013-07-05 11:55:23 +02:00 |
|
Etienne Roudeix
|
faf2c1de77
|
product loop
|
2013-07-05 11:54:26 +02:00 |
|
franck
|
962afc6d14
|
Removed shared .htaccess
|
2013-07-05 11:49:44 +02:00 |
|
franck
|
f02ade10f8
|
Added SimplePie to dependencies
|
2013-07-05 11:48:21 +02:00 |
|
Manuel Raynaud
|
9ed14bf7a3
|
change default locale to en_US
|
2013-07-05 11:21:31 +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 |
|
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 |
|