Skip to content

Commit

Permalink
Merge pull request #333 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
hyrsky authored Sep 4, 2024
2 parents aee6a44 + 357a585 commit 9243019
Show file tree
Hide file tree
Showing 12 changed files with 151 additions and 296 deletions.
2 changes: 1 addition & 1 deletion .platform/schema
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7
8
48 changes: 0 additions & 48 deletions azure-pipelines-devtest.yml

This file was deleted.

47 changes: 0 additions & 47 deletions azure-pipelines-stageprod.yml

This file was deleted.

47 changes: 0 additions & 47 deletions azure-pipelines-test.yml

This file was deleted.

2 changes: 0 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
"drupal/paragraphs_asymmetric_translation_widgets": "^1.0",
"drupal/password_policy": "^4.0",
"drupal/pathauto": "^1.9",
"drupal/purge": "^3.2",
"drupal/queue_ui": "^3.0",
"drupal/raven": "^4.0",
"drupal/readonly_field_widget": "^1.4",
Expand All @@ -74,7 +73,6 @@
"drupal/subrequests": "^3.0",
"drupal/token_filter": "^2.0",
"drupal/ultimate_cron": "^2.0@alpha",
"drupal/varnish_purge": "^2.1",
"drupal/webform_rest": "^4.0",
"drupal/yoast_seo": "^2.0@alpha",
"drush/drush": "^12",
Expand Down
144 changes: 12 additions & 132 deletions composer.lock

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

16 changes: 1 addition & 15 deletions conf/cmi/language/tr/user.mail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,7 @@ register_admin_created:
-- [site:name] team
register_no_approval_required:
subject: 'Account details for [user:display-name] at [site:name]'
body: |-
[user:display-name],
Thank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:
[user:one-time-login-url]
This link can only be used once to log in and will lead you to a page where you can set your password.
After setting your password, you will be able to log in at [site:login-url] in the future using:
username: [user:name]
password: Your password
-- [site:name] team
body: "[user:display-name],\r\n\r\n[site:name] sitesine kaydolduğunuz için teşekkür ederiz. Şimdi aşağıdaki bağlantıya tıklayarak veya kopyalayıp tarayıcınıza yapıştırarak giriş yapabilirsiniz:\r\n\r\n[user:one-time-login-url]\r\n\r\nBu bağlantı giriş yapmak için yalnızca bir defa kullanılabilir ve sizi parolanızı belirleyebileceğiniz bir sayfaya götürecektir.\r\n\r\nParolanızı belirledikten sonra, aşağıdaki bilgileri kullanarak [site:login-url] adresinden giriş yapabilirsiniz:\r\n\r\nkullanıcı adı: [user:name]\r\nparola: Parolanız\r\n\r\n-- [site:name] ekibi"
register_pending_approval:
subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n-- [site:name] team"
Expand Down
Loading

0 comments on commit 9243019

Please sign in to comment.