Skip to content

Commit

Permalink
Merge branch 'release/1.7' into issue/370
Browse files Browse the repository at this point in the history
* release/1.7: (158 commits)
  Merge 1.6.1 into 1.7
  Update filter give_payment_gateways --> give_donation_gateways
  Move payment-->donation in actions and filters
  Update general translation POT file
  update languages redame
  Delete PO/MO language files (Give)
  Delete PO/MO language files (CMB2)
  minor composer file update
  Readme: use https links
  Revert "Resolves #962"
  Resolves #962
  Revert "Regarding #962 -- updates to Payment Gateways Tab"
  Revert "Regarding #962 -- updates to Display Options Tab"
  Revert "Regarding #962 -- updates to Email Options Tab"
  Revert "Regarding #962 -- updates to Advanced Options Tab"
  Revert "Use `show_option_none` instead of no value for CMB2 compatibility"
  Revert "Final cleanup of settings."
  Final cleanup of settings.
  Use `show_option_none` instead of no value for CMB2 compatibility
  Regarding #962 -- updates to Advanced Options Tab
  ...

# Conflicts:
#	includes/admin/class-give-settings.php
  • Loading branch information
Devin Walker committed Aug 30, 2016
2 parents 1915259 + 2c6dfcc commit f816e22
Show file tree
Hide file tree
Showing 319 changed files with 4,048 additions and 82,167 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ We earn money by selling add-ons, not from the money you raise. What you raise i

### Easy to Customize and Enhance ###

Give is built by [WordImpress](http://wordimpress.com "Visit the the developers of Give - WordImpress"), our plugins are built from the ground up to be intuitive and easy to use. Along with the plugin is a support team that is dedicated, fast to respond, and always willing to squash bugs and help troubleshoot.
Give is built by [WordImpress](https://wordimpress.com "Visit the the developers of Give - WordImpress"), our plugins are built from the ground up to be intuitive and easy to use. Along with the plugin is a support team that is dedicated, fast to respond, and always willing to squash bugs and help troubleshoot.

### Connect with Give ###

Stay in touch with us for important plugin news and updates:

* **[Newsletter](http://eepurl.com/bggG99 "Subscribe via MailChimp")**
* **[Facebook](http://facebook.com/wpgive "Visit the Give on Facebook")**
* **[Facebook](https://facebook.com/wpgive "Visit the Give on Facebook")**
* **[GitHub](https://github.com/WordImpress/Give "Visit the the developers of Give - WordImpress")**
* **[WordImpress](http://wordimpress.com "Visit the the developers of Give - WordImpress")**
* **[WordImpress](https://wordimpress.com "Visit the the developers of Give - WordImpress")**

### Contribute to Give ###

This is a WordPress plugin and therefore is GPL / open source. We are always looking for more contributors. Whether you know another language, can code like no one's business, or just have an idea, we would love your help and input. To contribute to Give, please review our [contributing guidelines](CONTRIBUTING.md). Feel free to view/fork/watch this GitHub repository to learn more about what issues we're tackling and how the project is progressing.

## Installation ##

The easiest way to install the plugin is through the [WordPress.org plugin repository](http://wordpress.org/plugins/give "Give on the WordPress.org plugin repository").
The easiest way to install the plugin is through the [WordPress.org plugin repository](https://wordpress.org/plugins/give "Give on the WordPress.org plugin repository").

### Minimum Requirements ###

Expand All @@ -59,7 +59,7 @@ In the search field type "Give" and click Search Plugins. Once you have found th

### Manual installation ###

The manual installation method involves downloading the plugin and uploading it to your server via your favorite FTP application. The WordPress Codex contains [instructions on how to do this here](http://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation).
The manual installation method involves downloading the plugin and uploading it to your server via your favorite FTP application. The WordPress Codex contains [instructions on how to do this here](https://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation).

### Updating ###

Expand Down
93 changes: 93 additions & 0 deletions assets/css/give-admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/give-admin.min.css

Large diffs are not rendered by default.

40 changes: 40 additions & 0 deletions assets/js/admin/admin-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,46 @@ jQuery.noConflict();
$(this).val(price_string);
});


/**
* Show/Hide License notice
*/
var $notices_container = $('.give-license-notice');

// Hide license notice for 24 hours if usr already read notice.
if( $notices_container.length ){
$.each( $notices_container, function( index, item ){
var notice_id = $(this).data('notice-id'),
cookie_name = 'give_hide_license_notice_' + notice_id,
hide_notice_cookie = document.cookie.replace( new RegExp( "(?:^|.*;\\s*)" + cookie_name.replace(/[\-\.\+\*]/g, "\\$&") + "\\s*\\=\\s*((?:[^;](?!;))*[^;]?).*" ), "$1" );

// Do not show license notice.
if ( 'true' === hide_notice_cookie ) {
$(this).remove();
}
});
}

// Add click event to license notice dismiss button.
$('.give-license-notice').on( 'click', 'button.notice-dismiss', function(e){
e.preventDefault();

var notice_id = $(this).closest('div.give-license-notice').data('notice-id'),
cookie_name = 'give_hide_license_notice_' + notice_id,
hide_notice_cookie = document.cookie.replace( '/(?:(?:^|.*;\s*)' + notice_id + '\s*\=\s*([^;]*).*$)|^.*$/', '$1' ),
date = new Date( Date.now() );

if( true === hide_notice_cookie ) {
return false;
}

// Set expire date to 24 hour.
date.setDate( date.getDate() + 1 );
document.cookie = cookie_name + '=true; expires=' + date.toUTCString();

return false;
});

});

})(jQuery);
Loading

0 comments on commit f816e22

Please sign in to comment.