sterivein

Files

Etienne Roudeix abe45c5798 Merge branch 'master' into tax

Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php

2013-10-21 17:48:13 +02:00

ajax

update address process

2013-10-04 17:33:48 +02:00

assets

Merge with Master

2013-10-15 11:05:05 +02:00

configs

order admin

2013-09-25 13:26:12 +02:00

coupon

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

includes

Merge branch 'master' into tax

2013-10-21 17:48:13 +02:00

404.html

Smarty inheritance in admin template.

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

admin-layout.tpl

Merge Master

2013-10-07 11:50:20 +02:00

admin-profiles.html

Setting admin profile creation (route, view, form)

2013-09-24 09:36:48 +02:00

attribute-edit.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

attributes.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

categories.html

Finished product multiple categories attachment

2013-09-22 22:14:39 +02:00

category-edit.html

start area configuration tempalte

2013-10-11 17:23:40 +02:00

configuration.html

WIP : admin profiles

2013-10-21 11:44:33 +02:00

content-edit.html

finish contentFolder removing process

2013-10-01 10:24:09 +02:00

countries.html

create area loop and shipping conf events name

2013-10-10 16:18:51 +02:00

country-edit.html

allow country update

2013-10-10 14:20:53 +02:00

coupon-create.html

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

coupon-list.html

WIP : coupon refactor + fix

2013-09-26 18:18:45 +02:00

coupon-read.html

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

coupon-update.html

WIP : coupon refactor + fix

2013-09-26 17:47:41 +02:00

currencies.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

currency-edit.html

Started category management

2013-09-16 18:58:45 +02:00

customer-edit.html

finish customer address update

2013-10-07 09:53:25 +02:00

customers.html

order admin

2013-09-24 12:10:22 +02:00

document-edit.html

Working : Fix : Image Management + Document Management

2013-09-24 18:41:28 +02:00

feature-edit.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

features.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

folder-edit.html

fix breadcrumb for content/folder part

2013-09-30 15:13:04 +02:00

folders.html

fix breadcrumb for content/folder part

2013-09-30 15:13:04 +02:00

general_error.html

No alert bloc

2013-09-16 15:32:52 +02:00

home.html

Fixed translations

2013-09-20 09:57:30 +02:00

image-edit.html

fix form_enctype smarty function

2013-09-30 13:07:15 +02:00

languages.html

Setting creation form language

2013-09-23 10:22:14 +02:00

Autofocus on username field for better use

2013-09-16 15:15:30 +02:00

mailing-system.html

Password type on password field

2013-09-20 16:12:49 +02:00

message-edit.html

Started category management

2013-09-16 18:58:45 +02:00

messages.html

All tables are now responsive

2013-09-19 17:01:17 +02:00

modules.html

end module removal

2013-10-21 11:30:19 +02:00

order-edit.html

create purchase order pdf

2013-10-03 10:45:21 +02:00

orders.html

fix tests

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

product-edit.html

Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management

2013-09-24 18:41:57 +02:00

profile-edit.html

permission cleanup

2013-10-21 17:44:17 +02:00

profiles.html

permission cleanup

2013-10-21 17:44:17 +02:00

shipping-configuration-edit.html

display error message

2013-10-14 11:15:08 +02:00

shipping-configuration.html

allow to create a new area

2013-10-14 12:28:30 +02:00

shipping-zones-edit.html

remove area to area_delivery_module

2013-10-14 17:45:23 +02:00

shipping-zones.html

start shipping zone management

2013-10-14 14:08:50 +02:00

tax-edit.html

WIP : admin profiles

2013-10-21 11:44:33 +02:00

tax-rule-edit.html

WIP : admin profiles

2013-10-21 11:44:33 +02:00

taxes-rules.html

WIP : admin profiles

2013-10-21 11:44:33 +02:00

template-edit.html

Finished combination creation GUI

2013-09-23 11:41:14 +02:00

templates.html

Aded feature_template and category_template position management

2013-09-21 11:46:09 +02:00

variable-edit.html

Started category management

2013-09-16 18:58:45 +02:00

variables.html

All tables are now responsive

2013-09-19 17:01:17 +02:00