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

Version 3.4.3 #1058

Merged
merged 34 commits into from
Mar 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c32c989
Always allow tracking CRON runs (#1029)
kasparsd Jul 25, 2019
73cf9b1
Merge remote-tracking branch 'origin/master' into develop
kasparsd Sep 23, 2019
04c75a8
Fix IP address based exclude rule matching (#1034)
kasparsd Sep 26, 2019
07eb979
Bump select2 to 4.0.10
kasparsd Sep 26, 2019
9761670
Bump the version strings too
kasparsd Sep 26, 2019
99b219d
Skip header and footer rows which don’t have select enabled
kasparsd Sep 26, 2019
ef2862d
Pass the targets for re-usability instead
kasparsd Sep 26, 2019
3c112cb
Revert "Bump the version strings too"
kasparsd Sep 26, 2019
0497e96
Simplify the overrides
kasparsd Sep 26, 2019
2607a05
Revert "Bump select2 to 4.0.10"
kasparsd Sep 26, 2019
6431dde
Sanitize as strings by default
kasparsd Sep 26, 2019
20fd91e
Ugly hack to ensure we always pass an empty value or the order of row…
kasparsd Sep 26, 2019
5a0f238
Add the placeholder row at the bottom since we want new rows there
kasparsd Sep 26, 2019
8c28e46
Skip the default anchor jump
kasparsd Sep 26, 2019
9915fa5
Fix IP exclude rules settings (#1036)
kasparsd Sep 26, 2019
cc04ac4
Merge branch 'fix/1035-exclude-rules-table' of github.com:xwp/stream …
kasparsd Sep 26, 2019
7ebcb9c
Merge remote-tracking branch 'origin/master' into develop
kasparsd Sep 26, 2019
a874b1e
Add renovate.json (#1042)
renovate[bot] Jan 3, 2020
fac0006
Bump deps (#1047)
kasparsd Jan 3, 2020
1461251
Bump acorn from 7.1.0 to 7.1.1 (#1053)
dependabot[bot] Mar 19, 2020
5fed77a
Enable release builds in Travis CI (#1057)
kasparsd Mar 19, 2020
35529f8
Do a different style conditional
kasparsd Mar 19, 2020
948480b
Include any release ZIP
kasparsd Mar 19, 2020
9c68cf7
Include tag and format as string
kasparsd Mar 19, 2020
0fe7c3d
All tags please
kasparsd Mar 19, 2020
743a8f0
Include the tagged version, too
kasparsd Mar 19, 2020
1a52d42
Move the deploy logic to the deploy section
kasparsd Mar 19, 2020
fbdb411
Bump version
kasparsd Mar 19, 2020
a57cdba
Remove trailing slashes
kasparsd Mar 19, 2020
9f132a9
Mark as tested with the upcoming version of WP
kasparsd Mar 19, 2020
d509215
929: Users no results found (#1052)
tareiking Mar 19, 2020
aec19dc
Merge remote-tracking branch 'origin/develop' into release/3.4.3
kasparsd Mar 19, 2020
a818d66
Add the release notes
kasparsd Mar 19, 2020
0871268
Remove the extra bracket
kasparsd Mar 19, 2020
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
/.vagrant/
/console.log
/phpcs.xml
/stream.zip
/stream-*.zip
npm-debug.log
package.lock

Expand Down
25 changes: 14 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
dist: xenial

language:
- php
- node_js
language: php

php:
- "5.6"
Expand All @@ -21,6 +19,12 @@ env:
- WP_VERSION=trunk WP_MULTISITE=0
- WP_VERSION=trunk WP_MULTISITE=1

jobs:
include:
- name: Release Package
php: "7.3"
env: WP_VERSION=latest WP_MULTISITE=0 WP_RELEASE=1

services:
- mysql

Expand All @@ -38,22 +42,21 @@ after_script:
- source $DEV_LIB_PATH/travis.after_script.sh

before_deploy:
- npm run build
- npm run release

deploy:
provider: releases
api_key:
secure: HheYiv6c8ipHzMZBTH7xcKrOwCllvJTtfiTffAPK6XubWe3Kudn6IJUv0p1gmRhWXxZ5ciJQ/sgiCRGTRm/bubHs4tS7JOmpmoTdkrXajTxyyDCKpxhtT43nie0vNF+pWqVu2yOjhDR4pwtWjpQdzEKOz0kn0XSMT+vGsKQD50w=
overwrite: true
skip_cleanup: true
file_glob: true
file: build/**/*
file:
- stream.zip
- stream-$TRAVIS_TAG.zip
on:
tags: true

# Pull requests are built by default.
branches:
only:
- master
- develop
condition: "$WP_RELEASE = 1"

notifications:
email: false
Expand Down
25 changes: 23 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env node */
/* eslint-env node, es6 */

module.exports = function( grunt ) {
'use strict';
Expand Down Expand Up @@ -73,6 +73,25 @@ module.exports = function( grunt ) {
},
},

compress: {
release: {
options: {
archive: function() {
if ( process.env.TRAVIS_TAG ) {
return `stream-${process.env.TRAVIS_TAG}.zip`;
}

return 'stream.zip';
},
},
cwd: 'build',
dest: 'stream',
src: [
'**/*',
],
},
},

// Clean up the build
clean: {
build: {
Expand All @@ -97,11 +116,13 @@ module.exports = function( grunt ) {
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-contrib-copy' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-compress' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-wp-deploy' );

// Register tasks
grunt.registerTask( 'default', [ 'uglify', 'cssmin' ] );
grunt.registerTask( 'default', [ 'clean', 'uglify', 'cssmin' ] );
grunt.registerTask( 'build', [ 'default', 'copy' ] );
grunt.registerTask( 'release', [ 'build', 'compress' ] );
grunt.registerTask( 'deploy', [ 'build', 'wp_deploy', 'clean' ] );
};
82 changes: 37 additions & 45 deletions classes/class-list-table.php
Original file line number Diff line number Diff line change
Expand Up @@ -718,55 +718,46 @@ public function filters_form() {
}

public function filter_select( $name, $title, $items, $ajax = false ) {
if ( $ajax ) {
$out = sprintf(
'<input type="hidden" name="%s" class="chosen-select" value="%s" data-placeholder="%s" />',
esc_attr( $name ),
esc_attr( wp_stream_filter_input( INPUT_GET, $name ) ),
esc_attr( $title )
$options = array( '<option value=""></option>' );
$selected = wp_stream_filter_input( INPUT_GET, $name );

foreach ( $items as $key => $item ) {
$value = isset( $item['children'] ) ? 'group-' . $key : $key;
$option_args = array(
'value' => $value,
'selected' => selected( $value, $selected, false ),
'disabled' => isset( $item['disabled'] ) ? $item['disabled'] : null,
'icon' => isset( $item['icon'] ) ? $item['icon'] : null,
'group' => isset( $item['children'] ) ? $key : null,
'tooltip' => isset( $item['tooltip'] ) ? $item['tooltip'] : null,
'class' => isset( $item['children'] ) ? 'level-1' : null,
'label' => isset( $item['label'] ) ? $item['label'] : null,
);
} else {
$options = array( '<option value=""></option>' );
$selected = wp_stream_filter_input( INPUT_GET, $name );

foreach ( $items as $key => $item ) {
$value = isset( $item['children'] ) ? 'group-' . $key : $key;
$option_args = array(
'value' => $value,
'selected' => selected( $value, $selected, false ),
'disabled' => isset( $item['disabled'] ) ? $item['disabled'] : null,
'icon' => isset( $item['icon'] ) ? $item['icon'] : null,
'group' => isset( $item['children'] ) ? $key : null,
'tooltip' => isset( $item['tooltip'] ) ? $item['tooltip'] : null,
'class' => isset( $item['children'] ) ? 'level-1' : null,
'label' => isset( $item['label'] ) ? $item['label'] : null,
);
$options[] = $this->filter_option( $option_args );

if ( isset( $item['children'] ) ) {
foreach ( $item['children'] as $child_value => $child_item ) {
$option_args = array(
'value' => $child_value,
'selected' => selected( $child_value, $selected, false ),
'disabled' => isset( $child_item['disabled'] ) ? $child_item['disabled'] : null,
'icon' => isset( $child_item['icon'] ) ? $child_item['icon'] : null,
'group' => $key,
'tooltip' => isset( $child_item['tooltip'] ) ? $child_item['tooltip'] : null,
'class' => 'level-2',
'label' => isset( $child_item['label'] ) ? '- ' . $child_item['label'] : null,
);
$options[] = $this->filter_option( $option_args );
}
$options[] = $this->filter_option( $option_args );

if ( isset( $item['children'] ) ) {
foreach ( $item['children'] as $child_value => $child_item ) {
$option_args = array(
'value' => $child_value,
'selected' => selected( $child_value, $selected, false ),
'disabled' => isset( $child_item['disabled'] ) ? $child_item['disabled'] : null,
'icon' => isset( $child_item['icon'] ) ? $child_item['icon'] : null,
'group' => $key,
'tooltip' => isset( $child_item['tooltip'] ) ? $child_item['tooltip'] : null,
'class' => 'level-2',
'label' => isset( $child_item['label'] ) ? '- ' . $child_item['label'] : null,
);
$options[] = $this->filter_option( $option_args );
}
}
$out = sprintf(
'<select name="%s" class="chosen-select" data-placeholder="%s">%s</select>',
esc_attr( $name ),
// translators: Placeholder refers to the title of the dropdown menu (e.g. "users")
sprintf( esc_attr__( 'Show all %s', 'stream' ), $title ),
implode( '', $options )
);
}
$out = sprintf(
'<select name="%s" class="chosen-select" data-placeholder="%s">%s</select>',
esc_attr( $name ),
// translators: Placeholder refers to the title of the dropdown menu (e.g. "users")
sprintf( esc_attr__( 'Show all %s', 'stream' ), $title ),
implode( '', $options )
);

return $out;
}
Expand Down Expand Up @@ -895,6 +886,7 @@ public function record_actions_form() {
}
echo '</select></div>';
wp_nonce_field( 'stream_record_actions_nonce', 'stream_record_actions_nonce' );
wp_nonce_field( 'stream_filters_user_search_nonce', 'stream_filters_user_search_nonce' );

printf( '<input type="hidden" name="page" value="%s">', esc_attr( wp_stream_filter_input( INPUT_GET, 'page' ) ) );
printf( '<input type="hidden" name="date_predefined" value="%s">', esc_attr( wp_stream_filter_input( INPUT_GET, 'date_predefined' ) ) );
Expand Down
2 changes: 1 addition & 1 deletion classes/class-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Plugin {
*
* @const string
*/
const VERSION = '3.4.2';
const VERSION = '3.4.3';

/**
* WP-CLI command
Expand Down
Loading