Etienne Roudeix
|
ab37da6eee
|
product loop
|
2013-07-08 14:15:18 +02:00 |
|
franck
|
a3f7f53d22
|
Fixed merge problem
|
2013-07-08 13:32:35 +02:00 |
|
franck
|
49605c88cc
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-07-08 13:26:13 +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
|
5bec576b9b
|
Integration of security
|
2013-07-08 13:20:44 +02:00 |
|
franck
|
58796033fa
|
Integration of auth system
|
2013-07-08 13:19:36 +02:00 |
|
franck
|
d68c50df95
|
Typo
|
2013-07-08 13:18:58 +02:00 |
|
Etienne Roudeix
|
267e468a3f
|
Merge branch 'loops'
Conflicts:
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
|
2013-07-08 12:02:58 +02:00 |
|
Etienne Roudeix
|
4bd971e625
|
pagination sample
|
2013-07-08 11:52:10 +02:00 |
|
Manuel Raynaud
|
c4014ed62e
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-07-08 11:43:57 +02:00 |
|
Manuel Raynaud
|
a06771bea6
|
extends Symfony Request
|
2013-07-08 11:43:23 +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
|
8f894382f6
|
Fixed loop arguments
|
2013-07-08 11:03:54 +02:00 |
|
Manuel Raynaud
|
5da11c253e
|
fix propel namespaces
|
2013-07-08 10:57:49 +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
|
0b9d7d1d35
|
allow possibility to change PropelPDO class connection
|
2013-07-08 10:44:57 +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 |
|
Manuel Raynaud
|
6fa6756000
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-07-08 09:25:56 +02:00 |
|
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 |
|