Skip to content

Commit

Permalink
Bug fixes (#38)
Browse files Browse the repository at this point in the history
* Fix deploy task

* Add npmrc

* Update travis config

* Support banners and youtube in readme, add video

* Use hqdefault for video thumbnail

* GoLF Automated checkin by kchien (2/21/2017 4:30:02 PM)

* Update cssmin package ver

* Fix makepot task

* Update POT

* Update mo

* Bump tested up to 4.8

* Bump tested up to

* Switch wp_nonce to _wpnonce. Fix failing check_admin_referer when action === 'refresh'

* Update devDependencies

* set dist: precise for 5.2

* set dist: precise for 5.2

* Temporarily disable PHP 5.2. See travis-ci/travis-ci#8072

* Update dev dependencies. Re-grunt

* Update changelog with 1.2.1 changes

* Change Text Domain to Match WordPress.org Plugin Slug (#26)

* update text domain for interested translators on translation.wordpress.org to work on plugin strings.

* change text domain to match plugin slug in comments

* fixing according to travis ci warnings

only the i18n warnings.

* more fixes based on travis ci output

* fixing other warnings

* one more warning

* renamed language files to match text domain

https://developer.wordpress.org/plugins/internationalization/how-to-internationalize-your-plugin/#loading-text-domain

* Add GDPR Support (#28)

* Add support for GDPR fields.

* Update gruntfile and npm dependencies

* Add comment for tos_link

* Resolve PHPCS warnings. Update phpcs.ruleset.xml.

* Remove test filter

* Add xmllint addon to travis build config

* Double check for method before calling it. Update checkbox field value to match disply text.

* Update gem-form-fields test to asset invalid_field_type returns empty.

* Readd vendor dir to PHPCS exclusion

* Add test for tos_link

* Add test for tracking_option

* Remove chrome from travis addons

* Remove print

* Add spacing for phpcs warnings

* Add required checkboxes to error checking

* Update update-pot grunt task. Regenerate translations after i18n function updates and updated i18n comments

* Update read for 1.3.0 release

* [dist] update packages

* [dist] New package-lock

* Introduce GEM Gutenberg block (#31)

* Start to build out GEM gutenberg block

* Save block output with proper shortcode

* Add .babelrbs and webpack.config.js to .distignore

* Resolve PHPCS warnings

* Dynamically generate the GEM form in the GEM block

* Bump tested up to version to 5.0

* Fix PHPCS spacing

* Dynamic gem block

* Update dynamic blocks

* Add GEM block screenshots and update readme

* Clean up UX during block addition/form selection. Cleanup JS file.

* Add docblock to class prop

* Update changelog, regenerate readme

* Update GEM select field label

* Update godaddy-email-marketing-sign-up-forms-ru_RU.po (#33)

Added RU for several messages (Thank you for signing up, There was a problem).

* Fix cache being bypassed when fetching forms (#34)

* Regenerate mo files. Update changelog for 1.4.1. Regerate readme.md

* Fix help tab iframe url with www (#37)

* Fix help tab iframe URL for non-US locales

* Fix help tab iframe URL for non-US locales

* Update readme with 1.4.2 changes
  • Loading branch information
Evan Herman committed Feb 20, 2019
1 parent 0e6911f commit c774eee
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 2 additions & 3 deletions includes/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,7 @@ public function generate_help_tab_content() {
switch ( $subdomain ) {

case '':
case 'us':
$subdomain = 'www'; // Default
break;

Expand All @@ -559,10 +560,8 @@ public function generate_help_tab_content() {

}

$subdomain = 'us' ? '' : $subdomain . '.';

?>
<iframe src="<?php echo esc_url( "https://{$subdomain}godaddy.com/help/godaddy-email-marketing-1000013" ); ?>" frameborder="0" scrolling="no"></iframe>
<iframe src="<?php echo esc_url( "https://{$subdomain}.godaddy.com/help/godaddy-email-marketing-1000013" ); ?>" frameborder="0" scrolling="no"></iframe>

<script type="text/javascript">
iFrameResize( {
Expand Down
3 changes: 3 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ You can find your **Secret API Key** in the [Settings section](https://gem.godad

## Changelog ##

### 1.4.2 ###
* Fix: Update help tab iframe URL with www. @props [aaroncampbell](https://github.com/aaroncampbell)

### 1.4.1 ###
* Fix: Update plugin bypassing cache when fetching customer forms
* Fix: Fix US help tab iframe URL
Expand Down
3 changes: 3 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ You can find your **Secret API Key** in the [Settings section](https://gem.godad

== Changelog ==

= 1.4.2 =
* Fix: Update help tab iframe URL with www. @props [aaroncampbell](https://github.com/aaroncampbell)

= 1.4.1 =
* Fix: Update plugin bypassing cache when fetching customer forms
* Fix: Fix US help tab iframe URL
Expand Down

0 comments on commit c774eee

Please sign in to comment.