gmorel a9b0f53334 Merge remote-tracking branch 'origin/coupon' into coupon ...

Conflicts:
	templates/admin/default/coupon/form.html

2013-09-04 19:25:57 +02:00

..

assets

Working : Migration form to bootstrap3

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

coupon

Merge remote-tracking branch 'origin/coupon' into coupon

2013-09-04 19:25:57 +02:00

includes

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

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

404.html

Smarty inheritance in admin template.

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

admin-layout.tpl

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

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

categories.html

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

2013-09-04 16:11:51 +02:00

configuration.html

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

2013-09-04 11:35:22 +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

Working : Update to bootstrap3

2013-09-04 17:20:34 +02:00

coupon-update.html

Working

2013-09-04 19:22:20 +02:00

currencies.html

Working : Finish renaming class for bootstrap migration

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

currency-edit.html

Working : Finish renaming class for bootstrap migration

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

edit_category.html

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

2013-09-04 11:35:22 +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 : Finish renaming class for bootstrap migration

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

messages.html

Working : Finish renaming class for bootstrap migration

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

variable-edit.html

Working : Finish renaming class for bootstrap migration

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

variables.html

Working : Finish renaming class for bootstrap migration

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