Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

HOTFIX: Isaicp 4124: Display files in custom pages. #1052

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
fd66ae5
ISAICP-4057: Provide an update hook to copy information from solution…
pfrenssen Nov 2, 2017
a1bace2
Update Drupal core + modules.
pfrenssen Nov 3, 2017
7dcc841
Merge branch 'updates' into ISAICP-4057
pfrenssen Nov 3, 2017
63d6da5
Merge remote-tracking branch 'origin/develop' into ISAICP-4057
Nov 3, 2017
f70a603
ISAICP-4057: Included QA remerks. Added update output.
claudiu-cristea Nov 6, 2017
dabfddc
Merge remote-tracking branch 'origin/develop' into ISAICP-4057
claudiu-cristea Nov 6, 2017
10ae160
The stable release of Redirect has not been published in Packagist yet.
pfrenssen Dec 18, 2017
8322c63
Merge pull request #1028 from ec-europa/redirect-missing-tag
brummbar Dec 18, 2017
af00a84
Issue #ISAICP-4239: add patch to restore print of configuration changes.
Dec 18, 2017
e975b22
merge ISAICP-4241 into develop
rvanhoudt Dec 18, 2017
c199fe1
merge ISAICP-4241 into develop
rvanhoudt Dec 18, 2017
cda586a
Merge remote-tracking branch 'origin/develop' into ISAICP-4239
pfrenssen Dec 18, 2017
2773465
ISAICP-4244: Redirect, first stable release.
claudiu-cristea Dec 20, 2017
39d4c6a
Merge pull request #1032 from ec-europa/ISAICP-4244
pfrenssen Dec 20, 2017
637b22d
Merge remote-tracking branch 'origin/develop' into ISAICP-4057
claudiu-cristea Dec 21, 2017
6cf3a66
ISAICP-4057: Sort the use statement lines in joinup_migrate.post_upda…
claudiu-cristea Dec 21, 2017
d49972d
ISAICP-4248: Disable config_readonly during the installation.
pfrenssen Dec 21, 2017
51f04af
Merge pull request #1035 from ec-europa/ISAICP-4248
sandervd Dec 21, 2017
c861d55
Merge pull request #969 from ec-europa/ISAICP-4057
claudiu-cristea Dec 22, 2017
c736047
Merge remote-tracking branch 'origin/master' into develop
pfrenssen Dec 22, 2017
d4d4edd
ISAICP-4231: Update VBO.
idimopoulos Jan 4, 2018
2a2548f
ISAICP-4231: VBO redirect is now stored as a URL object instead of a …
idimopoulos Jan 4, 2018
1b977bf
ISAICP-4231: Use a stable version for VBO.
idimopoulos Jan 4, 2018
2e3de35
Merge pull request #1039 from ec-europa/ISAICP-4231
claudiu-cristea Jan 4, 2018
e2ac45b
Use a more recent database dump.
pfrenssen Jan 5, 2018
ebfff5b
Merge pull request #1041 from ec-europa/update-db-dump
claudiu-cristea Jan 5, 2018
27dcf29
ISAICP-4259: Update dependencies.
pfrenssen Jan 8, 2018
dcca547
Merge pull request #1044 from ec-europa/ISAICP-4259
claudiu-cristea Jan 8, 2018
c585567
ISAICP-4260: Drop cache tables immediately after importing a database…
pfrenssen Jan 8, 2018
a97b340
ISAICP-4260: Use correct terminology.
pfrenssen Jan 9, 2018
2baecdd
ISAICP-4260: Output a message when commencing truncating actions.
pfrenssen Jan 9, 2018
01a3de2
Merge pull request #1047 from ec-europa/ISAICP-4260
brummbar Jan 9, 2018
607138f
Issue #ISAICP-4261: add patch to prevent the wrong browser from start…
Jan 9, 2018
d774f41
Merge pull request #1048 from ec-europa/ISAICP-4261
pfrenssen Jan 9, 2018
f231de1
ISAICP-4258: Update dependencies.
idimopoulos Jan 10, 2018
93a5bce
ISAICP-4258: Provide the og_role tag to the primaryadminactions block.
idimopoulos Jan 10, 2018
cf49571
Merge pull request #1049 from ec-europa/ISAICP-4258
pfrenssen Jan 11, 2018
0762585
ISAICP-4083: Set the expiration date to a week until a proper fix is …
idimopoulos Jan 15, 2018
2f79053
ISAICP-4083: Setting the container as a tag will encapsulate the whol…
idimopoulos Jan 15, 2018
07b8876
Merge pull request #1051 from ec-europa/ISAICP-4083
sandervd Jan 16, 2018
909d826
ISAICP-4124: Ensure that files in custom pages are displayed.
idimopoulos Jan 15, 2018
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
15 changes: 15 additions & 0 deletions build.project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
<echo msg="Loading Amazon S3 list task." />
<taskdef name="s3list" classname="\DrupalProject\Phing\AwsS3ListTask" />

