sterivein

Files

Manuel Raynaud 23c4a14d2c Merge branch 'master' of github.com:thelia/thelia

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

2013-10-28 15:41:48 +01:00

ajax

Merge with master

2013-10-24 16:52:03 +02:00

assets

Merge branch 'catalog'

2013-10-24 00:16:33 +02:00

configs

order admin

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

coupon

remove tooltip from coupon edit controller

2013-10-24 15:55:35 +02:00

includes

remove some unused blocks

2013-10-25 10:27:29 +02:00

404.html

Smarty inheritance in admin template.

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

admin-layout.tpl

fix minor admin bugs

2013-10-23 19:23:29 +02:00

administrators.html

administrators management

2013-10-23 16:31:37 +02:00

attribute-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

attributes.html

fix auth loop

2013-10-22 15:57:31 +02:00

categories.html

update category/product edit link on images

2013-10-28 12:03:38 +01:00

category-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

configuration.html

mailing sytem admin

2013-10-28 12:24:59 +01:00

content-edit.html

permission management

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

countries.html

fix auth loop

2013-10-22 15:57:31 +02:00

country-edit.html

permission management

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

coupon-create.html

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

2013-10-22 23:01:04 +02:00

coupon-list.html

permission management

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

coupon-read.html

permission management

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

coupon-update.html

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

2013-10-22 23:01:04 +02:00

currencies.html

fix auth loop

2013-10-22 15:57:31 +02:00

currency-edit.html

permission management

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

customer-edit.html

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

2013-10-28 15:41:48 +01:00

customers.html

change class for button group in customer list

2013-10-28 12:16:56 +01:00

document-edit.html

permission management

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

feature-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

features.html

fix auth loop

2013-10-22 15:57:31 +02:00

folder-edit.html

fix auth loop

2013-10-22 15:57:31 +02:00

folders.html

fix foler/content edit link

2013-10-28 12:05:42 +01:00

general_error.html

No alert bloc

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

home.html

add thelia version in admin home page

2013-10-25 09:42:30 +02:00

image-edit.html

permission management

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

languages.html

manage lanf <=> url assignment

2013-10-23 19:04:49 +02:00

Autofocus on username field for better use

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

mailing-system.html

mailing sytem admin

2013-10-28 12:24:59 +01:00

message-edit.html

permission management

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

messages.html

fix auth loop

2013-10-22 15:57:31 +02:00

modules.html

remove some unused blocks

2013-10-25 10:27:29 +02:00

order-edit.html

permission management

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

orders.html

fix auth loop

2013-10-22 15:57:31 +02:00

product-edit.html

Finished product combinations edition

2013-10-25 00:32:56 +02:00

profile-edit.html

module access management

2013-10-22 20:20:15 +02:00

profiles.html

fix auth loop

2013-10-22 15:57:31 +02:00

search.html

admin search in customer and products

2013-10-24 20:26:00 +02:00

shipping-configuration-edit.html

permission management

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

shipping-configuration.html

fix auth loop

2013-10-22 15:57:31 +02:00

shipping-zones-edit.html

permission management

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

shipping-zones.html

fix auth loop

2013-10-22 15:57:31 +02:00

tax-edit.html

permission management

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

tax-rule-edit.html

permission management

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

taxes-rules.html

fix auth loop

2013-10-22 15:57:31 +02:00

template-edit.html

permission management

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

templates.html

fix auth loop

2013-10-22 15:57:31 +02:00

variable-edit.html

permission management

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

variables.html

fix auth loop

2013-10-22 15:57:31 +02:00