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
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
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
gmorel
883cc68d14
Merge branch 'coupon' of https://github.com/thelia/thelia
...
* 'coupon' of https://github.com/thelia/thelia :
WIP - Coupon Add/Edit/Delete rule AJAX
WIP - Coupon Add/Edit/Delete rule AJAX
Working - Allow to parse array and objects in Smarty Template
2013-09-10 15:43:18 +02:00
gmorel
66c7c32325
Merge branch 'master' of https://github.com/thelia/thelia
...
# By Manuel Raynaud (9) and Etienne Roudeix (2)
# Via Manuel Raynaud (2) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia :
update customer loop in template customer
strat regiter page
complete login form
change link for homepage
start creating register and login pages
display good currency in template
defin currency at runtime
creating index page
fix tests
pass container to thelialoop smarty plugin then to baseloop
start integration default template
2013-09-10 15:42:58 +02:00
gmorel
3ffc948d4b
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By Manuel Raynaud (9) and Etienne Roudeix (1)
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia :
update customer loop in template customer
strat regiter page
complete login form
change link for homepage
start creating register and login pages
display good currency in template
defin currency at runtime
creating index page
fix tests
start integration default template
2013-09-10 15:41:59 +02:00
gmorel
f481da7a2f
WIP
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-10 15:41:23 +02:00
Manuel Raynaud
c7544faf65
change variable identifier in customer template
2013-09-10 15:17:55 +02:00
Manuel Raynaud
88bb6001ac
Merge branch 'master' into template
2013-09-10 15:07:42 +02:00
Manuel Raynaud
f8c907d79e
update customer loop in template customer
2013-09-10 14:57:56 +02:00
Manuel Raynaud
79e40013e2
updating customer form
2013-09-10 14:50:51 +02:00
Etienne Roudeix
affc6805c5
Merge branch 'master' into tax
2013-09-10 12:29:08 +02:00
Etienne Roudeix
1971240fca
currency in product loop
2013-09-10 12:22:58 +02:00
Manuel Raynaud
9ef1b17ea5
strat regiter page
2013-09-10 12:22:35 +02:00
Manuel Raynaud
7eb3ec41fe
complete login form
2013-09-10 12:16:19 +02:00
Etienne Roudeix
8570251b88
product price
2013-09-10 12:04:33 +02:00
Manuel Raynaud
71928ec879
change link for homepage
2013-09-10 08:14:07 +02:00
gmorel
0fe443f53d
WIP
...
- Coupon Add/Edit/Delete rule AJAX
2013-09-09 21:43:58 +02:00
Manuel Raynaud
f5e7467c86
start creating register and login pages
2013-09-09 21:40:58 +02:00
Manuel Raynaud
1bf2d02477
display good currency in template
2013-09-09 21:17:01 +02:00
