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

..

assets

WIP

2013-09-10 15:41:23 +02:00

coupon

WIP

2013-09-10 15:41:23 +02:00

includes

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-10 15:46:51 +02:00

404.html

Smarty inheritance in admin template.

2013-09-03 11:26:03 +02:00

admin-layout.tpl

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-10 15:46:51 +02:00

categories.html

Started category modification

2013-09-07 10:59:43 +02:00

category-edit.html

Started category modification

2013-09-07 10:59:43 +02:00

configuration.html

Started product attributes management

2013-09-10 15:45:29 +02:00

coupon-create.html

Working : Migration form to bootstrap3

2013-09-04 18:08:13 +02:00

coupon-list.html

Working : Update to bootstrap3 + Delete js filter for the moment

2013-09-04 17:09:59 +02:00

coupon-read.html

WIP

2013-09-09 21:43:58 +02:00

coupon-update.html

WIP

2013-09-10 15:41:23 +02:00

currencies.html

Started category modification

2013-09-07 10:59:43 +02:00

currency-edit.html

Merge branch 'master' of https://github.com/thelia/thelia

2013-09-05 23:30:50 +02:00

customers.html

update customer loop in template customer

2013-09-10 14:57:56 +02:00

general_error.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

home.html

Working : Major class changes migration from bootstrap 2.x to 3.0

2013-09-04 11:35:22 +02:00

login.html

Working : Finish renaming class for bootstrap migration

2013-09-04 15:05:49 +02:00

message-edit.html

Working :

2013-09-06 12:55:53 +02:00

messages.html

Started category modification

2013-09-07 10:59:43 +02:00

product-attributes-edit.html

Working :

2013-09-06 17:23:06 +02:00

product-attributes.html

Working :

2013-09-06 16:47:21 +02:00

variable-edit.html

Working :

2013-09-06 12:30:40 +02:00

variables.html

Started category modification

2013-09-07 10:59:43 +02:00