diff --git a/.gitignore b/.gitignore index 760b103b55c80..ea283defeeb29 100644 --- a/.gitignore +++ b/.gitignore @@ -207,7 +207,7 @@ crashlytics-build.properties ### NetBeans ### nbproject/private/ -build/ +/build/ nbbuild/ dist/ nbdist/ @@ -220,3 +220,7 @@ nb-configuration.xml .project .settings/ .externalToolBuilders/ + +### Release creation ### +tools/build/releases/* +!tools/build/releases/.gitkeep diff --git a/admin-dev/themes/default/js/bundle/product/form.js b/admin-dev/themes/default/js/bundle/product/form.js index 4432c52f78e84..1e7ccc89a9397 100644 --- a/admin-dev/themes/default/js/bundle/product/form.js +++ b/admin-dev/themes/default/js/bundle/product/form.js @@ -789,7 +789,7 @@ var warehouseCombinations = (function() { // toggle all button action $(document).on('click', 'div[id^="warehouse_combination_"] button.check_all_warehouse', function() { var checkboxes = $(this).closest('div[id^="warehouse_combination_"]').find('input[type="checkbox"][id$="_activated"]'); - checkboxes.prop('checked', checkboxes.filter(':checked').size() === 0); + checkboxes.prop('checked', checkboxes.filter(':checked').length === 0); }); // location disablation depending on 'stored' checkbox $(document).on('change', 'div[id^="warehouse_combination_"] input[id^="form_step4_warehouse_combination_"][id$="_activated"]', function() { @@ -810,7 +810,7 @@ var warehouseCombinations = (function() { }); }, 'refresh': function() { - var show = $('input#form_step3_advanced_stock_management:checked').size() > 0; + var show = $('input#form_step3_advanced_stock_management:checked').length > 0; if (show) { var url = collectionHolder.attr('data-url').replace(/\/\d+(?=\?.*)/, '/' + id_product); $.ajax({ diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index fcaaaf05a3388..6e76d3f2c7555 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -68,7 +68,7 @@
- '; + html += ''; html += '
'; html += ''; html += ''; @@ -1568,7 +1568,7 @@
- diff --git a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl index 4a8ab67b2c633..2651f424d4d61 100644 --- a/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl @@ -250,7 +250,7 @@
-
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index f1b30bc1eaa0e..fba32ed5ca70b 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -848,7 +848,7 @@ {/if} {if isset($show_cancel_button) && $show_cancel_button} - + {l s='Cancel' d='Admin.Actions'} {/if} diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl index dde3a5087533e..fd5faafc5c096 100644 --- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl @@ -28,7 +28,7 @@
{if $bulk_actions && $has_bulk_actions}
-