Skip to content

Commit

Permalink
Merge branch 'master' into fix-264-remove-vary-cache-on-function
Browse files Browse the repository at this point in the history
  • Loading branch information
philipjohn committed Jun 5, 2018
2 parents 5ccdbcd + 691d6c0 commit de1ddcf
Show file tree
Hide file tree
Showing 199 changed files with 20,789 additions and 6,833 deletions.
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["env","react"],
"plugins": ["transform-object-rest-spread", "transform-object-assign"]
}
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,10 @@ charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{js,json,scss,css}]
indent_style = space
indent_size = tab
tab_width = 2

[*.md]
trim_trailing_whitespace = false
24 changes: 24 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"extends": [
"airbnb-base",
"plugin:react/recommended"
],
"plugins": [
"jest",
"react"
],
"globals": {
"__DEV__": true,
"__TEST__": true
},
"env": {
"browser": true,
"node": true,
"jest/globals": true
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
}
}
}
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
.DS_Store
node_modules/
dist/
npm-debug.log
yarn-error.log

.svn
composer.lock
vendor/

# Editor directories and files
.idea
*.suo
*.ntvs*
*.njsproj
*.sln

7 changes: 0 additions & 7 deletions .jshintignore

This file was deleted.

18 changes: 0 additions & 18 deletions .jshintrc

This file was deleted.

79 changes: 79 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"plugins": [
"stylelint-scss"
],
"rules": {
"string-quotes": "double",
"color-hex-case": "lower",
"color-hex-length": "short",
"color-no-invalid-hex": true,
"number-leading-zero": never,
"number-no-trailing-zeros": true,
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-whitespace-after": "always",
"value-no-vendor-prefix": true,
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"block-closing-brace-newline-after": [
"always", {
"ignoreAtRules": [ "if", "else", "elseif" ]
}
],
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-list-comma-space-before": "never",
"selector-pseudo-element-colon-notation": "double",
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-trailing-semicolon": "always",
"declaration-block-no-duplicate-properties": true,
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-newline-after": "always-multi-line",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"media-feature-parentheses-space-inside": "never",
"at-rule-empty-line-before": [ "always", {
except: [
"blockless-after-blockless",
"blockless-after-same-name-blockless",
"first-nested",
],
ignore: ["after-comment"],
"ignoreAtRules": [ "else", "elseif" ]
} ],
"indentation": 2,
"max-empty-lines": 1,
"no-missing-end-of-source-newline": true,
"comment-empty-line-before": [ "always", {
ignore: ["stylelint-commands"]
} ],
"comment-whitespace-inside": "always",
"scss/at-else-closing-brace-newline-after": "always-last-in-chain",
"scss/at-else-closing-brace-space-after": "always-intermediate",
"scss/at-else-empty-line-before": "never",
"scss/at-if-closing-brace-newline-after": "always-last-in-chain",
"scss/at-if-closing-brace-space-after": "always-intermediate"
}
}
77 changes: 65 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,71 @@
# This sudo thingy here will make sure that PHP 5.2 tests actually run on Travis
sudo: false

language: php

php:
- 5.2
- 5.3
- 5.4
cache:
apt: true
yarn: true
directories:
- $HOME/.composer/cache/files
- $HOME/.yarn/node_modules
- node_modules

matrix:
include:
# aliased to a recent 5.6.x version
- php: '5.6'
env:
#- SNIFF=1
- WP_VERSION=latest
- WP_MULTISITE=0
- php: '5.6'
env:
#- SNIFF=1
- WP_VERSION=latest
- WP_MULTISITE=1
# aliased to a recent 7.x version
- php: '7.0'
env: WP_VERSION=latest
# aliased to a recent hhvm version
- php: 'hhvm'
env: WP_VERSION=latest

env:
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=1
allow_failures:
- php: 'hhvm'

before_script:
- bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
# Set up CodeSniffer
- export PHPCS_DIR=/tmp/phpcs
- export SNIFFS_DIR=/tmp/sniffs
# Install CodeSniffer for WordPress Coding Standards checks.
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
# Install WordPress Coding Standards.
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $SNIFFS_DIR; fi
# Install PHP Compatibility sniffs.
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git $SNIFFS_DIR/PHPCompatibility; fi
# Set install path for PHPCS sniffs.
# @link https://github.com/squizlabs/PHP_CodeSniffer/blob/4237c2fc98cc838730b76ee9cee316f99286a2a7/CodeSniffer.php#L1941
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs --config-set installed_paths $SNIFFS_DIR; fi
# After CodeSniffer install you should refresh your path.
- if [[ "$SNIFF" == "1" ]]; then phpenv rehash; fi
# Set up unit tests
- bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
# Install npm modules
- yarn

script: phpunit
script:
# Search for PHP syntax errors.
- find -L . -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l
# WordPress Coding Standards.
# @link https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards
# @link http://pear.php.net/package/PHP_CodeSniffer/
# -p flag: Show progress of the run.
# -s flag: Show sniff codes in all reports.
# -v flag: Print verbose output.
# -n flag: Do not print warnings. (shortcut for --warning-severity=0)
# --standard: Use WordPress as the standard.
# --extensions: Only sniff PHP files.
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs -p -s -v -n . --standard="WordPress-VIP" --extensions=php; fi
# Run unit tests
- phpunit
# Run linting
- npm run lint-scripts
- npm run lint-styles
142 changes: 142 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
# Changelog

## 1.8.2

