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 Apr 24 #3085

Merged
merged 45 commits into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
139e3cd
chore(release): merge in release v3.5.3
matticbot Mar 28, 2024
24b9272
chore(deps-dev): bump @types/wordpress__components
dependabot[bot] Apr 1, 2024
404fee1
chore(deps-dev): bump stylelint from 16.3.0 to 16.3.1
dependabot[bot] Apr 1, 2024
b25519e
chore(deps-dev): bump @rushstack/eslint-patch from 1.8.0 to 1.10.1
dependabot[bot] Apr 1, 2024
5021ec0
chore(deps-dev): bump @types/qs from 6.9.12 to 6.9.14
dependabot[bot] Apr 1, 2024
3b3d15d
chore(deps-dev): bump wp-coding-standards/wpcs from 3.0.1 to 3.1.0
dependabot[bot] Apr 1, 2024
e267ad7
chore(release): merge in release v3.5.4
matticbot Apr 2, 2024
02728d3
fix(reader-reg-block): respect newsletter subscription checkbox state…
chickenn00dle Apr 5, 2024
7f30d79
fix: prevent multiple inputs from resetting in autocompletetokenfield…
chickenn00dle Apr 5, 2024
988d13f
chore(deps): bump google/auth from 1.37.0 to 1.37.1
dependabot[bot] Apr 8, 2024
1266c67
chore(deps-dev): bump phpunit/phpunit from 9.6.18 to 9.6.19
dependabot[bot] Apr 8, 2024
1d13a69
chore(deps-dev): bump yoast/phpunit-polyfills from 2.0.0 to 2.0.1
dependabot[bot] Apr 8, 2024
f208742
chore(deps-dev): bump @types/wordpress__block-editor
dependabot[bot] Apr 8, 2024
63fd006
chore(deps): bump @babel/preset-env from 7.24.3 to 7.24.4
dependabot[bot] Apr 8, 2024
9dd88a3
chore(release): merge in release v3.6.0
matticbot Apr 8, 2024
bdc1426
chore(release): merge in release v3.6.1
matticbot Apr 9, 2024
e996e4e
chore(release): merge in release v3.6.1
matticbot Apr 9, 2024
5308b79
chore(release): merge in release v3.6.2
matticbot Apr 10, 2024
154bc68
chore(release): merge in release v3.6.2
matticbot Apr 10, 2024
c363630
feat: support for MC tags as subscription lists (#3035)
dkoo Apr 10, 2024
179dc3e
chore(release): merge in release v3.6.3
matticbot Apr 10, 2024
8b01e4a
chore(release): merge in release v3.6.3
matticbot Apr 10, 2024
926e9c6
chore(release): merge in release v3.6.4
matticbot Apr 10, 2024
81d4cad
chore(release): merge in release v3.6.4
matticbot Apr 10, 2024
a986c17
fix: revert #3050 due to performance issues (#3059)
dkoo Apr 11, 2024
36bbf4e
chore(release): merge in release v3.6.5
matticbot Apr 11, 2024
82bef3b
chore(release): merge in release v3.6.5
matticbot Apr 11, 2024
9e1dc92
chore(release): merge in release v3.6.6
matticbot Apr 11, 2024
332f1e0
chore(release): merge in release v3.6.6
matticbot Apr 11, 2024
2f9843a
chore(release): merge in release v3.6.7
matticbot Apr 11, 2024
a0ff261
chore(release): merge in release v3.6.7
matticbot Apr 11, 2024
709766a
Merge pull request #3061 from Automattic/trunk
laurelfulford Apr 11, 2024
ee40d47
chore(release): 3.7.0-alpha.1 [skip ci]
semantic-release-bot Apr 11, 2024
cd68d7f
Merge branch 'release' into alpha
dkoo Apr 11, 2024
5b1fb3d
chore(release): 3.7.0-alpha.2 [skip ci]
semantic-release-bot Apr 11, 2024
3bbac31
Merge branch 'release' into alpha
claudiulodro Apr 12, 2024
29fc12a
chore(release): 3.7.0-alpha.3 [skip ci]
semantic-release-bot Apr 12, 2024
7738fd3
chore(release): merge in release v3.6.10
laurelfulford Apr 18, 2024
f95d493
chore(release): 3.7.0-alpha.4 [skip ci]
semantic-release-bot Apr 18, 2024
d0dd5c1
Merge branch 'release' into alpha
dkoo Apr 19, 2024
5e9a684
chore(release): 3.7.0-alpha.5 [skip ci]
semantic-release-bot Apr 19, 2024
5682f7c
Merge branch 'release' into alpha
dkoo Apr 22, 2024
f5f6ef5
chore(release): 3.7.0-alpha.6 [skip ci]
semantic-release-bot Apr 22, 2024
291d39b
chore(release): merge in release v3.6.13
laurelfulford Apr 22, 2024
cd4fb28
chore(release): 3.7.0-alpha.7 [skip ci]
semantic-release-bot Apr 22, 2024
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
68 changes: 67 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,59 @@
# [3.7.0-alpha.7](https://github.com/Automattic/newspack-plugin/compare/v3.7.0-alpha.6...v3.7.0-alpha.7) (2024-04-22)


### Bug Fixes

* add option to display subscriptionless memberships ([#3058](https://github.com/Automattic/newspack-plugin/issues/3058)) ([aa493c9](https://github.com/Automattic/newspack-plugin/commit/aa493c95e609853c8380830c72faf39c69713759))

## [3.6.13](https://github.com/Automattic/newspack-plugin/compare/v3.6.12...v3.6.13) (2024-04-22)


### Bug Fixes

* add option to display subscriptionless memberships ([#3058](https://github.com/Automattic/newspack-plugin/issues/3058)) ([aa493c9](https://github.com/Automattic/newspack-plugin/commit/aa493c95e609853c8380830c72faf39c69713759))

# [3.7.0-alpha.6](https://github.com/Automattic/newspack-plugin/compare/v3.7.0-alpha.5...v3.7.0-alpha.6) (2024-04-22)


### Bug Fixes

* **woo:** include all active statuses ([#3074](https://github.com/Automattic/newspack-plugin/issues/3074)) ([b9b622f](https://github.com/Automattic/newspack-plugin/commit/b9b622fc4aae68843b4bf4ecc0ae6783f00d426f))

## [3.6.12](https://github.com/Automattic/newspack-plugin/compare/v3.6.11...v3.6.12) (2024-04-22)


### Bug Fixes

* **woo:** include all active statuses ([#3074](https://github.com/Automattic/newspack-plugin/issues/3074)) ([b9b622f](https://github.com/Automattic/newspack-plugin/commit/b9b622fc4aae68843b4bf4ecc0ae6783f00d426f))

# [3.7.0-alpha.5](https://github.com/Automattic/newspack-plugin/compare/v3.7.0-alpha.4...v3.7.0-alpha.5) (2024-04-19)


### Bug Fixes

* minor bugs in reCAPTCHA + Campaigns admin UIs ([#3073](https://github.com/Automattic/newspack-plugin/issues/3073)) ([876d0a9](https://github.com/Automattic/newspack-plugin/commit/876d0a9a1baa26480e399d52199d62d8a8f6bed5))


## [3.6.12](https://github.com/Automattic/newspack-plugin/compare/v3.6.11...v3.6.12) (2024-04-22)

### Bug Fixes

## [3.6.11](https://github.com/Automattic/newspack-plugin/compare/v3.6.10...v3.6.11) (2024-04-19)


### Bug Fixes

* minor bugs in reCAPTCHA + Campaigns admin UIs ([#3073](https://github.com/Automattic/newspack-plugin/issues/3073)) ([876d0a9](https://github.com/Automattic/newspack-plugin/commit/876d0a9a1baa26480e399d52199d62d8a8f6bed5))

# [3.7.0-alpha.4](https://github.com/Automattic/newspack-plugin/compare/v3.7.0-alpha.3...v3.7.0-alpha.4) (2024-04-18)

### Bug Fixes

* safer approach to comment metering fix ([#3067](https://github.com/Automattic/newspack-plugin/issues/3067)) ([e73657d](https://github.com/Automattic/newspack-plugin/commit/e73657d75fabf2bd56943d4c556f40abf4ba0aef))


## [3.6.11](https://github.com/Automattic/newspack-plugin/compare/v3.6.10...v3.6.11) (2024-04-19)

### Bug Fixes

* minor bugs in reCAPTCHA + Campaigns admin UIs ([#3073](https://github.com/Automattic/newspack-plugin/issues/3073)) ([876d0a9](https://github.com/Automattic/newspack-plugin/commit/876d0a9a1baa26480e399d52199d62d8a8f6bed5))
Expand All @@ -26,16 +65,43 @@

* safer approach to comment metering fix ([#3067](https://github.com/Automattic/newspack-plugin/issues/3067)) ([e73657d](https://github.com/Automattic/newspack-plugin/commit/e73657d75fabf2bd56943d4c556f40abf4ba0aef))

# [3.7.0-alpha.3](https://github.com/Automattic/newspack-plugin/compare/v3.7.0-alpha.2...v3.7.0-alpha.3) (2024-04-12)


### Bug Fixes

* revert 3057 ([#3063](https://github.com/Automattic/newspack-plugin/issues/3063)) ([25eea61](https://github.com/Automattic/newspack-plugin/commit/25eea61980422f3f684429b57cdc3ca42234bd10))

## [3.6.9](https://github.com/Automattic/newspack-plugin/compare/v3.6.8...v3.6.9) (2024-04-12)


### Bug Fixes

* revert 3057 ([#3063](https://github.com/Automattic/newspack-plugin/issues/3063)) ([25eea61](https://github.com/Automattic/newspack-plugin/commit/25eea61980422f3f684429b57cdc3ca42234bd10))

## [3.6.8](https://github.com/Automattic/newspack-plugin/compare/v3.6.7...v3.6.8) (2024-04-11)
# [3.7.0-alpha.2](https://github.com/Automattic/newspack-plugin/compare/v3.7.0-alpha.1...v3.7.0-alpha.2) (2024-04-11)

### Bug Fixes

* revert 3057 ([#3063](https://github.com/Automattic/newspack-plugin/issues/3063)) ([25eea61](https://github.com/Automattic/newspack-plugin/commit/25eea61980422f3f684429b57cdc3ca42234bd10))

* hourly cron job to check for prematurely expired memberships ([#3060](https://github.com/Automattic/newspack-plugin/issues/3060)) ([77eeee3](https://github.com/Automattic/newspack-plugin/commit/77eeee374723a2780ace91669f848b2d24a436c4))

# [3.7.0-alpha.1](https://github.com/Automattic/newspack-plugin/compare/v3.6.7...v3.7.0-alpha.1) (2024-04-11)

### Bug Fixes

* prevent multiple inputs from resetting in autocompletetokenfield component ([#3023](https://github.com/Automattic/newspack-plugin/issues/3023)) ([7f30d79](https://github.com/Automattic/newspack-plugin/commit/7f30d79bb4385f1a6bc28c275fda3bca2772fc71))
* **reader-reg-block:** respect newsletter subscription checkbox state ([#3024](https://github.com/Automattic/newspack-plugin/issues/3024)) ([02728d3](https://github.com/Automattic/newspack-plugin/commit/02728d3cbd4355d8f09db7a44cb42c99f08d9da6))
* revert [#3050](https://github.com/Automattic/newspack-plugin/issues/3050) due to performance issues ([#3059](https://github.com/Automattic/newspack-plugin/issues/3059)) ([a986c17](https://github.com/Automattic/newspack-plugin/commit/a986c174dc6e815bd72f15a51ea37d245266996b))


### Features

* support for MC tags as subscription lists ([#3035](https://github.com/Automattic/newspack-plugin/issues/3035)) ([c363630](https://github.com/Automattic/newspack-plugin/commit/c363630971464f2023c3fe9cd67e58707d68931b))

## [3.6.8](https://github.com/Automattic/newspack-plugin/compare/v3.6.7...v3.6.8) (2024-04-11)

### Bug Fixes

* hourly cron job to check for prematurely expired memberships ([#3060](https://github.com/Automattic/newspack-plugin/issues/3060)) ([77eeee3](https://github.com/Automattic/newspack-plugin/commit/77eeee374723a2780ace91669f848b2d24a436c4))
Expand Down
2 changes: 1 addition & 1 deletion assets/blocks/reader-registration/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default function ReaderRegistrationEdit( {
};

const isListSelected = listId => {
return ! listsCheckboxes.hasOwnProperty( listId ) || listsCheckboxes[ listId ];
return listsCheckboxes.hasOwnProperty( listId ) && listsCheckboxes[ listId ];
};
const toggleListCheckbox = listId => () => {
const newListsCheckboxes = { ...listsCheckboxes };
Expand Down
6 changes: 3 additions & 3 deletions assets/components/src/autocomplete-tokenfield/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,16 @@ class AutocompleteTokenField extends Component {
return;
}

const { validValues } = this.state;
const currentSuggestions = [ ...suggestions ];
const currentValidValues = {};

suggestions.forEach( suggestion => {
currentValidValues[ suggestion.value ] = suggestion.label;
validValues[ suggestion.value ] = suggestion.label;
} );

this.setState( {
suggestions: currentSuggestions,
validValues: currentValidValues,
validValues,
loading: false,
} );
} )
Expand Down
4 changes: 2 additions & 2 deletions assets/wizards/engagement/views/newsletters/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ export const SubscriptionLists = ( { lockedLists, onUpdate, initialProvider } )
toggleOnChange={ handleChange( index, 'active' ) }
toggleChecked={ list.active }
className={
list?.id && list.id.startsWith( 'group' )
? 'newspack-newsletters-group-list-item'
list?.id && ( list.id.startsWith( 'group' ) || list.id.startsWith( 'tag' ) )
? 'newspack-newsletters-sub-list-item'
: ''
}
actionText={
Expand Down
2 changes: 1 addition & 1 deletion assets/wizards/engagement/views/newsletters/style.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.newspack-newsletters-group-list-item {
.newspack-newsletters-sub-list-item {
margin-left: 40px !important;
}
Loading