Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tlovett1 committed Jun 17, 2024
2 parents 23b209e + 523ccea commit 66bcca3
Show file tree
Hide file tree
Showing 23 changed files with 7,652 additions and 20,184 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ jobs:
uses: reviewdog/action-stylelint@v1
with:
reporter: github-pr-review
stylelint_input: '**/*.css'
stylelint_config: '.stylelintrc.js'
stylelint_input: "**/*.css"
stylelint_config: ".stylelintrc.js"
fail_on_error: true
eslint:
name: eslint
Expand All @@ -28,7 +28,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: "18"
- name: eslint
uses: reviewdog/action-eslint@v1
with:
Expand All @@ -38,15 +38,15 @@ jobs:
name: phpcs
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '7.3'
coverage: none
tools: composer:v2
- name: composer install
run: composer install
- name: PHPCS check
run: ./vendor/bin/phpcs .
- name: Checkout
uses: actions/checkout@v2
- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: "8.1"
coverage: none
tools: composer:v2
- name: composer install
run: composer install
- name: PHPCS check
run: ./vendor/bin/phpcs .
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
10 changes: 6 additions & 4 deletions 10up-experience.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: 10up Experience
* Plugin URI: https://github.com/10up/10up-experience
* Description: The 10up Experience plugin configures WordPress to better protect and inform clients, aligned to 10up’s best practices.
* Version: 1.11.1
* Version: 1.11.2
* Author: 10up
* Author URI: https://10up.com
* License: GPLv2 or later
Expand All @@ -19,7 +19,7 @@

use YahnisElsts\PluginUpdateChecker\v5\PucFactory;

define( 'TENUP_EXPERIENCE_VERSION', '1.11.1' );
define( 'TENUP_EXPERIENCE_VERSION', '1.11.2' );
define( 'TENUP_EXPERIENCE_DIR', __DIR__ );
define( 'TENUP_EXPERIENCE_FILE', __FILE__ );

Expand All @@ -31,8 +31,10 @@

require_once __DIR__ . '/includes/utils.php';

add_filter( 'https_ssl_verify', '__return_false' );

spl_autoload_register(
function( $class_name ) {
function ( $class_name ) {
$path_parts = explode( '\\', $class_name );

if ( ! empty( $path_parts ) ) {
Expand Down Expand Up @@ -85,7 +87,7 @@ function( $class_name ) {
*/
add_action(
'plugins_loaded',
function() {
function () {
Authentication\Passwords::instance();
SSO\SSO::instance();
}
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).

## [1.11.2] - 2024-06-15
- Remove production setting

## [1.11.1] - 2023-10-27

- Fixed disallow direct login warning
Expand Down Expand Up @@ -152,7 +155,7 @@ All notable changes to this project will be documented in this file, per [the Ke

### Added

- If plugin updates via dashboard are disabled, still show notifcation that an update exists
- If plugin updates via dashboard are disabled, still show notification that an update exists

### Removed

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ The Activity Log tracks key actions taken by logged in users and stores them in
#### Logged Actions

- `profile_update` Runs when a user profile is updated. Example log message: "User 1 profile updated."
- `set_user_role` Runs when a user's role has changed. Example log message: "User 1 role changed from editor to administator."
- `set_user_role` Runs when a user's role has changed. Example log message: "User 1 role changed from editor to administrator."
- `updated_user_meta` Runs when certain user metadata has changed. Example log message: "User 1 meta updated. Key: nickname."
- `user_register` Runs when a new user is registered. Example log message: "User 1 registered."
- `deleted_user` Runs when a user is deleted. Example log message: "User 1 deleted."
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
"bjeavons/zxcvbn-php": "^1.0"
},
"require-dev": {
"10up/phpcs-composer": "dev-master",
"squizlabs/php_codesniffer": "3.*"
"10up/phpcs-composer": "dev-trunk"
},
"scripts": {
"lint": "phpcs --extensions=php --warning-severity=8 -s .",
Expand Down
Loading

0 comments on commit 66bcca3

Please sign in to comment.