Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.8.12 #57

Merged
merged 34 commits into from
Jul 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8bc323e
Bumped the version number for 1.8.10 branch
DevinWalker Jul 6, 2017
a0dd392
Merge pull request #49 from WordImpress/release/1.8.10
mehul0810 Jul 7, 2017
774e383
Added $this->per_page to get_logs
mehul0810 Jul 10, 2017
3746b88
Fixed Pagination issue
mehul0810 Jul 10, 2017
d2c4c88
Add login notification #1384
raftaar1191 Jul 10, 2017
eae75a4
Add JS #1384
raftaar1191 Jul 10, 2017
41bf6bf
Refactor Code #1384
raftaar1191 Jul 10, 2017
6c8e7e6
Fix Condition checking #1384
raftaar1191 Jul 10, 2017
4e1a907
Merge pull request #1835 from mehul0810/issue/1378_1
Jul 10, 2017
b0afd5d
Merge pull request #1836 from raftaar1191/issues-1384
Jul 10, 2017
073c13d
Escaping not necessary
DevinWalker Jul 11, 2017
58c389e
Merge branch 'master' into release/1.8.10
DevinWalker Jul 11, 2017
17f9b4c
Change log for 1.8.10 added
DevinWalker Jul 11, 2017
b675fa2
Removed extra line
DevinWalker Jul 11, 2017
c94ec67
Update: add auto dismissible feature to frontend notices
ravinderk Jul 11, 2017
098e8d5
Merge pull request #1845 from WordImpress/release/1.8.10
Jul 11, 2017
3713692
New POT file for 1.8.10
DevinWalker Jul 11, 2017
de2da6c
Fix: add backward compatibility for notices to pass PHPUnit tests
ravinderk Jul 11, 2017
63e2ee2
Fix: install give pages on give_init
ravinderk Jul 11, 2017
64ffa68
Use update_option for give_settings because since give_update_option …
DevinWalker Jul 11, 2017
04bede3
Reworked unit tests
DevinWalker Jul 11, 2017
381a963
Merge pull request #1852 from WordImpress/ravinderk-issues/1848
Jul 11, 2017
d8fe23a
Merge pull request #1846 from ravinderk/issues/1837
Jul 11, 2017
ab654f6
Bumped version number, added change log for 1.8.11
DevinWalker Jul 11, 2017
3b5c5de
Merge branch 'release/1.8.11' of https://github.com/WordImpress/Give …
DevinWalker Jul 11, 2017
cdf5776
Better formatting
DevinWalker Jul 11, 2017
9890f49
Merge pull request #1854 from WordImpress/release/1.8.11
Jul 11, 2017
c92311d
New gulp file for 1.8.11
DevinWalker Jul 11, 2017
d5ae30e
Bumped up stable tag
DevinWalker Jul 11, 2017
1153eb7
Fixed typo
DevinWalker Jul 11, 2017
0ee1074
Version bumped
DevinWalker Jul 11, 2017
d832acd
Merge pull request #55 from WordImpress/release/1.8.12
mehul0810 Jul 12, 2017
4ce85ef
Added Donation History Page under System Info
mehul0810 Jul 12, 2017
c8438e4
Merge pull request #1859 from mehul0810/issue/1841
Jul 12, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions assets/js/frontend/give-ajax.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,25 @@ jQuery(document).ready(function ($) {
give_user_pass: this_form.find('[name=give_user_pass]').val()
};

$.post(give_global_vars.ajaxurl, data, function (data) {

$.post(give_global_vars.ajaxurl, data, function (response) {
//user is logged in
if ($.trim(data) == 'success') {
if ( $.trim( typeof ( response.success ) ) != undefined && response.success == true && typeof ( response.data ) != undefined ) {

//remove errors
this_form.find('.give_errors').remove();
//reload the selected gateway so it contains their logged in information

// Login successfully message.
this_form.find( '#give-payment-mode-select' ).after( response.data );
this_form.find( '.give_notices.give_errors' ).delay(5000).slideUp();

//reload the selected gateway so it contains their logged in information
give_load_gateway(this_form, this_form.find('.give-gateway-option-selected input').val());
} else {
//Login failed, show errors
this_form.find('[id^=give-login-fields] input[type=submit]').val(complete_purchase_val);
this_form.find('.give-loading-animation').fadeOut();
this_form.find('.give_errors').remove();
this_form.find('[id^=give-user-login-submit]').before(data);
this_form.find('[id^=give-user-login-submit]').before( response.data );
}
});

Expand Down
2 changes: 1 addition & 1 deletion assets/js/frontend/give-ajax.min.js

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

4 changes: 2 additions & 2 deletions assets/js/frontend/give.all.min.js

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions assets/js/frontend/give.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,22 @@ jQuery(function ($) {

});

// Auto hide frontend notices.
var give_notices = jQuery('.give_notice[data-auto-dismissible="1"]');
if( give_notices.length ){
give_notices.each(function( index, $notice ){
$notice = $( $notice );

// auto hide setting message in 5 seconds.
window.setTimeout(
function () {
$notice.slideUp();
},
$notice.data('dismiss-interval')
);
});
}

});

/**
Expand Down
2 changes: 1 addition & 1 deletion assets/js/frontend/give.min.js

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

4 changes: 2 additions & 2 deletions give.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
* Author: WordImpress
* Author URI: https://wordimpress.com
* Version: 1.8.9
* Version: 1.8.12
* Text Domain: give
* Domain Path: /languages
* GitHub Plugin URI: https://github.com/WordImpress/Give
Expand Down Expand Up @@ -311,7 +311,7 @@ private function setup_constants() {

// Plugin version
if ( ! defined( 'GIVE_VERSION' ) ) {
define( 'GIVE_VERSION', '1.8.9' );
define( 'GIVE_VERSION', '1.8.12' );
}

// Plugin Folder Path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,10 @@ public function get_logs() {
$logs_data = array();
$paged = $this->get_paged();
$log_query = array(
'log_type' => 'api_request',
'paged' => $paged,
'meta_query' => $this->get_meta_query(),
'log_type' => 'api_request',
'paged' => $paged,
'meta_query' => $this->get_meta_query(),
'posts_per_page' => $this->per_page,
);

$logs = $give_logs->get_connected_logs( $log_query );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,9 @@ public function get_logs() {
$logs_data = array();
$paged = $this->get_paged();
$log_query = array(
'log_type' => 'gateway_error',
'paged' => $paged
'log_type' => 'gateway_error',
'paged' => $paged,
'posts_per_page' => $this->per_page,
);

$logs = $give_logs->get_connected_logs( $log_query );
Expand Down Expand Up @@ -258,7 +259,7 @@ public function prepare_items() {
$this->set_pagination_args( array(
'total_items' => $total_items,
'per_page' => $this->per_page,
'total_pages' => ceil( $total_items / $this->per_page )
'total_pages' => ceil( $total_items / $this->per_page ),
)
);
}
Expand Down
Loading