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

315 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
85bb7594ee change compatibility for propel2 2013-07-05 15:59:41 +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
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