Manuel Raynaud 0c24a8afc0 Merge branch 'master' into modules ...

Conflicts:
	templates/backOffice/default/product-edit.html

2013-12-17 10:48:59 +01:00

..

admin-utilities-position-block.html

Merge master

2013-11-27 20:24:38 +01:00

admin-utilities-sortable-column-header.html

Merge master

2013-11-27 20:24:38 +01:00

catalog-breadcrumb.html

Merge master

2013-11-27 20:24:38 +01:00

confirmation-modal.html

Merge master

2013-11-27 20:24:38 +01:00

content-folder-management.html

Fix typo

2013-12-09 15:19:15 +01:00

customer_address_form_fields.html

Merge master

2013-11-27 20:24:38 +01:00

document-upload-form.html

document positioning

2013-12-16 10:55:18 +01:00

document-upload-list-ajax.html

document positioning

2013-12-16 10:55:18 +01:00

folder-breadcrumb.html

Merge master

2013-11-27 20:24:38 +01:00

generic-confirm-dialog.html

Merge master

2013-11-27 20:24:38 +01:00

generic-create-dialog.html

change template subdirs

2013-11-13 10:24:14 +01:00

generic-js-dialog.html

Merge master

2013-11-27 20:24:38 +01:00

generic-warning-dialog.html

change template subdirs

2013-11-13 10:24:14 +01:00

image-upload-form.html

in progress : reorder image

2013-12-12 15:30:10 +01:00

image-upload-list-ajax.html

in progress : reorder image

2013-12-12 15:30:10 +01:00

inner-form-toolbar.html

Action buttons smaller

2013-11-22 17:40:56 +01:00

module-block.html

Added sorting and position ùmanagement to modules.

2013-12-06 18:59:46 +01:00

notifications.html

Add dismissable

2013-12-11 18:13:28 +01:00

product-details-tab.html

Merge branch 'master' into modules

2013-12-06 17:16:14 +01:00

product-general-tab.html

Add action buttons at the bottom of the product General tab

2013-12-09 14:49:20 +01:00

seo-tab.html

remove novalidate paramter on seo form

2013-12-16 16:26:26 +01:00

standard-description-form-fields.html

Merge master

2013-11-27 20:24:38 +01:00