Manuel Raynaud d6e1f99b35 Merge branch 'template' ...

Conflicts:
	templates/admin/default/customer-edit.html

2013-09-12 15:44:23 +02:00

..

assets

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

2013-09-12 12:41:30 +02:00

coupon

WIP

2013-09-11 14:40:55 +02:00

includes

Merge branch 'template'

2013-09-12 15:44:23 +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-12 13:04:12 +02:00

attribute-edit.html

Using "update" instead of "change"

2013-09-12 14:20:23 +02:00

attributes.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

categories.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

category-edit.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

configuration.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

coupon-create.html

WIP

2013-09-10 20:00:43 +02:00

coupon-list.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

coupon-read.html

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

2013-09-10 16:18:15 +02:00

coupon-update.html

Working

2013-09-11 17:22:31 +02:00

currencies.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

currency-edit.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

customer-edit.html

Merge branch 'template'

2013-09-12 15:44:23 +02:00

customers.html

valid customer removal

2013-09-12 12:40:14 +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

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

2013-09-11 17:12:47 +02:00

message-edit.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

messages.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

order-edit.html

- Creation of order-edit view

2013-09-12 12:40:46 +02:00

orders.html

Delete form on the orders view

2013-09-12 12:49:11 +02:00

product-attributes-edit.html

Saving current status

2013-09-10 14:36:06 +02:00

variable-edit.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00

variables.html

Created AbstractCrudController, and refactored existing controllers

2013-09-12 13:02:40 +02:00