* Fix issue with time format (#424)
* Adds check around the jetpack is_mobile flag (#428)
* Restore current user back in to localised scripts (#430)
* Cast liveblog rewrite version before checks (#439)
* Document the minimum PHP version (#447)
* Fix bug where pagination did not update (#433)
* Fix GMT offsets in entry times (#432)

props [justnorris](https://github.com/justnorris), [mjangda](https://github.com/mjangda), [paulschreiber](https://github.com/paulschreiber), [philipjohn](https://github.com/philipjohn), [scottblackburn](https://github.com/scottblackburn)

## 1.8.1

* Fix bug with changing contributors
* Fix multiple PHP Coding Standards issues

props [paulschreiber](https://github.com/paulschreiber)

## 1.8

* New: Allow multiple authors for each Liveblog entry
* New: Entries no longer have to have an author
* New: Share entries with entry-specific permalinks
* New: Media library integration in the entry editor
* New: Edit entry HTML within the editor
* Fixed: Bug with some installs using the correct REST API base URL
* Fixed: Various coding standards issues

props [jasonagnew](https://github.com/), [liam-defty](https://github.com/liam-defty), [paulschreiber](https://github.com/paulschreiber), [philipjohn](https://github.com/philipjohn), [sboisvert](https://github.com/sboisvert)

## 1.7.1

* Fix bug with REST endpoints in Multisite (props justnorris)
* Fix for some failing unit tests due to core changes (props jasonagnew)
* Fix for bug where shortcodes would be removed completely (props jasonagnew)
* Fixed some pagination issues in relatively unique circumstances (props liam-defty)
* Fixed a bug that failed to correctly handle avatars (props liam-defty)
* Made sure we handle timezones in entries properly (props liam-defty)

## 1.7

* New: Mobile-friendly React-based frontend UI for a better editing experience across devices. (props jagnew jrmd liam-defty)
* Various UI bugfixes thanks to the new frontend.
* Fix for incorrect use of `defined()` (props kevinfodness)

## 1.6.1

* Remove support for Flash + Silverlight which are no longer supported in WP 4.9, see https://core.trac.wordpress.org/ticket/41755#no0
* Bugfix for WPCOM: Don't force an AJAX URL if we're using the REST API.
* Bugfix WPCOM: Retain SA access for A12s

## 1.6

* REST API support
* Performance improvements to lazy loading
* Auto-archiving of Liveblogs
* Removed copied core functions
* Improved test coverage
* Bugfix for edited comments appearing on archived Liveblogs
* Bugfix for multiple edits issue
* Bugfix for deleted key events appearing after edits
* Bugfix for shortcodes within key events
* Bugfix to allow editing entries more than once

Thanks to Mo Jangda, Jason Agnew, Max Katz, Olly Warren, Rebecca Hum, Travis W

## 1.5

* New "Key Events" feature
* New "Lazyloading" feature
* Improved escaping

People who helped make this happen: Jason Agnew, Josh Betz, Sarah Blackstock, Stephane Boisvert, Ian Dunn, Scott Evans, Thorsten Frommen, Mark Goodyear, Chris Hardie, Philip John, Paul Kevan, Connor Parks

## 1.4.1

* Bump tested tag to 4.2.2.
* Added Composer support!

## 1.4

* Rich-text editing!
* Archived liveblogs now display in chronological order (live ones show reverse chron)
* New and udpated translations
* Bump to fix SVN sync issues (thanks @kevinlisota)

## 1.3.1

* Fixed a bug where liveblog would show up in secondary loops

## 1.3

**The liveblog plugin now requires WordPress 3.5.**

New functionality:

* Liveblog archiving
* Shows automatically new entries, with a slick notification bar if we have scrolled out of view. With the help of [@borkweb](https://github.com/borkweb) and [@zbtirrell](https://github.com/zbtirrell)
* Front-end editing
* Pasting an image URL embeds the image

Translations:

* German by [@cfoellmann](https://github.com/cfoellmann)
* Spanish by [@elarequi](http://profiles.wordpress.org/elarequi)

Also a lot of internal improvements and bug fixes. See the [full list of
closed issues](https://github.com/Automattic/liveblog/issues?milestone=3&state=closed).

## 1.2

New functionality:

* Introduce many new hooks and filters, which help customization without changing the plugin code.
* Allow shortcodes and OEmbed in liveblog entries
* Translations:
- Spanish by [@elarequi](http://profiles.wordpress.org/elarequi)
- Dutch by [@defries](https://github.com/defries)
- Catalan by [@gasparappa](https://github.com/gasparappa)
- German by [@cfoellmann](https://github.com/cfoellmann)
* Add github-friendly version of `readme.txt`
* Optimize PNG files

Fixed problems:

* Fix JavaScript errors on IE8, props [@pippercameron](https://github.com/pippercameron)
* Fix preview tab
* Compatibility with plupload 1.5.4, props [@borkweb](https://github.com/borkweb)

## 1.1

* Backwards compatibility for 3.4
* Support for non-pretty permalinks
* Support for permalinks without trailing slashes
* Fix preview tab

## 1.0

* Initial release
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ Perhaps someone has [already contributed something](https://github.com/Automatti
1. Create a feature branch, with clear naming (e.g. `feature/doge-everywhere`)
1. When you're done, submit a pull request to merge your feature branch into master
1. Sit back and await review/feedback (note: could take a long time - we're [busy people](https://automattic.com/work-with-us)!)

Loading

0 comments on commit de1ddcf

Please sign in to comment.