Skip to content

Commit

Permalink
Merge develop changes into master (#66)
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

* Bump tested up to to 5.2

* Remove $ reference and fix SVG icon (#39)

* Remove $ reference and fix SVG icon

* Remove console log from testing

* Test plugin with WP 5.4 and minor style fix (#40)

* Remove $ reference and fix SVG icon

* Remove console log from testing

* updated for 5.4

* tweak readme

* revert version bump changes

* fix json

Co-authored-by: Evan Herman <evan.m.herman@gmail.com>
Co-authored-by: Evan Herman <evanmherman@gmail.com>

* Update readme for 1.4.3 release (#43)

* remove grunt-dev-update dependency (#46)

* Add PHP linting (#47)

* Adding php linting

* automated fixes

* fix all phpcs errors

* phpcs fixes

Co-authored-by: AnthonyLedesma <anthonymledesma@gmail.com>

* Bump tested up to 5.7 (#65)

* Bump tested up to 5.7

* Bump dealerdirect/phpcodesniffer-composer-installer

Co-authored-by: Frankie Jarrett <fjarrett@gmail.com>
Co-authored-by: GoLF <loc-support@godaddy.com>
Co-authored-by: Robert Sim <robertsky@users.noreply.github.com>
Co-authored-by: Evan Herman <evanmherman@gmail.com>
Co-authored-by: Jonathan Bardo <bardo.jonathan@gmail.com>
Co-authored-by: beebeatle <ab2009ukr@gmail.com>
Co-authored-by: Aaron D. Campbell <aaron@xavisys.com>
Co-authored-by: Anthony Ledesma <30462574+AnthonyLedesma@users.noreply.github.com>
Co-authored-by: JR Tashjian <jrtashjian@gmail.com>
Co-authored-by: AnthonyLedesma <anthonymledesma@gmail.com>
  • Loading branch information
11 people committed Jun 8, 2021
1 parent 97b301d commit 0dc171d
Show file tree
Hide file tree
Showing 24 changed files with 2,117 additions and 3,835 deletions.
17 changes: 0 additions & 17 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,6 @@ module.exports = function( grunt ) {
}
},

devUpdate: {
packages: {
options: {
packageJson: null,
packages: {
devDependencies: true,
dependencies: false
},
reportOnlyPkgs: [],
reportUpdated: false,
semver: true,
updateType: 'force'
}
}
},

imagemin: {
options: {
optimizationLevel: 3
Expand Down Expand Up @@ -256,7 +240,6 @@ module.exports = function( grunt ) {
require( 'matchdep' ).filterDev( 'grunt-*' ).forEach( grunt.loadNpmTasks );

grunt.registerTask( 'default', [ 'cssmin', 'jshint', 'uglify', 'imagemin', 'readme' ] );
grunt.registerTask( 'check', [ 'devUpdate' ] );
grunt.registerTask( 'build', [ 'default', 'clean:build', 'copy:build' ] );
grunt.registerTask( 'deploy', [ 'build', 'wp_deploy', 'clean:build' ] );
grunt.registerTask( 'readme', [ 'wp_readme_to_markdown' ] );
Expand Down
13 changes: 10 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
{
"require-dev": {
"satooshi/php-coveralls": "dev-master"
}
"require-dev": {
"satooshi/php-coveralls": "dev-master",
"squizlabs/php_codesniffer": "^3.5",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"phpcompatibility/phpcompatibility-wp": "^2.1",
"wp-coding-standards/wpcs": "^2.1"
},
"scripts": {
"lint": "@php ./vendor/bin/phpcs"
}
}
Loading

0 comments on commit 0dc171d

Please sign in to comment.