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

1100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
franck
ae786f2139 Added process_assets config variable 2013-09-11 12:14:39 +02:00
franck
9473f2752f Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:08:50 +02:00
Manuel Raynaud
d7f789188c Merge branch 'master' of github.com:thelia/thelia 2013-09-11 11:06:02 +02:00
franck
77d7587fb7 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 11:05:52 +02:00
Manuel Raynaud
e2a5ee90ff use ROUTER::ABSOLUTE_URL by default 2013-09-11 11:03:35 +02:00
Etienne Roudeix
d24316feeb Merge branch 'master' into tax 2013-09-11 11:01:37 +02:00
Etienne Roudeix
c11821153c PSE loop todo 2013-09-11 11:00:55 +02:00
Etienne Roudeix
3d31090344 currency management in PSE loop 2013-09-11 10:51:44 +02:00
franck
3484d2eb4c Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 10:48:35 +02:00
mespeche
e4362ba414 Add customer view finish 2013-09-11 10:47:31 +02:00
mespeche
2f351fd4d9 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php
	templates/admin/default/customers.html
 2013-09-11 10:26:56 +02:00
mespeche
40a87d50ce Add modal for create/delete customer 2013-09-11 10:21:07 +02:00
mespeche
a6ada57b34 Update body background 2013-09-11 10:20:31 +02:00
franck
4b6acacda5 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-11 09:51:02 +02:00
franck
f1e2455315 fixed typo 2013-09-11 09:50:47 +02:00
Manuel Raynaud
557940c5cf searching route return relative path 2013-09-11 09:48:41 +02:00
Etienne Roudeix
70f6ee6a52 Merge branch 'master' into tax 2013-09-11 09:21:28 +02:00
Etienne Roudeix
d6136c56d4 pse loop currency 2013-09-11 09:20:58 +02:00
Manuel Raynaud
05470715d6 Merge branch 'master' into template 2013-09-11 09:16:31 +02:00
Manuel Raynaud
9002484814 change find method on some request 2013-09-11 09:13:42 +02:00
Manuel Raynaud
06bb1d0a39 change some getters 2013-09-11 08:57:59 +02:00
Manuel Raynaud
3582ae4cf9 save register template 2013-09-11 08:51:34 +02:00
Manuel Raynaud
65a20381d9 Merge branch 'master' into template 2013-09-11 08:47:26 +02:00
Etienne Roudeix
2f07e01b06 fix test 2013-09-11 08:37:18 +02:00
Etienne Roudeix
0050d01278 Merge branch 'tax' 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
 2013-09-11 08:35:23 +02:00
Etienne Roudeix
a3bb124424 fix tests 2013-09-11 08:33:25 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
Manuel Raynaud
990ab0e094 change debugbar render tag in templates 2013-09-11 08:19:37 +02:00
Manuel Raynaud
8fa3ed287b Merge branch 'master' of github.com:thelia/thelia 2013-09-11 08:16:39 +02:00
Manuel Raynaud
08a6b0d195 activate propel prepare caching 2013-09-10 22:37:29 +02:00
Manuel Raynaud
fe8680ed76 refactor debugBar plugin 2013-09-10 22:15:55 +02:00
Manuel Raynaud
c4bc273ad5 save duration and memory in debugBar 2013-09-10 21:03:48 +02:00
Manuel Raynaud
f7666c1edf Merge branch 'master' of github.com:thelia/thelia 2013-09-10 19:22:23 +02:00
Manuel Raynaud
a050b0c362 remove # for smarty variable delimiter 2013-09-10 19:21:56 +02:00
Etienne Roudeix
3b433a0c8d Merge branch 'master' into tax 
Conflicts:
	templates/default_save/product.html
 2013-09-10 19:15:15 +02:00
Etienne Roudeix
f70cecbbe9 bug fix 2013-09-10 19:13:28 +02:00
Etienne Roudeix
8b209291d3 use_tax_free_amounts binary config variable + ConfigQuery::useTaxFreeAmounts() helper method 2013-09-10 19:03:46 +02:00
Etienne Roudeix
6187dbae22 thelia loop with currency - TODO : best price whin in AND max args 2013-09-10 18:58:21 +02:00
Manuel Raynaud
672b489418 Merge branch 'master' into template 
Conflicts:
	templates/admin/default/customers.html
	templates/default/register.html
 2013-09-10 17:09:22 +02:00
Manuel Raynaud
66d6f86b9a replace <i> tag by <span> for displaying icons 2013-09-10 17:07:20 +02:00
Manuel Raynaud
04d517208f remove preThelia smarty filter 2013-09-10 16:57:12 +02:00
Manuel Raynaud
5ab3d4fb88 replace smarty variable identifier by $ 2013-09-10 16:54:13 +02:00
mespeche
7952e69eb4 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Form/CustomerCreation.php
	templates/admin/default/customers.html
 2013-09-10 16:44:24 +02:00
mespeche
a485456431 Add route and view for customer creation 2013-09-10 16:35:34 +02:00
Manuel Raynaud
0f46e9d23a Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	templates/admin/default/coupon-read.html
 2013-09-10 16:18:15 +02:00
Manuel Raynaud
5aa49d62fe replace smarty variable identifier by $ 2013-09-10 16:14:49 +02:00
Manuel Raynaud
eb7bc62964 integrate new customer creation form 2013-09-10 16:13:53 +02:00
franck
a51ffb7a67 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/admin/default/admin-layout.tpl
 2013-09-10 15:46:51 +02:00
Manuel Raynaud
3c67903bd7 add part of customer form in customer admin template 2013-09-10 15:46:19 +02:00
franck
281ec337aa Started product attributes management 2013-09-10 15:45:29 +02:00