Skip to content

Commit

Permalink
Merge branch 'main' into develop.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaemnnosttv committed May 4, 2022
2 parents 8ce5340 + 0e95813 commit 068e497
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 9 deletions.
2 changes: 1 addition & 1 deletion assets/js/googlesitekit/datastore/util/permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/**
* Returns the property name for a meta capability, given the capability name and arguments.
*
* @since n.e.x.t
* @since 1.74.0
*
* @param {string} capability Meta capability name.
* @param {...any} args Meta capability arguments.
Expand Down
6 changes: 3 additions & 3 deletions assets/js/googlesitekit/modules/datastore/modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ const baseActions = {
* from a global variable (`_googlesitekitSiteData`), set by PHP
* in the `before_print` callback for `googlesitekit-datastore-site`.
*
* @since n.e.x.t
* @since 1.74.0
* @private
*
* @param {Object} recoverableModules Recoverable modules, usually supplied via a global variable from PHP.
Expand All @@ -437,7 +437,7 @@ const baseActions = {
*
* Recover a module (based on the slug provided).
*
* @since n.e.x.t
* @since 1.74.0
*
* @param {string} slug Slug of the module to recover.
* @return {Object} Object with `{response, error}`.
Expand Down Expand Up @@ -1096,7 +1096,7 @@ const baseSelectors = {
*
* Returns an Object/map of objects, keyed by slug as same as `getModules`.
*
* @since n.e.x.t
* @since 1.74.0
*
* @param {Object} state Data store's state.
* @return {(Object|undefined)} Recoverable modules available on the site; `undefined` if not loaded.
Expand Down
2 changes: 1 addition & 1 deletion assets/js/hooks/useViewContext.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import ViewContextContext from '../components/Root/ViewContextContext';
* Returns the current Site Kit viewing context, eg. "dashboard",
* "entity dashboard", "view-only dashboard", etc.
*
* @since n.e.x.t
* @since 1.74.0
*
* @return {string} The current "viewing context" value for the plugin.
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/js/modules/adsense/datastore/clients.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const baseSelectors = {
/**
* Gets the AdSense For Content (AFC) client for the given AdSense account.
*
* @since n.e.x.t
* @since 1.74.0
*
* @param {Object} state Data store's state.
* @param {string} accountID The AdSense Account ID to fetch AFC client for.
Expand Down
4 changes: 2 additions & 2 deletions google-site-kit.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Plugin Name: Site Kit by Google
* Plugin URI: https://sitekit.withgoogle.com
* Description: Site Kit is a one-stop solution for WordPress users to use everything Google has to offer to make them successful on the web.
* Version: 1.73.0
* Version: 1.74.0
* Requires at least: 4.7
* Requires PHP: 5.6
* Author: Google
Expand All @@ -26,7 +26,7 @@
}

// Define most essential constants.
define( 'GOOGLESITEKIT_VERSION', '1.73.0' );
define( 'GOOGLESITEKIT_VERSION', '1.74.0' );
define( 'GOOGLESITEKIT_PLUGIN_MAIN_FILE', __FILE__ );
define( 'GOOGLESITEKIT_PHP_MINIMUM', '5.6.0' );

Expand Down
24 changes: 23 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Contributors: google
Requires at least: 4.7
Tested up to: 5.9
Requires PHP: 5.6
Stable tag: 1.73.0
Stable tag: 1.74.0
License: Apache License 2.0
License URI: https://www.apache.org/licenses/LICENSE-2.0
Tags: google, search-console, analytics, adsense, pagespeed-insights, optimize, tag-manager, site-kit
Expand Down Expand Up @@ -106,6 +106,28 @@ Please create a new topic on our [WordPress.org support forum](https://wordpress

== Changelog ==

= 1.74.0 =

**Enhanced**

* Remove color from disabled tab in Search Console widget on dashboard when Search Console is gathering data. See [#5056](https://github.com/google/site-kit-wp/issues/5056).
* Add `useViewContext` hook for retrieving the current view context. See [#5011](https://github.com/google/site-kit-wp/issues/5011).
* Update internal event tracking to include user authentication state. See [#4846](https://github.com/google/site-kit-wp/issues/4846).
* Add the new DashboardSharingSettingsButton component. See [#4820](https://github.com/google/site-kit-wp/issues/4820).
* Hide Analytics goals CTA in view-only context. See [#4817](https://github.com/google/site-kit-wp/issues/4817).
* Add a dropdown menu for users using the "view-only" dashboard sharing mode. See [#4812](https://github.com/google/site-kit-wp/issues/4812).
* Allow users with shared dashboard access to navigate directly to the shared dashboard from the splash page. See [#4811](https://github.com/google/site-kit-wp/issues/4811).
* Implement the view only splash screen. See [#4810](https://github.com/google/site-kit-wp/issues/4810).
* Add an action to recover a module and a selector to get recoverable modules. See [#4803](https://github.com/google/site-kit-wp/issues/4803).
* Implement UI for new AdSense setup site components. See [#4764](https://github.com/google/site-kit-wp/issues/4764).

**Fixed**

* Update the AdSense SetupMain component to show existing errors. See [#5107](https://github.com/google/site-kit-wp/issues/5107).
* Avoid an unnecessary network request for Analytics settings on the Site Kit dashboard when Analytics is not active. See [#5091](https://github.com/google/site-kit-wp/issues/5091).
* Add required versions of PHP and WP to plugin header. See [#5076](https://github.com/google/site-kit-wp/issues/5076).
* Fix infinite loading state for components relying on gathering or zero data reports. See [#4542](https://github.com/google/site-kit-wp/issues/4542).

= 1.73.0 =

**Enhanced**
Expand Down

0 comments on commit 068e497

Please sign in to comment.