<echo msg="Loading Truncate Cache Tables task." />
<taskdef name="truncatecachetables" classname="\DrupalProject\Phing\TruncateCacheTablesTask" />

<!-- Install the website. -->
<target name="install" depends="writable-settings-folder, writable-settings-php, disable-config-read-only">
<drush
Expand Down Expand Up @@ -180,6 +183,18 @@
verbose="${drush.verbose}">
<option name="file" value="${exports.sql.destination}" />
</drush>
<!-- Make sure to truncate the cache tables immediately after importing.
The dump might contain stale data since we use Redis on production
for caching. -->
<phingcall target="truncate-cache-tables" />
</target>

<target name="truncate-cache-tables">
<echo message="Truncating cache tables." />
<truncatecachetables
url="${drupal.db.dsn}"
userId="${drupal.db.user}"
password="${drupal.db.password}" />
</target>

<target name="restore-databases" depends="restore-mysql-dump, virtuoso-restore-backup" />
Expand Down
3 changes: 2 additions & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ infra.type = joinup
drupal.db.name = db_name
drupal.db.user = db_user
drupal.db.password = db_pass
drupal.db.dsn = ${drupal.db.type}:host=${drupal.db.host};dbname=${drupal.db.name}

# SPARQL database settings.
sparql.host = localhost
Expand Down Expand Up @@ -202,7 +203,7 @@ exports.s3.secret =
# Folder names should end in slashes.
exports.virtuoso.source.folder = joinupv2.0/dumps/prod/virtuoso/full/
exports.virtuoso.destination.folder = ${tmp.dir}/dump-virtuoso/
exports.sql.source = joinupv2.0/dumps/prod/joinup-full-20171103.sql
exports.sql.source = joinupv2.0/dumps/prod/joinup-full-20180105.sql
exports.sql.destination = ${tmp.dir}/dump.sql


