gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17
22937 commits 21 branches 90 tags 309 MiB
Commit graph

107 commits

Author SHA1 Message Date
KMY
5979c0ea1d Merge remote-tracking branch 'parent/main' into upstream-20240310 2025-03-10 19:58:05 +09:00
Claire
5a100bf38f
Add ability to email announcements to all users (#33928) 2025-03-06 14:05:27 +00:00
KMY
d35fa72842 Merge remote-tracking branch 'parent/main' into upstream-20240109 2025-01-09 13:20:56 +09:00
Matt Jankowski
ef39398b82
Add urgent scope and by_version method to SoftwareUpdate (#33470) 2025-01-06 18:23:57 +00:00
KMY
3784ad273c Merge remote-tracking branch 'parent/main' into upstream-20241216 2024-12-16 10:14:31 +09:00
Eugen Rochko
30aa0df88c
Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
KMY
66bed31dbe Merge remote-tracking branch 'parent/main' into upstream-20241006 2024-10-05 09:10:58 +09:00
Matt Jankowski
ebdeac0731
Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-04 14:15:14 +00:00
KMY
c905714459 Merge remote-tracking branch 'parent/main' into upstream-20240926 2024-09-26 08:29:41 +09:00
Matt Jankowski
83574f641a
Add coverage and use mailer callback to check functional user in notification mailer (#32055) 2024-09-25 08:07:48 +00:00
Matt Jankowski
19dedd7cfd
Set important mailer headers with after_action callback (#32057) 2024-09-24 13:16:31 +00:00
Matt Jankowski
2946a9286b
Use headers shorthand in mailers (#31956) 2024-09-19 13:38:32 +00:00
KMY
f18eabfe75 Merge remote-tracking branch 'parent/main' into upstream-20240906 2024-09-06 08:42:24 +09:00
Claire
559958f8c5
Fix email language when recipient has no selected locale (#31747) 2024-09-04 17:35:40 +00:00
KMY
c546939a40 Merge remote-tracking branch 'parent/main' into upstream-20240524 2024-05-24 08:33:49 +09:00
Matt Jankowski
a6d12299f2
Remove duplicate method def ApplicationHelper#instance_presenter (#30331) 2024-05-17 08:29:13 +00:00
KMY
ace193fda3 Merge remote-tracking branch 'parent/main' into upstream-20240327 2024-03-27 12:13:55 +09:00
Matt Jankowski
c4feba4347
Use existing MascotHelper#instance_presenter instead of local var in welcome email template (#29759) 2024-03-26 15:58:48 +00:00
Claire
cfea9cc172
Add list of pending releases directly in mail notifications for version updates (#29436) 2024-03-26 14:45:19 +00:00
KMY
42b5727723 Merge remote-tracking branch 'parent/main' into upstream-20240304 2024-03-04 10:37:41 +09:00
HTeuMeuLeu
934cab7508
New welcome email (#28883) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-03-01 12:16:53 +00:00
KMY
a23f77a5b8 Merge remote-tracking branch 'parent/main' into upstream-20240218 2024-02-22 07:48:56 +09:00
Claire
2751acb6cd
Automatically switch from open to approved registrations in absence of moderators (#29318) 2024-02-21 17:45:06 +00:00
KMY
54f5113b46 Merge remote-tracking branch 'parent/main' into upstream-20240124 2024-01-24 08:38:14 +09:00
Claire
e2d9635074
Add notification email on invalid second authenticator (#28822) 2024-01-22 13:55:43 +00:00
KMY
2b51fabe9c Merge remote-tracking branch 'parent/main' into upstream-20240118 2024-01-18 09:17:39 +09:00
HTeuMeuLeu
7f471e70c0
Update new email templates (#28416) 
Co-authored-by: Matt Jankowski <matt@jankowski.online>
 2024-01-15 18:18:59 +00:00
KMY
a6b57e3890 Merge remote-tracking branch 'parent/main' into upstream-20231221 2023-12-21 08:37:12 +09:00
Matt Jankowski
7cfc078198
Fix rails mailer preview not honouring locale (#28418) 2023-12-18 21:49:17 +00:00
KMY
16914f5f02 Merge commit 'c40cfc5d09' into upstream-20231129 2023-11-29 12:43:01 +09:00
Matt Jankowski
2d536bb05f
Use admin_mailer layout with initial salutation (#28085) 2023-11-28 07:41:26 +00:00
KMY
597485f47a Merge remote-tracking branch 'parent/main' into upstream-20231128 2023-11-28 09:44:42 +09:00
Matt Jankowski
9b8ba9b350
Remove unused plain_mailer layout (#28065) 2023-11-27 10:40:03 +00:00
Matt Jankowski
c51e2f7e38 Misc spec/refactor to user mailer and user mailer spec (#27486) 2023-10-30 13:23:10 +09:00
Matt Jankowski
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec (#27486) 2023-10-27 09:57:16 +00:00
KMY（雪あすか）
87e858a202
Add: フレンドサーバー (#61) 
* Fix mastodon version

* テーブル作成

* Wip: フレンドサーバーフォローの承認を受信

* Wip: フレンド申請拒否を受信

* Wip: フォローリクエストを受理

* Wip: 相手からのフォロー・アンフォローを受理

* 普通のフォローとフレンドサーバーのフォローを区別するテストを追加

* ドメインブロックによるフォロー拒否

* ドメインブロックしたあと、申請中のフォロリクを取り下げる処理

* スタブに条件を追加

* Wip: 相手からのDelete信号に対応

* DB定義が消えていたので修正

* Wip: ローカル公開投稿をフレンドに送信する処理など

* Wip: 未収載＋誰でもの投稿をフレンドに送る設定

* Wip: ローカル公開をそのまま送信する設定を考慮

* Fix test

* Wip: 他サーバーからのローカル公開投稿の受け入れ

* Wip: Web画面作成

* Fix test

* Wip: ローカル公開を連合TLに流す

* Wip: フレンドサーバーの削除ボタン

* Wip: メール通知や設定のテストなど

* Wip: 翻訳を作成

* Fix: 却下されたあとフォローボタンが表示されない問題

* Wip: 編集できない問題

* 有効にしていないフレンドサーバーをリストで無効表示
 2023-10-09 11:51:15 +09:00
Claire
16681e0f20
Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
Christian Schmidt
ca342d4838
Add List-Unsubscribe email header (#26085) 2023-08-01 19:34:40 +02:00
Matt Jankowski
f3fca78756
Refactor NotificationMailer to use parameterization (#25718) 2023-07-10 03:06:22 +02:00
Matt Jankowski
cf33028f35
Admin mailer parameterization (#25759) 2023-07-08 20:03:38 +02:00
Eugen Rochko
6637ef7852
Add unsubscribe link to e-mails (#25378) 2023-06-12 14:22:46 +02:00
Heitor de Melo Cardozo
4601e0dcbb
Add user handle to notification mail recipient address (#24240) 
Co-authored-by: luccamps <luccamps@users.noreply.github.com>
Co-authored-by: Leonardo Negreiros de Oliveira <negreirosleo12@gmail.com>
Co-authored-by: Marcio Flavio <mflaviof1995@gmail.com>
Co-authored-by: Gabriel Quaresma <j.quaresmasantos_98@hotmail.com>
 2023-04-17 11:06:06 +02:00
Claire
d6679d1751
Add mail headers to avoid auto-replies (#23597) 2023-03-03 20:44:46 +01:00
Nick Schonning
f0e1b12c10
Autofix Rubocop Style/ExplicitBlockArgument (#23704) 2023-02-20 11:18:08 +09:00
zunda
09191dee66
Add single splat to callback method definitions to avoid ArgumentError (#22246) 
It looks like a [bug](https://bugs.ruby-lang.org/issues/18633) around
autosplat is [fixed](fbaadd1cfe)
on ruby-3.2.0-rc1 and breaks a test (but not on ruby <= 3.1.3):

```
$ bundle exec rspec ./spec/controllers/api/v1/emails/confirmations_controller_spec.rb:41
  :
  1) Api::V1::Emails::ConfirmationsController#create with an oauth token from an app that created the account when the account is already confirmed but user changed e-mail and has not confirmed it returns http success
     Failure/Error:
         def email_changed(user, **)
           @resource = user
           @instance = Rails.configuration.x.local_domain

           return unless @resource.active_for_authentication?

           I18n.with_locale(locale) do
             mail to: @resource.email, subject: I18n.t('devise.mailer.email_changed.subject')
           end
         end

     ArgumentError:
       wrong number of arguments (given 2, expected 1)
     # ./app/mailers/user_mailer.rb:51:in `email_changed'
     # ./app/models/user.rb:444:in `render_and_send_devise_message'
     # ./app/models/user.rb:430:in `block in send_pending_devise_notifications'
     # ./app/models/user.rb:429:in `each'
     # ./app/models/user.rb:429:in `send_pending_devise_notifications'
     # ./spec/controllers/api/v1/emails/confirmations_controller_spec.rb:38:in `block (7 levels) in <top (required)>'
```
 2022-12-13 20:03:16 +01:00
Eugen Rochko
45ebdb72ca
Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
Eugen Rochko
0b3e4fd5de
Remove digest e-mails (#17985) 
* Remove digest e-mails

* Remove digest-related code
 2022-08-25 23:38:22 +02:00
Jeong Arm
fed7380e9f
Prevent use locale with empty string (#18543) 
Somehow user's locale could be an empty string, And empty string itself
are treated as true value.
 2022-05-28 14:32:08 +02:00
Claire
ce9dcbea32
Fix failure when sending warning emails with custom text (#17983) 
* Add tests

* Fix failure when sending warning emails with custom text
 2022-04-07 14:47:30 +02:00
Eugen Rochko
6221b36b27
Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +02:00