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

Merge master into release/1.1 #258

Merged
merged 32 commits into from
Oct 6, 2021
Merged

Merge master into release/1.1 #258

merged 32 commits into from
Oct 6, 2021

Conversation

robincornett
Copy link
Contributor

  • Need to double check settings filters work in 2.x and 3.0
  • Bootstrap has to be restricted to 4.2.1 because of this issue
  • There is no translation function in the gruntfile

amdrew and others added 30 commits August 16, 2018 13:45
In case you increase the number of widget columns to e.g. 5, the current function/filter always throws a "PHP Notice:  Undefined variable: classes in /includes/footer.php on line 113" because $classes is not defined
Issue/228 - Horizontal scroll for FES tables
+ recompile assets
Issue/233 - Allow AFGF to load registration form
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.15.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.10...4.17.15)

Signed-off-by: dependabot[bot] <[email protected]>
…yarn/lodash-4.17.15

Bump lodash from 4.17.10 to 4.17.15
…yarn/underscore.string-3.3.5

Bump underscore.string from 3.3.4 to 3.3.5
…yarn/mixin-deep-1.3.2

Bump mixin-deep from 1.3.1 to 1.3.2
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](faye/websocket-extensions-node@0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Use edd_settings_misc hook for EDD 3.0 compatibility
Set explicit versions for devDependencies.
Added default classes for footer widget column classes
Remove schema markup from cross-sell/upsell output
@robincornett robincornett requested a review from ashleyfae October 6, 2021 15:03
@ashleyfae
Copy link
Contributor

ashleyfae commented Oct 6, 2021

Testing

  • Button colour/disable settings removed in 2.x
  • Button colour/disable removed in 3.0
  • npm install works
  • grunt works

@ashleyfae ashleyfae merged commit 6db7454 into release/1.1 Oct 6, 2021
@ashleyfae ashleyfae deleted the merge-master-1.1 branch October 6, 2021 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants