Install, enable and configure Diff module
This commit is contained in:
parent
2b4e729c79
commit
c9e89e21eb
8 changed files with 317 additions and 3 deletions
|
@ -36,7 +36,8 @@
|
||||||
"drupal/regionincontent": "1.x-dev",
|
"drupal/regionincontent": "1.x-dev",
|
||||||
"drupal/indieweb": "1.x-dev",
|
"drupal/indieweb": "1.x-dev",
|
||||||
"drupal/google_analytics": "^2.3",
|
"drupal/google_analytics": "^2.3",
|
||||||
"drupal/honeypot": "^1.29"
|
"drupal/honeypot": "^1.29",
|
||||||
|
"drupal/diff": "^1.0@RC"
|
||||||
},
|
},
|
||||||
"repositories": {
|
"repositories": {
|
||||||
"drupal": {
|
"drupal": {
|
||||||
|
|
232
composer.lock
generated
232
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "15722167e54b17f940ececf731d01fa8",
|
"content-hash": "205161d0ceaf6aa5a1df700f94903740",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "asm89/stack-cors",
|
"name": "asm89/stack-cors",
|
||||||
|
@ -408,6 +408,62 @@
|
||||||
],
|
],
|
||||||
"time": "2017-04-04T11:38:05+00:00"
|
"time": "2017-04-04T11:38:05+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "caxy/php-htmldiff",
|
||||||
|
"version": "v0.1.7",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/caxy/php-htmldiff.git",
|
||||||
|
"reference": "48c70a963e803b93fe68a191e62d0770b5446f0b"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/caxy/php-htmldiff/zipball/48c70a963e803b93fe68a191e62d0770b5446f0b",
|
||||||
|
"reference": "48c70a963e803b93fe68a191e62d0770b5446f0b",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ezyang/htmlpurifier": "^4.7",
|
||||||
|
"php": ">=5.3.3",
|
||||||
|
"sunra/php-simple-html-dom-parser": "^1.5"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"doctrine/cache": "~1.0",
|
||||||
|
"phpunit/phpunit": "~5.0"
|
||||||
|
},
|
||||||
|
"suggest": {
|
||||||
|
"doctrine/cache": "Used for caching the calculated diffs using a Doctrine Cache Provider"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-master": "0.1.x-dev"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"Caxy\\HtmlDiff": "lib/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"GPL-2.0"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Josh Schroeder",
|
||||||
|
"email": "jschroeder@caxy.com",
|
||||||
|
"homepage": "http://www.caxy.com"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "A library for comparing two HTML files/snippets and highlighting the differences using simple HTML.",
|
||||||
|
"homepage": "https://github.com/caxy/php-htmldiff",
|
||||||
|
"keywords": [
|
||||||
|
"diff",
|
||||||
|
"html"
|
||||||
|
],
|
||||||
|
"time": "2018-03-15T21:23:44+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "cebe/markdown",
|
"name": "cebe/markdown",
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
|
@ -3999,6 +4055,92 @@
|
||||||
"source": "http://cgit.drupalcode.org/default_content"
|
"source": "http://cgit.drupalcode.org/default_content"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "drupal/diff",
|
||||||
|
"version": "1.0.0-rc2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.drupal.org/project/diff",
|
||||||
|
"reference": "8.x-1.0-rc2"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://ftp.drupal.org/files/projects/diff-8.x-1.0-rc2.zip",
|
||||||
|
"reference": "8.x-1.0-rc2",
|
||||||
|
"shasum": "2e8f4efe6e7d355a3d07d33531f077348b13f68d"
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"drupal/core": "~8.0",
|
||||||
|
"mkalkbrenner/php-htmldiff-advanced": "~0.0.8"
|
||||||
|
},
|
||||||
|
"type": "drupal-module",
|
||||||
|
"extra": {
|
||||||
|
"branch-alias": {
|
||||||
|
"dev-1.x": "1.x-dev"
|
||||||
|
},
|
||||||
|
"drupal": {
|
||||||
|
"version": "8.x-1.0-rc2",
|
||||||
|
"datestamp": "1530178424",
|
||||||
|
"security-coverage": {
|
||||||
|
"status": "not-covered",
|
||||||
|
"message": "RC releases are not covered by Drupal security advisories."
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packages.drupal.org/8/downloads",
|
||||||
|
"license": [
|
||||||
|
"GPL-2.0+"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Miro Dietiker (miro_dietiker)",
|
||||||
|
"homepage": "https://www.drupal.org/u/miro_dietiker",
|
||||||
|
"role": "Maintainer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Juampy NR (juampynr)",
|
||||||
|
"homepage": "https://www.drupal.org/u/juampynr",
|
||||||
|
"role": "Maintainer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Lucian Hangea (lhangea)",
|
||||||
|
"homepage": "https://www.drupal.org/u/lhangea",
|
||||||
|
"role": "Maintainer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Alan D.",
|
||||||
|
"homepage": "https://www.drupal.org/u/alan-d.",
|
||||||
|
"role": "Maintainer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Brian Gilbert (realityloop).",
|
||||||
|
"homepage": "https://www.drupal.org/u/realityloop",
|
||||||
|
"role": "Maintainer"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "miro_dietiker",
|
||||||
|
"homepage": "https://www.drupal.org/user/227761"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "realityloop",
|
||||||
|
"homepage": "https://www.drupal.org/user/139189"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "rötzi",
|
||||||
|
"homepage": "https://www.drupal.org/user/73064"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "yhahn",
|
||||||
|
"homepage": "https://www.drupal.org/user/264833"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Compares two entity revisions",
|
||||||
|
"homepage": "https://www.drupal.org/project/diff",
|
||||||
|
"support": {
|
||||||
|
"source": "http://cgit.drupalcode.org/diff",
|
||||||
|
"issues": "https://www.drupal.org/project/issues/diff"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "drupal/drutopia_action",
|
"name": "drupal/drutopia_action",
|
||||||
"version": "1.0.0-beta1",
|
"version": "1.0.0-beta1",
|
||||||
|
@ -9521,6 +9663,43 @@
|
||||||
],
|
],
|
||||||
"time": "2018-08-24T14:47:04+00:00"
|
"time": "2018-08-24T14:47:04+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "mkalkbrenner/php-htmldiff-advanced",
|
||||||
|
"version": "0.0.8",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/mkalkbrenner/php-htmldiff.git",
|
||||||
|
"reference": "3a714b48c9c3d3730baaf6d3949691e654cd37c9"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/mkalkbrenner/php-htmldiff/zipball/3a714b48c9c3d3730baaf6d3949691e654cd37c9",
|
||||||
|
"reference": "3a714b48c9c3d3730baaf6d3949691e654cd37c9",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"caxy/php-htmldiff": ">=0.0.6",
|
||||||
|
"php": ">=5.5.0"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"files": [
|
||||||
|
"src/HtmlDiffAdvancedInterface.php",
|
||||||
|
"src/HtmlDiffAdvanced.php"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"GNU General Public License V2"
|
||||||
|
],
|
||||||
|
"description": "An add-on for the php-htmldiff library for comparing two HTML files/snippets and highlighting the differences using simple HTML.",
|
||||||
|
"homepage": "https://github.com/mkalkbrenner/php-htmldiff",
|
||||||
|
"keywords": [
|
||||||
|
"diff",
|
||||||
|
"html"
|
||||||
|
],
|
||||||
|
"time": "2016-07-25T17:07:32+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "nikic/php-parser",
|
"name": "nikic/php-parser",
|
||||||
"version": "v4.1.1",
|
"version": "v4.1.1",
|
||||||
|
@ -10156,6 +10335,54 @@
|
||||||
],
|
],
|
||||||
"time": "2017-11-18T14:57:29+00:00"
|
"time": "2017-11-18T14:57:29+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "sunra/php-simple-html-dom-parser",
|
||||||
|
"version": "v1.5.2",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/sunra/php-simple-html-dom-parser.git",
|
||||||
|
"reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/sunra/php-simple-html-dom-parser/zipball/75b9b1cb64502d8f8c04dc11b5906b969af247c6",
|
||||||
|
"reference": "75b9b1cb64502d8f8c04dc11b5906b969af247c6",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-mbstring": "*",
|
||||||
|
"php": ">=5.3.2"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-0": {
|
||||||
|
"Sunra\\PhpSimple\\HtmlDomParser": "Src/"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Sunra",
|
||||||
|
"email": "sunra@yandex.ru",
|
||||||
|
"homepage": "https://github.com/sunra"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "S.C. Chen",
|
||||||
|
"homepage": "http://sourceforge.net/projects/simplehtmldom/"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Composer adaptation of: A HTML DOM parser written in PHP5+ let you manipulate HTML in a very easy way! Require PHP 5+. Supports invalid HTML. Find tags on an HTML page with selectors just like jQuery. Extract contents from HTML in a single line.",
|
||||||
|
"homepage": "https://github.com/sunra/php-simple-html-dom-parser",
|
||||||
|
"keywords": [
|
||||||
|
"dom",
|
||||||
|
"html",
|
||||||
|
"parser"
|
||||||
|
],
|
||||||
|
"time": "2016-11-22T22:57:47+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony-cmf/routing",
|
"name": "symfony-cmf/routing",
|
||||||
"version": "1.4.1",
|
"version": "1.4.1",
|
||||||
|
@ -12260,7 +12487,8 @@
|
||||||
"drupal/ui_patterns": 5,
|
"drupal/ui_patterns": 5,
|
||||||
"drupal/customerror": 20,
|
"drupal/customerror": 20,
|
||||||
"drupal/regionincontent": 20,
|
"drupal/regionincontent": 20,
|
||||||
"drupal/indieweb": 20
|
"drupal/indieweb": 20,
|
||||||
|
"drupal/diff": 5
|
||||||
},
|
},
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"prefer-lowest": false,
|
"prefer-lowest": false,
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
uuid: 6ae661c4-1aeb-4d9b-bd13-14f7ed744351
|
||||||
|
langcode: en
|
||||||
|
status: true
|
||||||
|
dependencies:
|
||||||
|
module:
|
||||||
|
- diff
|
||||||
|
id: config_sync.module.diff
|
||||||
|
snapshotSet: config_sync
|
||||||
|
extensionType: module
|
||||||
|
extensionName: diff
|
||||||
|
items:
|
||||||
|
-
|
||||||
|
collection: ''
|
||||||
|
name: core.entity_view_mode.node.diff
|
||||||
|
data:
|
||||||
|
langcode: en
|
||||||
|
id: node.diff
|
||||||
|
label: 'Revision comparison'
|
||||||
|
status: false
|
||||||
|
cache: true
|
||||||
|
targetEntityType: node
|
||||||
|
dependencies:
|
||||||
|
module:
|
||||||
|
- node
|
||||||
|
enforced:
|
||||||
|
module:
|
||||||
|
- node
|
||||||
|
- diff
|
||||||
|
-
|
||||||
|
collection: ''
|
||||||
|
name: diff.settings
|
||||||
|
data:
|
||||||
|
general_settings:
|
||||||
|
radio_behavior: simple
|
||||||
|
context_lines_leading: 1
|
||||||
|
context_lines_trailing: 1
|
||||||
|
revision_pager_limit: 50
|
||||||
|
layout_plugins:
|
||||||
|
visual_inline:
|
||||||
|
enabled: false
|
||||||
|
weight: 0
|
||||||
|
split_fields:
|
||||||
|
enabled: true
|
||||||
|
weight: 1
|
||||||
|
unified_fields:
|
||||||
|
enabled: true
|
||||||
|
weight: 2
|
||||||
|
visual_inline_theme: default
|
16
config/sync/core.entity_view_mode.node.diff.yml
Normal file
16
config/sync/core.entity_view_mode.node.diff.yml
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
uuid: 316215b0-93fc-49d9-a1f0-e0ea02dcb966
|
||||||
|
langcode: en
|
||||||
|
status: false
|
||||||
|
dependencies:
|
||||||
|
enforced:
|
||||||
|
module:
|
||||||
|
- node
|
||||||
|
- diff
|
||||||
|
module:
|
||||||
|
- node
|
||||||
|
_core:
|
||||||
|
default_config_hash: pqZNtad5J9THcdbYjwPD4qINqvrTxnOd8KCWn6tUBRs
|
||||||
|
id: node.diff
|
||||||
|
label: 'Revision comparison'
|
||||||
|
targetEntityType: node
|
||||||
|
cache: true
|
18
config/sync/diff.settings.yml
Normal file
18
config/sync/diff.settings.yml
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
general_settings:
|
||||||
|
radio_behavior: simple
|
||||||
|
context_lines_leading: 1
|
||||||
|
context_lines_trailing: 1
|
||||||
|
revision_pager_limit: 50
|
||||||
|
layout_plugins:
|
||||||
|
visual_inline:
|
||||||
|
enabled: true
|
||||||
|
weight: 0
|
||||||
|
split_fields:
|
||||||
|
enabled: true
|
||||||
|
weight: 1
|
||||||
|
unified_fields:
|
||||||
|
enabled: true
|
||||||
|
weight: 2
|
||||||
|
visual_inline_theme: default
|
||||||
|
_core:
|
||||||
|
default_config_hash: oXwX3NzLv9QK_LbNEvpQ9OPwH9tqtMSJzq5y8t63Q8w
|
|
@ -43,4 +43,5 @@ permissions:
|
||||||
- 'use exclude node title'
|
- 'use exclude node title'
|
||||||
- 'use text format minimalhtml'
|
- 'use text format minimalhtml'
|
||||||
- 'use text format minimalhtmltitle'
|
- 'use text format minimalhtmltitle'
|
||||||
|
- 'view blog revisions'
|
||||||
- 'view the administration theme'
|
- 'view the administration theme'
|
||||||
|
|
|
@ -56,6 +56,7 @@ permissions:
|
||||||
- 'use text format minimalhtmltitle'
|
- 'use text format minimalhtmltitle'
|
||||||
- 'use text format restricted_html'
|
- 'use text format restricted_html'
|
||||||
- 'view all revisions'
|
- 'view all revisions'
|
||||||
|
- 'view blog revisions'
|
||||||
- 'view event revisions'
|
- 'view event revisions'
|
||||||
- 'view own unpublished content'
|
- 'view own unpublished content'
|
||||||
- 'view the administration theme'
|
- 'view the administration theme'
|
||||||
|
|
|
@ -69,6 +69,7 @@ permissions:
|
||||||
- 'use text format minimalhtmltitle'
|
- 'use text format minimalhtmltitle'
|
||||||
- 'use text format restricted_html'
|
- 'use text format restricted_html'
|
||||||
- 'view all revisions'
|
- 'view all revisions'
|
||||||
|
- 'view blog revisions'
|
||||||
- 'view event revisions'
|
- 'view event revisions'
|
||||||
- 'view own unpublished content'
|
- 'view own unpublished content'
|
||||||
- 'view the administration theme'
|
- 'view the administration theme'
|
||||||
|
|
Loading…
Reference in a new issue