Skip to content

Commit d73da29

Browse files
committed
Open social 1.7
1 parent 0a33f59 commit d73da29

File tree

39 files changed

+2907
-592
lines changed

39 files changed

+2907
-592
lines changed

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ If you want a database dump, here is one: [https://drupalnorge.no/sanitized.db](
1717
Install drupal. You can do this however you want. One way is to use drush:
1818

1919
`drush site-install --db-url=mysql://USER:PASS@HOST/DATABASE`
20+
21+
## Upgrading open social
22+
23+
Refer to this guide: [https://www.drupal.org/docs/8/distributions/open-social/installing-and-updating](https://www.drupal.org/docs/8/distributions/open-social/installing-and-updating)

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"composer/installers": "^v1.4.0",
1010
"drupal-composer/drupal-scaffold": "^2.0.0",
1111
"cweagans/composer-patches": "^1.0",
12-
"goalgorilla/open_social": "1.6.0",
12+
"goalgorilla/open_social": "1.7.0",
1313
"drupal/coffee": "1.x-dev",
1414
"drupal/sparkpost": "2.0-beta1",
1515
"drupal/reroute_email": "1.x-dev",

composer.lock

+506-540
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/block.block.socialbase_local_actions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ dependencies:
55
theme:
66
- socialbase
77
_core:
8-
default_config_hash: g_iQJHOc4hAoQ7TCha7RcvICZ-sj5U8keOEsQYXCBsU
8+
default_config_hash: p5ptEPdCn5SGKsmn9szaZ5cG17TYIZ5U6-YdUuI9c-o
99
id: socialbase_local_actions
1010
theme: socialbase
11-
region: content
11+
region: complementary_top
1212
weight: -18
1313
provider: null
1414
plugin: local_actions_block

config/block.block.socialblue_local_actions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ dependencies:
55
theme:
66
- socialblue
77
_core:
8-
default_config_hash: pVsR7rTbksNB4kDLIOub6wkgtdkK95Tk2Eco9sKbwG4
8+
default_config_hash: O_bSLDdC9WQc1c7MefAGzkqqZ3hM8BWQkNppL3FmtAk
99
id: socialblue_local_actions
1010
theme: socialblue
11-
region: content
11+
region: complementary_top
1212
weight: -18
1313
provider: null
1414
plugin: local_actions_block

config/block.block.socialblue_pagetitleblock_content.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
theme:
99
- socialblue
1010
_core:
11-
default_config_hash: bF2KuP7boy9i2PYD6oM5SvfYM7yKJNAjtyTq8Xmx8XA
11+
default_config_hash: dN1kpIKXkVH9R6WVwZ92MvHSuyDwXgfqTiYw4TKZ7GY
1212
id: socialblue_pagetitleblock_content
1313
theme: socialblue
1414
region: title
@@ -23,6 +23,6 @@ settings:
2323
visibility:
2424
request_path:
2525
id: request_path
26-
pages: '/search/*\r\n/user/*/stream'
26+
pages: "/search/*\r\n/user/*/stream"
2727
negate: true
2828
context_mapping: { }

config/core.entity_form_display.block_content.hero_call_to_action_block.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ content:
6060
type: language_select
6161
weight: 2
6262
region: content
63-
settings: { }
63+
settings:
64+
include_locked: true
6465
third_party_settings: { }
6566
hidden: { }

config/core.entity_form_display.block_content.platform_intro.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ content:
4949
type: language_select
5050
weight: 2
5151
region: content
52-
settings: { }
52+
settings:
53+
include_locked: true
5354
third_party_settings: { }
5455
hidden: { }

config/core.entity_form_display.comment.comment.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ content:
2929
type: language_select
3030
weight: 2
3131
region: content
32-
settings: { }
32+
settings:
33+
include_locked: true
3334
third_party_settings: { }
3435
hidden:
3536
subject: true

config/core.entity_form_display.comment.post_comment.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ content:
2424
type: language_select
2525
weight: 2
2626
region: content
27-
settings: { }
27+
settings:
28+
include_locked: true
2829
third_party_settings: { }
2930
hidden:
3031
author: true

config/core.entity_form_display.font.font.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ content:
3131
langcode:
3232
type: language_select
3333
weight: 2
34-
settings: { }
34+
settings:
35+
include_locked: true
3536
third_party_settings: { }
3637
region: content
3738
name:

config/core.entity_form_display.group.closed_group.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ content:
100100
type: language_select
101101
weight: 2
102102
region: content
103-
settings: { }
103+
settings:
104+
include_locked: true
104105
third_party_settings: { }
105106
path:
106107
type: path

config/core.entity_form_display.group.open_group.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ content:
100100
type: language_select
101101
weight: 2
102102
region: content
103-
settings: { }
103+
settings:
104+
include_locked: true
104105
third_party_settings: { }
105106
path:
106107
type: path

config/core.entity_form_display.group_content.closed_group-group_membership.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ content:
3333
type: language_select
3434
weight: 2
3535
region: content
36-
settings: { }
36+
settings:
37+
include_locked: true
3738
third_party_settings: { }
3839
path:
3940
type: path

config/core.entity_form_display.group_content.open_group-group_membership.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ content:
3333
type: language_select
3434
weight: 2
3535
region: content
36-
settings: { }
36+
settings:
37+
include_locked: true
3738
third_party_settings: { }
3839
path:
3940
type: path

config/core.entity_form_display.node.event.default.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ third_party_settings:
101101
id: attachments
102102
classes: card
103103
_core:
104-
default_config_hash: NX1AjfjjcnXVBHVqwi0C86syJe60c_7THPidEkRRM3g
104+
default_config_hash: sebD4LjqDOF1bHkmqoTJVQlek_9sR_BSxnM7zumMMH8
105105
id: node.event.default
106106
targetEntityType: node
107107
bundle: event
@@ -186,7 +186,8 @@ content:
186186
type: language_select
187187
weight: 2
188188
region: content
189-
settings: { }
189+
settings:
190+
include_locked: true
190191
third_party_settings: { }
191192
path:
192193
type: path
@@ -201,6 +202,13 @@ content:
201202
weight: 6
202203
third_party_settings: { }
203204
region: content
205+
status:
206+
region: content
207+
settings:
208+
display_label: 1
209+
type: boolean_checkbox
210+
weight: 120
211+
third_party_settings: { }
204212
sticky:
205213
type: boolean_checkbox
206214
settings:

config/core.entity_form_display.node.page.default.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ third_party_settings:
6969
id: visibility
7070
classes: 'card '
7171
_core:
72-
default_config_hash: mkwgqbJvrXpKsG7Ml8Y0AIOBsaQgzaNlAypB8vcRTE8
72+
default_config_hash: B5F7vJA2XG_BzpnkqJIBHIix6Qe17-_GrcxObP_AcJw
7373
id: node.page.default
7474
targetEntityType: node
7575
bundle: page
@@ -127,14 +127,22 @@ content:
127127
type: language_select
128128
weight: 2
129129
region: content
130-
settings: { }
130+
settings:
131+
include_locked: true
131132
third_party_settings: { }
132133
path:
133134
type: path
134135
weight: 7
135136
settings: { }
136137
third_party_settings: { }
137138
region: content
139+
status:
140+
region: content
141+
settings:
142+
display_label: 1
143+
type: boolean_checkbox
144+
weight: 120
145+
third_party_settings: { }
138146
title:
139147
type: string_textfield
140148
weight: 1

config/core.entity_form_display.node.topic.default.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ third_party_settings:
7171
id: attachments
7272
classes: 'card '
7373
_core:
74-
default_config_hash: GA-pHDPx5vtmf3emsWiX0FK1TfzzL76cjZ1cqgv7I_8
74+
default_config_hash: 0LFKkBcYbezIqv7vLqYZO2o8XzvbhfPVR7kQXShj388
7575
id: node.topic.default
7676
targetEntityType: node
7777
bundle: topic
@@ -135,14 +135,22 @@ content:
135135
type: language_select
136136
weight: 2
137137
region: content
138-
settings: { }
138+
settings:
139+
include_locked: true
139140
third_party_settings: { }
140141
path:
141142
type: path
142143
weight: 7
143144
settings: { }
144145
third_party_settings: { }
145146
region: content
147+
status:
148+
region: content
149+
settings:
150+
display_label: 1
151+
type: boolean_checkbox
152+
weight: 120
153+
third_party_settings: { }
146154
title:
147155
type: string_textfield
148156
weight: 3

config/core.entity_view_display.node.event.default.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies:
2121
- text
2222
- user
2323
_core:
24-
default_config_hash: Etop2bbIFAH4BH-Dw8UbopVDKwxjkunIwB5wTbDwzXc
24+
default_config_hash: 7DejdxIkoszfsj_kSt-62-RkLFBJXhL9M9b4q7T2zf0
2525
id: node.event.default
2626
targetEntityType: node
2727
bundle: event
@@ -82,3 +82,4 @@ hidden:
8282
field_event_image: true
8383
langcode: true
8484
links: true
85+
private_message_link: true

config/editor.editor.basic_html.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,11 @@ settings:
4545
plugins:
4646
stylescombo:
4747
styles: ''
48-
language:
49-
language_list: un
5048
image_upload:
5149
status: true
52-
scheme: private
50+
scheme: public
5351
directory: inline-images
5452
max_size: ''
5553
max_dimensions:
56-
width: null
57-
height: null
54+
width: 0
55+
height: 0

config/field.field.block_content.hero_call_to_action_block.field_hero_image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
module:
99
- image
1010
_core:
11-
default_config_hash: i-BaHuB0bPB7XiAUCcg65ciAm48O8Q_mJ5d1hqOhrNE
11+
default_config_hash: 9dJ8YW6quwievC6YFiy5yQiRlwnGRWkzcQmG6lG1M3o
1212
id: block_content.hero_call_to_action_block.field_hero_image
1313
field_name: field_hero_image
1414
entity_type: block_content
@@ -21,7 +21,7 @@ default_value: { }
2121
default_value_callback: ''
2222
settings:
2323
file_directory: '[date:custom:Y]-[date:custom:m]'
24-
file_extensions: 'gif jpg jpeg png'
24+
file_extensions: 'png gif jpg jpeg'
2525
max_filesize: '50 MB'
2626
max_resolution: 2048x1080
2727
min_resolution: 200x200

config/field.field.group.closed_group.field_group_image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
module:
99
- image
1010
_core:
11-
default_config_hash: ZtSSwrB4YEakt5irN9ABINkzRXimcsr4vVDgpIDceac
11+
default_config_hash: YOVvPiyj6RoCL-5oNq5HgfV99UAtelrw-cjd7vluLd4
1212
id: group.closed_group.field_group_image
1313
field_name: field_group_image
1414
entity_type: group
@@ -21,7 +21,7 @@ default_value: { }
2121
default_value_callback: ''
2222
settings:
2323
file_directory: '[date:custom:Y]-[date:custom:m]'
24-
file_extensions: 'gif jpg jpeg'
24+
file_extensions: 'png gif jpg jpeg'
2525
max_filesize: ''
2626
max_resolution: 3600x3600
2727
min_resolution: ''

config/field.field.group.open_group.field_group_image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
module:
99
- image
1010
_core:
11-
default_config_hash: 8cN5_XNFi-NYQVLyl54VxY7pgylHwOLDjc1J6-kLgcg
11+
default_config_hash: V1FDPFvf7aypnWVu9xsIgkKKQLHr4dOZOuUbp4thBS0
1212
id: group.open_group.field_group_image
1313
field_name: field_group_image
1414
entity_type: group
@@ -21,7 +21,7 @@ default_value: { }
2121
default_value_callback: ''
2222
settings:
2323
file_directory: '[date:custom:Y]-[date:custom:m]'
24-
file_extensions: 'gif jpg jpeg'
24+
file_extensions: 'png gif jpg jpeg'
2525
max_filesize: ''
2626
max_resolution: 3600x3600
2727
min_resolution: ''

config/field.field.node.event.field_event_date.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ dependencies:
88
module:
99
- datetime
1010
_core:
11-
default_config_hash: Uj_NrdSqOUvu2F3CF8TuPdL5AT0N1ZKASOFU5kmadwA
11+
default_config_hash: pPHPELeLXbiNq458ZjX_PF5-6oEJjCG6vowOqiVjA4g
1212
id: node.event.field_event_date
1313
field_name: field_event_date
1414
entity_type: node
1515
bundle: event
16-
label: 'Start date'
16+
label: Start
1717
description: ''
1818
required: true
1919
translatable: false

config/field.field.node.event.field_event_date_end.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ dependencies:
88
module:
99
- datetime
1010
_core:
11-
default_config_hash: pGqI4eIGYhRmSQdDCdmPGT-55qbOJmJ3xAGGGX_eOKY
11+
default_config_hash: Ne8ZNHPF17tl3ecCJtFonYmWVnrHIvn3yiVJGO604aU
1212
id: node.event.field_event_date_end
1313
field_name: field_event_date_end
1414
entity_type: node
1515
bundle: event
16-
label: 'End date'
16+
label: End
1717
description: ''
1818
required: false
1919
translatable: false

config/field.field.node.event.field_event_image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
module:
99
- image
1010
_core:
11-
default_config_hash: yX39O-N-KywXF5ZhMeQallR9vgQgQv6HtlN9WLP-mo0
11+
default_config_hash: zNKAYlJ4MCUFjAX9RyTGL6wab2LvaCyr9j-zRXv6uGo
1212
id: node.event.field_event_image
1313
field_name: field_event_image
1414
entity_type: node
@@ -21,7 +21,7 @@ default_value: { }
2121
default_value_callback: ''
2222
settings:
2323
file_directory: '[date:custom:Y]-[date:custom:m]'
24-
file_extensions: 'gif jpg jpeg'
24+
file_extensions: 'png gif jpg jpeg'
2525
max_filesize: ''
2626
max_resolution: 4096x4096
2727
min_resolution: ''

config/field.field.node.page.field_page_image.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
module:
99
- image
1010
_core:
11-
default_config_hash: fpOBSoFobDbj9zHoAE-xTQLXIJ-xaPFVeufGklKjJ6g
11+
default_config_hash: 6EhK4Mu7aFWHL1M98zHnZ5CqSVSnsOWZ_SiGjfm884c
1212
id: node.page.field_page_image
1313
field_name: field_page_image
1414
entity_type: node
@@ -21,7 +21,7 @@ default_value: { }
2121
default_value_callback: ''
2222
settings:
2323
file_directory: '[date:custom:Y]-[date:custom:m]'
24-
file_extensions: 'gif jpg jpeg'
24+
file_extensions: 'png gif jpg jpeg'
2525
max_filesize: ''
2626
max_resolution: 4096x4096
2727
min_resolution: ''

0 commit comments

Comments
 (0)