Merge branch 'release/2.1' into issues/2912

* release/2.1: (67 commits)
  fix(notice): update Give icon asset url
  fix(notice): move close icon svg to new directory
  style(code): improve code formatting
  fix(cache): search of prefix instead of complete string
  fix(cache): remove extra param from wp_delete_cache
  feat(admin-tools): change company name filed name #2946
  feat(admin-tools): add company name filed value in donor meta #2946
  feat(admin-tools): add company name filed in import donation import CSV #2946
  feat(admin-email): Update email recipients description #2657
  style(code): fix typo
  refactor(emails): code for pr #2942
  feat(admin-email): add Email Recipients section to donor emails 2657
  feat(admin-tools): Add Company Column in export donation history CSV #2453
  design(admin-donation): refactor donor details UI #2453
  design(admin-setting): move company name setting submenu tab to display menu #2453
  refactor(admin-shortcode): improve fields and description for give_totals shortcode #1472
  refactor(activation-banner): code review improvements
  refactor(activation-banner): code reformat using proper formatting
  fix(activation-banner): don't show banner for the add-on which is already dismissed.
  code(style): set max-height to show only three give add-on.
  ...

# Conflicts:
#	includes/admin/tools/export/class-batch-export-payments.php
#	includes/misc-functions.php
#	templates/shortcode-receipt.php

assets/src/js/admin/admin-scripts.js

@@ -1071,7 +1071,7 @@ var give_setting_edit = false;
 						self.process_step(parseInt(response.step), data, self);
 					}
 
-					if (true === reset_form) {
+					if ( true === reset_form && $( '#give-tools-recount-form' ).length > 0 ) {
 						// Reset the form for preventing multiple ajax request.
 						$('#give-tools-recount-form')[0].reset();
 						$('#give-tools-recount-form .tools-form-dropdown').hide();

includes/actions.php

@@ -332,6 +332,4 @@ function give_update_log_form_id( $args ) {
 	Give()->logs->delete_cache();
 }
 
-add_action( 'give_update_log_form_id', 'give_update_log_form_id' );
-
-
+add_action( 'give_update_log_form_id', 'give_update_log_form_id' );