Etienne Roudeix
|
06ee460e8a
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-11-04 16:16:21 +01:00 |
|
Etienne Roudeix
|
969c077f81
|
admin home stats and information
|
2013-11-04 16:15:48 +01:00 |
|
Franck Allimant
|
f3cba323c6
|
Changed 'template' loop into 'product-template' loop
|
2013-11-02 19:18:19 +01:00 |
|
Franck Allimant
|
2aefb87db7
|
Finished log configuration. All loggers are currentrly working
|
2013-11-01 16:15:19 +01:00 |
|
Manuel Raynaud
|
c1cfc086a1
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 16:52:21 +01:00 |
|
Etienne Roudeix
|
1bcec28841
|
remove tax js in profiles
|
2013-10-31 16:24:57 +01:00 |
|
Etienne Roudeix
|
26c7acbeaa
|
admoin home stats navigation
|
2013-10-31 16:09:31 +01:00 |
|
Etienne Roudeix
|
95be087b90
|
review jqplot
|
2013-10-31 16:09:31 +01:00 |
|
Etienne Roudeix
|
689de106c7
|
admin home stats
|
2013-10-31 16:09:31 +01:00 |
|
Etienne Roudeix
|
bc454124f3
|
admin home stats
|
2013-10-31 16:09:31 +01:00 |
|
Manuel Raynaud
|
99dc559484
|
update translation files for admin part
|
2013-10-31 16:08:54 +01:00 |
|
Manuel Raynaud
|
5110abe207
|
create translation files for admin part
|
2013-10-31 15:46:36 +01:00 |
|
Etienne Roudeix
|
899a154350
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 15:33:30 +01:00 |
|
Franck Allimant
|
3b9f94cec8
|
Using now templates instead of hard code in AdminUtilities smarty plugin
|
2013-10-31 12:16:14 +01:00 |
|
Etienne Roudeix
|
07c5dd4a51
|
admoin home stats navigation
|
2013-10-31 11:59:25 +01:00 |
|
Franck Allimant
|
a295fee0d3
|
Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module
|
2013-10-31 11:36:56 +01:00 |
|
Etienne Roudeix
|
00dab8e7ec
|
review jqplot
|
2013-10-31 11:20:51 +01:00 |
|
Etienne Roudeix
|
e5f5570d2b
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-31 11:20:42 +01:00 |
|
Franck Allimant
|
a06d83bfb4
|
Fixed exception if module content is empty
|
2013-10-30 20:10:37 +01:00 |
|
Franck Allimant
|
d1c54ea62a
|
Merge branch 'catalog'
Conflicts:
core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
|
2013-10-30 19:55:10 +01:00 |
|
Franck Allimant
|
f5828dc18b
|
added timestamp parameter to format_date sparty plugin
|
2013-10-30 19:52:47 +01:00 |
|
Franck Allimant
|
3019d36356
|
Minor adjustements
|
2013-10-30 17:31:02 +01:00 |
|
Etienne Roudeix
|
f90df03f7d
|
admin home stats
|
2013-10-30 17:00:38 +01:00 |
|
Franck Allimant
|
c7835758e5
|
Minor css tuning, renamed "details" tab of categories edition to
associaitons
|
2013-10-30 16:32:36 +01:00 |
|
Etienne Roudeix
|
083dde5e93
|
admin home stats
|
2013-10-30 16:32:24 +01:00 |
|
Franck Allimant
|
9f11f475ee
|
Typo
|
2013-10-30 15:47:21 +01:00 |
|
Franck Allimant
|
a11a013eb0
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-10-30 15:44:57 +01:00 |
|
Franck Allimant
|
0cabe7b9e8
|
Combination creation management
|
2013-10-30 15:44:32 +01:00 |
|
Etienne Roudeix
|
a540c50395
|
fix administrators management bug
|
2013-10-30 14:51:13 +01:00 |
|
Etienne Roudeix
|
e998717c9b
|
remove not working datepicker in coupons
|
2013-10-30 12:02:50 +01:00 |
|
Etienne Roudeix
|
52fa6783f3
|
datepicker in admin logs
|
2013-10-30 12:00:48 +01:00 |
|
Etienne Roudeix
|
19e373f7fe
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-29 16:10:10 +01:00 |
|
Etienne Roudeix
|
a055f3b3eb
|
admin log
|
2013-10-29 16:09:50 +01:00 |
|
Etienne Roudeix
|
082f9aff8d
|
admin logs
|
2013-10-29 12:22:34 +01:00 |
|
Manuel Raynaud
|
7a2469cdc8
|
allow to create a customer in bakcoffice
|
2013-10-28 16:55:07 +01:00 |
|
Manuel Raynaud
|
1e65ad8cf3
|
add shim and respond in backoffice
|
2013-10-28 16:10:06 +01:00 |
|
Manuel Raynaud
|
1c3aeb969d
|
select correct country in selectbox on customer edit page
|
2013-10-28 15:42:34 +01:00 |
|
Manuel Raynaud
|
23c4a14d2c
|
Merge branch 'master' of github.com:thelia/thelia
Conflicts:
templates/admin/default/customer-edit.html
|
2013-10-28 15:41:48 +01:00 |
|
Manuel Raynaud
|
c1e792d5b1
|
format customer address list
|
2013-10-28 15:39:59 +01:00 |
|
Manuel Raynaud
|
9c89bed23d
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-28 15:39:05 +01:00 |
|
Manuel Raynaud
|
968c372a5f
|
add some info in addresses list
|
2013-10-28 12:36:07 +01:00 |
|
Etienne Roudeix
|
1950e1f3c5
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-10-28 12:25:25 +01:00 |
|
Etienne Roudeix
|
2eb5fc821c
|
mailing sytem admin
|
2013-10-28 12:24:59 +01:00 |
|
Manuel Raynaud
|
f44d1dde73
|
change class for button group in customer list
|
2013-10-28 12:16:56 +01:00 |
|
Manuel Raynaud
|
3ac7d97661
|
remove company column in customer list
|
2013-10-28 12:09:47 +01:00 |
|
Manuel Raynaud
|
40a99e6f82
|
fix foler/content edit link
|
2013-10-28 12:05:42 +01:00 |
|
Manuel Raynaud
|
d8e0a0aa11
|
update category/product edit link on images
|
2013-10-28 12:03:38 +01:00 |
|
Manuel Raynaud
|
2bec1d8193
|
remove some unused blocks
|
2013-10-25 10:27:29 +02:00 |
|
Manuel Raynaud
|
22caf28f80
|
add thelia version in admin home page
|
2013-10-25 09:42:30 +02:00 |
|
Franck Allimant
|
d9fc945015
|
Added TAX_RUl_ID to simple part of product loop
|
2013-10-25 00:46:25 +02:00 |
|