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

Conflicts:
	core/lib/Thelia/Controller/Admin/CustomerController.php

2013-11-09 18:31:52 +01:00

..

admin-utilities-position-block.html

Using now templates instead of hard code in AdminUtilities smarty plugin

2013-10-31 12:16:14 +01:00

admin-utilities-sortable-column-header.html

Using now templates instead of hard code in AdminUtilities smarty plugin

2013-10-31 12:16:14 +01:00

catalog-breadcrumb.html

fix breadcrumb for content/folder part

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

confirmation-modal.html

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

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

content-folder-management.html

Minor adjustements

2013-10-30 17:31:02 +01:00

customer_address_form_fields.html

Refactored back-office customer management

2013-11-09 18:28:01 +01:00

document-upload-form.html

WIP : upload documents : add action, ctrl, event

2013-09-24 10:54:52 +02:00

document-upload-list-ajax.html

Minor adjustements

2013-10-30 17:31:02 +01:00

folder-breadcrumb.html

fix usage of ProfilerConnectionWrapper

2013-09-30 15:35:46 +02:00

generic-confirm-dialog.html

Fixed product update process

2013-09-20 17:17:44 +02:00

generic-create-dialog.html

finish language creation process

2013-10-23 12:38:32 +02:00

generic-js-dialog.html

Combination creation management

2013-10-30 15:44:32 +01:00

generic-warning-dialog.html

permission cleanup

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

image-upload-form.html

WIP : upload document : add forms

2013-09-23 18:13:12 +02:00

image-upload-list-ajax.html

Minor adjustements

2013-10-30 17:31:02 +01:00

inner-form-toolbar.html

Fixed issue #86

2013-11-07 00:12:06 +01:00

module-block.html

fix stuff + module management

2013-11-08 15:11:45 +01:00

notifications.html

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

2013-09-04 12:01:12 +02:00

product-details-tab.html

Combination creation management

2013-10-30 15:44:32 +01:00

product-general-tab.html

Fixed minor internationalizable string error in admin templates.

2013-11-06 20:01:26 +01:00

standard-description-form-fields.html

Fixed minor internationalizable string error in admin templates.

2013-11-06 20:01:26 +01:00