Changeset 2233685
- Timestamp:
- 01/27/2020 08:09:48 AM (6 years ago)
- Location:
- jackmail-newsletters
- Files:
-
- 8 edited
- 1 copied
-
tags/1.2.4 (copied) (copied from jackmail-newsletters/trunk)
-
tags/1.2.4/html/campaigns.php (modified) (2 diffs)
-
tags/1.2.4/jackmail-newsletters.php (modified) (1 diff)
-
tags/1.2.4/js/controllers.js (modified) (1 diff)
-
tags/1.2.4/readme.txt (modified) (2 diffs)
-
trunk/html/campaigns.php (modified) (2 diffs)
-
trunk/jackmail-newsletters.php (modified) (1 diff)
-
trunk/js/controllers.js (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
jackmail-newsletters/tags/1.2.4/html/campaigns.php
r2161892 r2233685 39 39 <span><?php _e( 'Start', 'jackmail-newsletters' ) ?></span> 40 40 </div> 41 <div ng-click="window.open('https://www.youtube.com/watch?v=9Z4St2_DZhA', '_blank')" class="jackmail_campaign_video">41 <div onclick="window.open('https://www.youtube.com/watch?v=9Z4St2_DZhA', '_blank')" class="jackmail_campaign_video"> 42 42 <p class="jackmail_bold"><?php _e( 'How to use Jackmail?', 'jackmail-newsletters' ) ?></p> 43 43 <p class="jackmail_grey"><?php _e( 'Annelies will explain how our plugin works in a few minutes', 'jackmail-newsletters' ) ?></p> … … 126 126 </p> 127 127 <p class="jackmail_previews_grid_status"> 128 <span ng-if="campaign.status === 'REFUSED'" class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}" 128 <span ng-if="campaign.status === 'REFUSED' || campaign.status === 'PROCESS_SCHEDULED' || campaign.status === 'SCHEDULED'" 129 class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}" 129 130 jackmail-tooltip="{{c.get_display_campaign_status(campaign)}}"> 130 131 {{campaign.status | campaignStatus}} 131 132 </span> 132 <span ng-if="campaign.status !== 'REFUSED'" class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}"> 133 <span ng-if="campaign.status !== 'REFUSED' && campaign.status !== 'PROCESS_SCHEDULED' && campaign.status !== 'SCHEDULED'" 134 class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}"> 133 135 {{campaign.status | campaignStatus}} 134 136 </span> -
jackmail-newsletters/tags/1.2.4/jackmail-newsletters.php
r2223993 r2233685 4 4 Plugin URI: https://www.jackmail.com 5 5 Description: Create and send responsive newsletter with a professional routing platform and a lot of features: automated emails and newsletters, statistics, email & Live Support etc. 6 Version: 1.2. 36 Version: 1.2.4 7 7 Author: Jackmail 8 8 Author URI: https://www.jackmail.com -
jackmail-newsletters/tags/1.2.4/js/controllers.js
r2223993 r2233685 340 340 var text = $filter( 'campaignStatus' )( campaign.status ); 341 341 if ( campaign.status === 'PROCESS_SCHEDULED' || campaign.status === 'SCHEDULED' ) { 342 text += ' (' + $filter( 'formatedDate' )( campaign.send_option_date_begin_gmt );342 text += ' (' + $filter( 'formatedDate' )( campaign.send_option_date_begin_gmt, 'gmt_to_timezone', 'hours' ) + ')'; 343 343 } 344 344 if ( campaign.status === 'REFUSED' && campaign.status_detail !== '' ) { -
jackmail-newsletters/tags/1.2.4/readme.txt
r2223993 r2233685 5 5 Tested up to: 5.2 6 6 Requires PHP : 5.4 7 Stable tag: 1.2. 37 Stable tag: 1.2.4 8 8 License: GPLv2 9 9 … … 160 160 == Changelog == 161 161 162 = 1.2.4 = 163 * Miscellaneous fixes 164 162 165 = 1.2.3 = 163 166 * Fix custom link in WooCommerce email template -
jackmail-newsletters/trunk/html/campaigns.php
r2161892 r2233685 39 39 <span><?php _e( 'Start', 'jackmail-newsletters' ) ?></span> 40 40 </div> 41 <div ng-click="window.open('https://www.youtube.com/watch?v=9Z4St2_DZhA', '_blank')" class="jackmail_campaign_video">41 <div onclick="window.open('https://www.youtube.com/watch?v=9Z4St2_DZhA', '_blank')" class="jackmail_campaign_video"> 42 42 <p class="jackmail_bold"><?php _e( 'How to use Jackmail?', 'jackmail-newsletters' ) ?></p> 43 43 <p class="jackmail_grey"><?php _e( 'Annelies will explain how our plugin works in a few minutes', 'jackmail-newsletters' ) ?></p> … … 126 126 </p> 127 127 <p class="jackmail_previews_grid_status"> 128 <span ng-if="campaign.status === 'REFUSED'" class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}" 128 <span ng-if="campaign.status === 'REFUSED' || campaign.status === 'PROCESS_SCHEDULED' || campaign.status === 'SCHEDULED'" 129 class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}" 129 130 jackmail-tooltip="{{c.get_display_campaign_status(campaign)}}"> 130 131 {{campaign.status | campaignStatus}} 131 132 </span> 132 <span ng-if="campaign.status !== 'REFUSED'" class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}"> 133 <span ng-if="campaign.status !== 'REFUSED' && campaign.status !== 'PROCESS_SCHEDULED' && campaign.status !== 'SCHEDULED'" 134 class="jackmail_thumbnail_campaign_{{campaign.status | lowercase}}"> 133 135 {{campaign.status | campaignStatus}} 134 136 </span> -
jackmail-newsletters/trunk/jackmail-newsletters.php
r2223993 r2233685 4 4 Plugin URI: https://www.jackmail.com 5 5 Description: Create and send responsive newsletter with a professional routing platform and a lot of features: automated emails and newsletters, statistics, email & Live Support etc. 6 Version: 1.2. 36 Version: 1.2.4 7 7 Author: Jackmail 8 8 Author URI: https://www.jackmail.com -
jackmail-newsletters/trunk/js/controllers.js
r2223993 r2233685 340 340 var text = $filter( 'campaignStatus' )( campaign.status ); 341 341 if ( campaign.status === 'PROCESS_SCHEDULED' || campaign.status === 'SCHEDULED' ) { 342 text += ' (' + $filter( 'formatedDate' )( campaign.send_option_date_begin_gmt );342 text += ' (' + $filter( 'formatedDate' )( campaign.send_option_date_begin_gmt, 'gmt_to_timezone', 'hours' ) + ')'; 343 343 } 344 344 if ( campaign.status === 'REFUSED' && campaign.status_detail !== '' ) { -
jackmail-newsletters/trunk/readme.txt
r2223993 r2233685 5 5 Tested up to: 5.2 6 6 Requires PHP : 5.4 7 Stable tag: 1.2. 37 Stable tag: 1.2.4 8 8 License: GPLv2 9 9 … … 160 160 == Changelog == 161 161 162 = 1.2.4 = 163 * Miscellaneous fixes 164 162 165 = 1.2.3 = 163 166 * Fix custom link in WooCommerce email template
Note: See TracChangeset
for help on using the changeset viewer.