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

Conflicts:
	core/lib/Thelia/Config/Resources/routing/admin.xml

2013-09-16 11:01:00 +02:00

..

ajax

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

assets

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

2013-09-16 10:01:34 +02:00

coupon

WIP : Coupon fix coupon creation issue

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

includes

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

2013-09-16 10:01:34 +02:00

404.html

Smarty inheritance in admin template.

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

admin-layout.tpl

Working : Coupon : fix links and errors display

2013-09-13 12:42:33 +02:00

attribute-edit.html

Fixed action column alignment

2013-09-13 00:18:19 +02:00

attributes.html

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

categories.html

Fixed action column alignment

2013-09-13 00:18:19 +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

countries.html

Countries view and routing creation

2013-09-16 10:59:30 +02:00

country-edit.html

Countries view and routing creation

2013-09-16 10:59:30 +02:00

coupon-create.html

WIP : Coupon fix coupon creation issue

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

coupon-list.html

Working : Coupon : fix links and errors display

2013-09-13 12:42:33 +02:00

coupon-read.html

Working : Coupon : fix links and errors display

2013-09-13 12:42:33 +02:00

coupon-update.html

Working : Coupon : fix links and errors display

2013-09-13 12:42:33 +02:00

currencies.html

Fixed action column alignment

2013-09-13 00:18:19 +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

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

2013-09-13 11:59:21 +02:00

feature-edit.html

Finished Features management

2013-09-16 10:40:52 +02:00

features.html

Finished Features management

2013-09-16 10:40:52 +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

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +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

Fixed action column alignment

2013-09-13 00:18:19 +02:00

product-attributes-edit.html

Saving current status

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

template-edit.html

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +02:00

templates.html

Implemented "Remember Me" feature on admin. Started template management

2013-09-16 09:23:44 +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