Skip to content

Commit 940035e

Browse files
committed
Merge branch 'master' of github.com:OS2web/os2web8
2 parents 2d9e0de + c456dfe commit 940035e

File tree

358 files changed

+43003
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+43003
-64
lines changed

composer.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
},
4646
{
4747
"type": "composer",
48-
"url": "https://packages.drupal.org/8"
48+
"url": "https://packages.drupal.org/8",
49+
"exclude": ["drupal/anonymous_subscriptions"]
4950
},
5051
{
5152
"type": "vcs",
@@ -76,6 +77,10 @@
7677
"reference": "8.x-1.x"
7778
}
7879
}
80+
},
81+
{
82+
"type": "vcs",
83+
"url": "https://github.com/bellcom/anonymous_subscriptions"
7984
}
8085
],
8186
"require": {
@@ -84,7 +89,7 @@
8489
"composer/installers": "^1.2",
8590
"cweagans/composer-patches": "^1.6.5",
8691
"drupal/access_latest": "^0.0.1",
87-
"drupal/anonymous_subscriptions": "1.x-dev@dev",
92+
"drupal/anonymous_subscriptions": "dev-8.x-1.x",
8893
"drupal/ckeditor_balloonpanel": "1.x-dev@dev",
8994
"drupal/ckeditor_iframe": "^2.1",
9095
"drupal/coder": "^8.3",
@@ -120,6 +125,7 @@
120125
"os2web/os2web": "dev-master",
121126
"os2web/os2web_banner": "dev-master",
122127
"os2web/os2web_borgerdk": "dev-master",
128+
"os2web/os2web_citizen_proposals": "dev-master",
123129
"os2web/os2web_embedded_code": "^0.0.1",
124130
"os2web/os2web_events": "dev-master",
125131
"os2web/os2web_hearings": "dev-master",
@@ -131,6 +137,7 @@
131137
"os2web/os2web_meetings_edoc_fujitsu": "dev-master",
132138
"os2web/os2web_meetings_sbsys": "dev-master",
133139
"os2web/os2web_news": "dev-master",
140+
"os2web/os2web_newsletter": "dev-master",
134141
"os2web/os2web_pagebuilder": "dev-master",
135142
"os2web/os2web_person_information": "dev-master",
136143
"os2web/os2web_postlister": "dev-master",
@@ -195,6 +202,9 @@
195202
"drupal/textfield_counter" : {
196203
"Fix scrolltop prevent" : "./patches/textfield_counter-scrolltop-fix.patch"
197204
},
205+
"drupal/easy_breadcrumb" : {
206+
"Fix frontpage page as part of the breadcrumb path" : "./patches/easy-breadcrumb-include-frontpage.patch"
207+
},
198208
"drupal/field_group": {
199209
"HTML5 Validation Prevents Submission in Tabs" : "https://www.drupal.org/files/issues/2019-10-04/field_group-HTML5_validation_prevents_submission_in_tabs-2969051-9.patch"
200210
},

composer.lock

Lines changed: 102 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/EasyBreadcrumbBuilder.php b/src/EasyBreadcrumbBuilder.php
2+
index 91cdf2f..64e8243 100644
3+
--- a/src/EasyBreadcrumbBuilder.php
4+
+++ b/src/EasyBreadcrumbBuilder.php
5+
@@ -832,7 +832,7 @@ class EasyBreadcrumbBuilder implements BreadcrumbBuilderInterface {
6+
7+
// Find the system path by resolving aliases, language prefix, etc.
8+
$processed = $this->pathProcessor->processInbound($path, $request);
9+
- if (empty($processed) || !empty($exclude[$processed])) {
10+
+ if ((empty($processed) || !empty($exclude[$processed])) && $this->config->get(EasyBreadcrumbConstants::INCLUDE_HOME_SEGMENT)) {
11+
12+
// This resolves to the front page, which we already add.
13+
return NULL;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules/

0 commit comments

Comments
 (0)