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

Commit

Permalink
Merge pull request #173 from fivejars/master
Browse files Browse the repository at this point in the history
1.6.1 Release
  • Loading branch information
anpolimus authored Dec 22, 2021
2 parents 1bc7d08 + c87a76c commit 840d6ef
Show file tree
Hide file tree
Showing 53 changed files with 1,966 additions and 172 deletions.
3 changes: 3 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Do not merge PR, only review it and approve/request changes.
Merge is allowed by QA Engineer only.

**Related Issue/Ticket:**

**PLEASE CHECK BASE BRANCH FOR YOUR PR**
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Virtual Y is a package for Open Y and consists of features, needed to organize g
Active development is currently happening at [fivejars/openy_gated_content](https://github.com/fivejars/openy_gated_content). Pull requests should be submitted there. They will be pulled into this repo as they are reviewed and released.

## Server requirements
In order to work Virtual Y requires HTTP server to allow
In order to work Virtual Y requires HTTP server to allow
- GET
- POST
- DELETE
Expand Down Expand Up @@ -56,15 +56,15 @@ If you facing with
[error] Configuration <em class="placeholder">user.role.anonymous</em> depends on configuration (<em class="placeholder">rest.resource.openy_gc_auth_custom, rest.resource.openy_gc_auth_custom_confirm</em>) that will not exist after import.
```
It’s looks like that previous updates were failed.
If you dont use Custom auth provider - disable that module and it should help.
If you don't use Custom auth provider - disable that module, and it should help.
If you use it - try manually delete that config and try again
```sh
drush cdel rest.resource.openy_gc_auth_custom_confirm
```

Another one
```
Drupal\Component\Plugin\Exception\PluginNotFoundException while adding Views handlers for field Parts of day on index Default: The "" plugin does not exist. Valid plugin IDs for Drupal\search_api\DataType\DataTypePluginManager are: boolean, date, integer, decimal, string, text in
Drupal\Component\Plugin\Exception\PluginNotFoundException while adding Views handlers for field Parts of day on index Default: The "" plugin does not exist. Valid plugin IDs for Drupal\search_api\DataType\DataTypePluginManager are: boolean, date, integer, decimal, string, text in
```
This error was because one of the service lived in a custom folder.
Try to analyse what service is broken and fix it.
Expand Down
12 changes: 12 additions & 0 deletions assets/css/admin_ui_styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,15 @@
float: left;
width: calc(100% - 40px);
}

#fetched-data tr.new-item {
font-weight: bold;
}

#fetched-data tr.disabled {
opacity: 0.76;
}

.ui-dialog .ui-dialog-titlebar-close.no-close {
display: none;
}
10 changes: 9 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Open Y Virtual Y Content",
"type": "drupal-module",
"require": {
"ymcatwincities/openy": "*",
"ymcatwincities/openy": "9.*",
"drupal/recurring_events": "^2.0@beta",
"ymcatwincities/daxko_sso": "*",
"drupal/jsonapi_image_styles": "^2.0.0",
Expand All @@ -12,6 +12,7 @@
"drupal/date_recur": "^2.0|^3.0",
"drupal/date_recur_modular": "^2.0|^3.0",
"drupal/state_machine": "^1.4",
"drupal/views_data_export": "^1.0",
"ext-json": "*",
"ext-zlib": "*"
},
Expand All @@ -34,6 +35,13 @@
"drupal/jsonapi_image_styles": {
"ParseError: syntax error, unexpected 'EntityTypeManagerInterface' (3229668)": "https://www.drupal.org/files/issues/2021-08-24/3229668-2.patch",
"TypeError: Argument 1 passed to Drupal\\jsonapi_image_styles\\EventSubscriber\\ConfigSubscriber::onResponse() must be an instance of Symfony\\Component\\HttpKernel\\Event\\ResponseEvent (3229545)": "https://git.drupalcode.org/project/jsonapi_image_styles/-/merge_requests/2/diffs.patch"
},
"drupal/core": {
"Enable disabling tableselect element options https://www.drupal.org/i/2895352": "https://www.drupal.org/files/issues/2019-12-03/2895352-42-8.8.x.patch",
"[PRODDEV-484] An error occurs after admin indexes the data https://dgo.to/3138528": "https://www.drupal.org/files/issues/2020-05-21/getentitiestoview_change_the_interface_of_the_first_argument_3138528_3.patch"
},
"drupal/blazy": {
"[PRODDEV-484] An error occurs after admin indexes the data https://dgo.to/3252140": "https://git.drupalcode.org/project/blazy/-/merge_requests/6.diff"
}
},
"patches-ignore": {
Expand Down
4 changes: 4 additions & 0 deletions config/install/openy_gated_content.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,7 @@ top_menu:
background_color_light: '#F2F2F2'
links_color_dark: '#ffffff'
background_color_dark: 'black'
menu_config:
schedule: false
favorites: false
categories: false
16 changes: 16 additions & 0 deletions config/install/openy_gated_content.welcome_email_settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
enabled: 1
email_subject: 'Welcome to Virtual Y!'
email_body: |
<p>Explore your favorite YMCA programs from home or on the go!</p>
<p>Thanks for joining our Virtual Y community. We are excited to have you here. With Virtual Y, you can:</p>
<ul>
<li>check out our latest fitness content, updated weekly</li>
<li>join live events to connect with other members, virtually</li>
<li>save your favorite classes, instructors, and content for easy reference next time.</li>
</ul>
<p>See you online!</p>
<p>Your YMCA team</p>
Loading

0 comments on commit 840d6ef

Please sign in to comment.