Skip to content

Commit

Permalink
Merge pull request #574 from City-of-Helsinki/ASU-X-Login_related_to_…
Browse files Browse the repository at this point in the history
…prod

Asu x login related to prod
  • Loading branch information
tvalimaa authored Jul 4, 2024
2 parents 30492f4 + f5d1612 commit 0433b6b
Show file tree
Hide file tree
Showing 8 changed files with 574 additions and 9 deletions.
4 changes: 4 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"drupal/jquery_ui_slider": "^2.0.0",
"drupal/jquery_ui_touch_punch": "^1.1",
"drupal/key": "^1.17",
"drupal/login_history": "^2.0@alpha",
"drupal/mailsystem": "^4.4",
"drupal/matomo": "^1.23",
"drupal/matomo_reports": "^1.4",
Expand Down Expand Up @@ -140,6 +141,9 @@
"drupal/field_group": {
"Custom patch to add classes for each horizontal tab": "patches/field_group_horizontal_tabs_classes.patch"
},
"drupal/samlauth": {
"https://www.drupal.org/project/samlauth/issues/3424834": "https://git.drupalcode.org/project/samlauth/-/merge_requests/18.patch"
},
"drupal/user_bundle": {
"Custom patch prevents install from dying when trying to edit nonexisting admin configuration file.": "./patches/remove_editing_admin_configuration.patch"
}
Expand Down
76 changes: 69 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ module:
link: 0
linkit: 0
locale: 0
login_history: 0
mailsystem: 0
media: 0
media_entity_file_replace: 0
Expand Down
4 changes: 4 additions & 0 deletions conf/cmi/login_history.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
_core:
default_config_hash: p5ncOe6_Q3Rr8SxJiCA0cDWkbNdaDQqu2419vTBWEPg
langcode: fi
keep_user: 50
16 changes: 16 additions & 0 deletions conf/cmi/ultimate_cron.job.login_history_cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
uuid: 1ec71db1-7e75-46cc-865f-dbfa89aa13d5
status: true
dependencies:
module:
- login_history
title: 'Default cron handler'
id: login_history_cron
weight: 0
module: login_history
callback: login_history_cron
scheduler:
id: simple
launcher:
id: serial
logger:
id: database
Loading

0 comments on commit 0433b6b

Please sign in to comment.