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

68 Commits

Author SHA1 Message Date
Manuel Raynaud
8c2eb5987c Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Core/HttpFoundation/Session/Session.php
 2013-07-26 15:59:32 +02:00
Manuel Raynaud
a1a3b73d9c add some phpdoc 2013-07-26 15:57:22 +02:00
Manuel Raynaud
9f4a2778e3 fix endlife cookie cart 2013-07-26 15:40:05 +02:00
Manuel Raynaud
74fb217cb4 finish session test for cart part 2013-07-26 11:58:59 +02:00
Manuel Raynaud
747012dd35 start test for session class 2013-07-26 11:48:01 +02:00
Manuel Raynaud
4b1e7ce5b0 change visibility for property in cart test 2013-07-26 11:37:39 +02:00
Manuel Raynaud
5f8e935a40 finis test for cart creation 2013-07-26 11:29:26 +02:00
Manuel Raynaud
02c89c0795 remove use statementnot needed 2013-07-26 11:12:10 +02:00
Manuel Raynaud
fab90bade9 complete cart test 2013-07-26 11:06:26 +02:00
Manuel Raynaud
202d2dae99 initialize cart test 2013-07-26 10:50:03 +02:00
Manuel Raynaud
69bb513fbd refacto cart process 2013-07-26 10:43:17 +02:00
Etienne Roudeix
59f5b102c6 Merge branch 'master' into loops 2013-07-23 10:44:41 +02:00
franck
3d5caa2341 Fix source header alignment 2013-07-17 15:06:53 +02:00
Etienne Roudeix
92866d602d new argument type 2013-07-16 15:19:32 +02:00
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
028a5d124e unit tests 2013-07-11 16:25:03 +02:00
Etienne Roudeix
ba373e3fa1 Merge branch 'master' into loops 2013-07-11 11:27:21 +02:00
Etienne Roudeix
26b1806156 x right to 7 
feature filter in product loop
 2013-07-11 11:25:47 +02:00
Manuel Raynaud
6baac9e36c create test for module:generate command 2013-07-11 11:11:16 +02:00
Etienne Roudeix
ab7a9b3cd8 features in product loop 2013-07-10 16:59:34 +02:00
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
33f8bc67a6 removed obsolete security tests 2013-07-09 11:51:14 +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
25a8b28c61 track composer.lock file 2013-07-09 10:19:35 +02:00
Etienne Roudeix
6752531e04 loop arguments 
product loop
 2013-07-09 09:29:40 +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
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
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
Etienne Roudeix
ddc6d02f80 Merge branch 'loops' 2013-07-05 17:16:10 +02:00
Manuel Raynaud
e0416c08f8 fix broken test 2013-07-05 12:13:28 +02:00
Etienne Roudeix
92d15d44c7 new types 2013-07-03 10:52:24 +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
Etienne Roudeix
7382159685 create type formatter 
create product loop (not functional yet)
 2013-07-01 17:02:15 +02:00
Etienne Roudeix
80380878f5 changes tests 
create argument helpers
start loop auto pagination
 2013-06-26 14:45:19 +02:00
Etienne Roudeix
29592da5b0 new types and their tests 2013-06-24 13:17:38 +02:00
Etienne Roudeix
06543bb68c add unit testing 2013-06-24 11:43:15 +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
785b450537 create new command allowing to install thelia using cli tools 2013-06-05 14:23:05 +02:00
Manuel Raynaud
d9ee229bab test CacheClear command 2013-06-03 16:11:31 +02:00
Manuel Raynaud
c7a2ca88c6 remove unused ActionMatcherTest 2013-05-22 12:10:00 +02:00
Manuel Raynaud
74dee3bf56 add Plugin test config for example 2013-04-08 17:07:56 +02:00
Manuel Raynaud
29c05e53f2 fix bootstrap for unit test 2013-04-04 12:18:18 +02:00