Expand Down
24 changes: 13 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"drupal/config_sync": "^1.0-alpha6",
"drupal/config_update": "~1.4",
"drupal/console": "^1.0.1",
"drupal/core": "~8.4@stable",
"drupal/core": "^8.4.4",
"drupal/diff": "^1.0@RC",
"drupal/digital_size_formatter": "^1.0-alpha1",
"drupal/ds": "^3.0",
Expand All @@ -44,7 +44,7 @@
"drupal/piwik_reporting_api": "^1.0-beta2",
"drupal/r4032login": "dev-1.x#391f10d69b9b8c466a2fddac2a6b99f1289e7781",
"drupal/rdf_entity": "dev-pathauto-support",
"drupal/redirect": "dev-8.x-1.x#8.x-1.0",
"drupal/redirect": "^1.0",
"drupal/redis": "^1.0@RC",
"drupal/search_api": "~1.5",
"drupal/search_api_solr": "~1.1",
Expand All @@ -56,7 +56,7 @@
"drupal/token": "~1.0",
"drupal/video_embed_field": "~1.5",
"drupal/view_unpublished": "~1.0@alpha",
"drupal/views_bulk_operations": "dev-1.x#6106b1c7a172d273e0407c49a4c4a8186c929573",
"drupal/views_bulk_operations": "^1.0",
"drush/drush": "dev-updb-use-updatekernel as 9.0.0-rc1",
"easyrdf/easyrdf": "0.10.0-alpha1 as 0.9.2",
"ec-europa/infra": "dev-master",
Expand Down Expand Up @@ -144,13 +144,14 @@
"enable-patching": true,
"composer-exit-on-patch-failure": 1,
"patches": {
"behat/mink-extension": {
"Firefox starts instead of Chrome @see https://github.com/Behat/MinkExtension/pull/311" : "https://patch-diff.githubusercontent.com/raw/Behat/MinkExtension/pull/311.patch"
},
"drupal/core": {
"SQLite database locking errors cause fatal errors @see https://www.drupal.org/node/1120020": "https://www.drupal.org/files/issues/1120020-59.patch",
"Incorrect handling of file upload limit exceeded - file widget disappears, @see https://www.drupal.org/node/1489692": "https://www.drupal.org/files/issues/1489692-93.patch",
"Allow image style to be selected in text editor. @see https://www.drupal.org/node/2061377": "https://www.drupal.org/files/issues/2061377-293-8.4.x-version-of-291.patch",
"Remove cached languages from ContentEntityBase @see https://www.drupal.org/node/2303877": "https://www.drupal.org/files/issues/2303877-22.patch",
"Allow making the file description a required field @see https://www.drupal.org/node/2320877": "https://www.drupal.org/files/issues/2320877-16.patch",
"Duplicate AJAX wrapper around a file field. @see https://www.drupal.org/node/2346893": "https://www.drupal.org/files/issues/duplicate_ajax_wrapper-2346893-194-reroll.patch",
"Help texts do not show in link fields. @see https://www.drupal.org/node/2421001": "https://www.drupal.org/files/issues/2421001-112.patch",
"Duplicate HTML IDs are created for file_managed_file fields @see https://www.drupal.org/node/2497909": "https://www.drupal.org/files/issues/2497909-66.patch",
"Caption element throws TypeError: Cannot read property 'tagName' of null in Drupal.behaviors.filterFilterHtmlUpdating @see https://www.drupal.org/node/2556069": "https://www.drupal.org/files/issues/2556069-38.patch",
Expand All @@ -169,7 +170,8 @@
"Allow username on the registration form @see https://www.drupal.org/project/email_registration/issues/2927109": "https://www.drupal.org/files/issues/2927109-4.patch"
},
"drupal/config_sync": {
"Error after last Drush refactoring @see https://www.drupal.org/project/config_sync/issues/2929952": "https://www.drupal.org/files/issues/2929952-2.patch"
"Error after last Drush refactoring @see https://www.drupal.org/project/config_sync/issues/2929952": "https://www.drupal.org/files/issues/2929952-2.patch",
"Config changes table is not printed anymore @see https://www.drupal.org/project/config_sync/issues/2931084": "https://www.drupal.org/files/issues/2931084-2.patch"
},
"drupal/facets": {
"Facet Summary for Facet Items with a set dependency. @see https://www.drupal.org/node/2873480": "resources/patch/facet_summary_for_facet-2873480-18.patch"
Expand All @@ -187,8 +189,7 @@
"drupal/search_api": {
"Views cached results are not taking into account the access check. @see https://www.drupal.org/node/2824640": "https://www.drupal.org/files/issues/views_cached_results-2824640-13.patch",
"item_id column is too short. @see https://www.drupal.org/node/2829696": "https://www.drupal.org/files/issues/item_id_column_is_too_short-2829696-10-D8.patch",
"Adapt UnsavedIndexConfiguration to #2303877": "resources/patch/serach_api.adapt-to-2303877.patch",
"Drush 9 port of commands @see https://www.drupal.org/node/2914478": "https://www.drupal.org/files/issues/2914478-9.patch"
"Adapt UnsavedIndexConfiguration to #2303877": "resources/patch/serach_api.adapt-to-2303877.patch"
},
"drupal/simplenews": {
"Avoid double sync of fields from subscription to user when user is being saved @see https://www.drupal.org/node/2914814": "https://www.drupal.org/files/issues/2914814-2.patch"
Expand All @@ -202,9 +203,6 @@
"drupal/subpathauto": {
"Redirect module causes redirect back to unaliased path. @see https://www.drupal.org/node/2875026": "https://www.drupal.org/files/issues/2875026-2.patch"
},
"drupal/redirect": {
"Find all redirects given a destination URI @see https://www.drupal.org/node/2884587": "https://www.drupal.org/files/issues/2884587-2.patch"
},
"drupal/social_media_links": {
"Missing config schema for field, widget and formatter @see https://www.drupal.org/node/2898680": "https://www.drupal.org/files/issues/2898680-6.patch",
"Plugins with URL prefix should not allow URLs as user input @see https://www.drupal.org/node/2898726": "https://www.drupal.org/files/issues/2898726-3.patch"
Expand All @@ -218,6 +216,10 @@
}
},
"repositories": [
{
"type": "vcs",
"url": "https://git.drupal.org/project/redirect.git"
},
{
"type": "vcs",
"url": "https://github.com/ec-europa/rdf_entity.git"
Expand Down
Loading