Manuel Raynaud
|
b45ebd88c5
|
complete readme
|
2013-07-09 14:21:48 +02:00 |
|
Manuel Raynaud
|
2eddaa32f5
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-07-09 12:03:03 +02:00 |
|
Manuel Raynaud
|
5d8977be9d
|
change hour format
|
2013-07-09 12:02:42 +02:00 |
|
Etienne Roudeix
|
a02ac99360
|
set x right to 7
|
2013-07-09 11:59:37 +02:00 |
|
franck
|
257de6fba4
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-07-09 11:52:00 +02:00 |
|
franck
|
33f8bc67a6
|
removed obsolete security tests
|
2013-07-09 11:51:14 +02:00 |
|
Manuel Raynaud
|
3eb644feb0
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-07-09 11:49:19 +02:00 |
|
Manuel Raynaud
|
40160948d3
|
update travis file
|
2013-07-09 11:48:59 +02:00 |
|
Manuel Raynaud
|
1a6cde1c65
|
update composer.lock file
|
2013-07-09 11:47:24 +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
|
89a8ef80fe
|
remove break line from regex
|
2013-07-09 11:41:59 +02:00 |
|
Manuel Raynaud
|
7b0f2aa8eb
|
test regex for logger
|
2013-07-09 11:38:32 +02:00 |
|
Manuel Raynaud
|
7276ca47f5
|
test new regex for log test
|
2013-07-09 11:29:18 +02:00 |
|
Manuel Raynaud
|
ed74ca53dd
|
fix datetime regex
|
2013-07-09 11:23:45 +02:00 |
|
Manuel Raynaud
|
9db64bbe78
|
complete install command and fix travis file
|
2013-07-09 10:52:37 +02:00 |
|
Manuel Raynaud
|
66d2451def
|
add travis file
|
2013-07-09 10:24:10 +02:00 |
|
Manuel Raynaud
|
25a8b28c61
|
track composer.lock file
|
2013-07-09 10:19:35 +02:00 |
|
Manuel Raynaud
|
58bcc10a75
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-07-09 09:52:38 +02:00 |
|
Manuel Raynaud
|
3f1547a1f3
|
remove unused "use" namespaces
|
2013-07-09 09:52:13 +02:00 |
|
Etienne Roudeix
|
fa66f3423f
|
Merge branch 'master' of github.com:thelia/thelia
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/Product.php
|
2013-07-09 09:38:37 +02:00 |
|
Etienne Roudeix
|
6752531e04
|
loop arguments
product loop
|
2013-07-09 09:29:40 +02:00 |
|
franck
|
7cea85b43e
|
Added magic method __call to access loop arguments using getArgname()
|
2013-07-08 20:04:53 +02:00 |
|
Manuel Raynaud
|
07b64d7429
|
return $this on setPassword
|
2013-07-08 14:49:00 +02:00 |
|
Etienne Roudeix
|
aa50413b00
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-07-08 14:15:44 +02:00 |
|
Etienne Roudeix
|
ab37da6eee
|
product loop
|
2013-07-08 14:15:18 +02:00 |
|
franck
|
b130abb9c3
|
Added sample to pagination.html
|
2013-07-08 14:13:38 +02:00 |
|
franck
|
a91d0e4c78
|
Fixed method name
|
2013-07-08 13:39:37 +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 |
|