KMY
d35fa72842
Merge remote-tracking branch 'parent/main' into upstream-20240109
2025-01-09 13:20:56 +09:00
Matt Jankowski
b0634b2943
Add helpers for ios/android app store links in welcome mailer ( #33475 )
2025-01-06 19:59:11 +00:00
KMY
3784ad273c
Merge remote-tracking branch 'parent/main' into upstream-20241216
2024-12-16 10:14:31 +09:00
Eugen Rochko
425311e1d9
Change referrer policy to be controlled by header in web UI ( #33214 )
2024-12-09 22:42:45 +00:00
KMY
1c1f76697b
Merge remote-tracking branch 'parent/main' into upstream-20241101
2024-11-01 08:04:03 +09:00
Matt Jankowski
6f5eb22135
Mailer header partial access cleanup ( #32585 )
2024-10-28 13:41:56 +00:00
KMY
ab58aed910
Merge remote-tracking branch 'parent/main' into upstream-20241021
2024-10-21 07:07:48 +09:00
Matt Jankowski
bd6c96f737
Fix broken i18n in text welcome mailer tags area ( #32571 )
2024-10-18 07:19:37 +00:00
KMY
6fb9fea74f
Fix: プロフィール設定でフォロー数などの数字を隠していても、誰かをフォローした時にフォロー相手にメールで数字が通知される
2024-09-09 08:38:35 +09:00
KMY
af0f8f01e1
Merge remote-tracking branch 'parent/main' into upstream-20240821
2024-08-21 12:39:30 +09:00
Matt Jankowski
fa2e7b1708
Migrate fontawesome->material in more views ( #31360 )
2024-08-20 11:52:45 +00:00
KMY
52c5784910
Merge remote-tracking branch 'parent/main' into upstream-20240409
2024-04-09 12:15:51 +09:00
Claire
f3430eebbb
Fix hashtag string interpolation in welcome email ( #29879 )
2024-04-08 13:45:25 +00:00
KMY
45c5c7b055
Merge remote-tracking branch 'parent/main' into upstream-20240408
2024-04-08 07:44:47 +09:00
Matt Jankowski
601834d746
Use partial collection render for welcome mailer features ( #29843 )
2024-04-04 16:13:10 +00:00
Jeong Arm
4045c069f8
Use public_visibility
( #29847 )
2024-04-04 07:31:30 +00:00
KMY
dd98f9a9a7
Merge remote-tracking branch 'parent/main' into upstream-20240404
2024-04-04 12:02:18 +09:00
Matt Jankowski
cde3206478
Simplify feature loop in welcome mailer ( #29760 )
2024-04-03 20:10:59 +00:00
KMY
bef755a577
Merge remote-tracking branch 'parent/main' into upstream-20240401
2024-04-01 08:52:35 +09:00
Matt Jankowski
e85f24174e
Simplify checklist step loop in welcome mailer ( #29761 )
2024-03-28 10:56:33 +00:00
KMY
76598bd542
Merge remote-tracking branch 'parent/main' into upstream-20240319
2024-03-19 09:15:20 +09:00
Claire
82c2af0356
Fix user_mailer.welcome.hashtags_recent_count
not having plural form ( #29607 )
2024-03-16 16:38:20 +00:00
KMY
42b5727723
Merge remote-tracking branch 'parent/main' into upstream-20240304
2024-03-04 10:37:41 +09:00
Claire
1d721b21e1
Add attribution to Tabler.io icons used in the new mailer designs ( #29470 )
2024-03-01 14:51:01 +00:00
HTeuMeuLeu
934cab7508
New welcome email ( #28883 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-03-01 12:16:53 +00:00
KMY
2b51fabe9c
Merge remote-tracking branch 'parent/main' into upstream-20240118
2024-01-18 09:17:39 +09:00
HTeuMeuLeu
1a3859d8e2
Update follow and follow_request emails ( #28755 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 14:37:04 +00:00
Renaud Chaput
cb5ac15923
Use a helper to avoid using media/
asset prefixes ( #28756 )
2024-01-17 12:19:51 +00: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
bb2e964dca
Merge commit ' aea67d448b
' into kb_migration
2023-06-04 10:15:09 +09:00
Claire
0766c9a631
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
KMY
7a4dc84202
Merge remote-tracking branch 'parent/main' into kb_migration
2023-03-18 13:30:34 +09:00
Nick Schonning
65669d3c57
Fix more haml-lint Rubocop ( #24107 )
2023-03-15 20:07:43 +01:00
Christian Schmidt
92a26638eb
Do not strip tags from Setting.site_short_description
( #23975 )
2023-03-13 18:44:38 +01:00
Claire
21db91a0a8
Remove sidebar dead code ( #23984 )
2023-03-06 16:25:35 +01:00
Christian Schmidt
c4cf92094e
Do not strip tags from Setting.site_short_description
( #23975 )
2023-03-06 15:37:19 +01:00
Rose
4f15fd0ba1
Fix style for hashes ( #20518 )
...
* Fix style for hashes
Make the style for hashes consistent.
* New style
More consistency
2022-11-17 11:05:39 +01:00
Eugen Rochko
b04633a961
Add image processing and generate blurhash for server thumbnail ( #19348 )
...
Remove separate server hero setting
2022-10-13 11:29:19 +02:00
Eugen Rochko
d2528b26b6
Add server banner to web app, add GET /api/v2/instance
to REST API ( #19294 )
2022-10-05 03:47:56 +02:00
Jeremy Kescher
ec83e2a35e
Fix missing scope for current_user in _sidebar.html.haml ( #18822 )
...
Fixes https://github.com/mastodon/mastodon/issues/18821
Fix suggested by https://miaow.gay/@meganeko/108665430982072358
2022-07-18 08:41:50 +02:00
Eugen Rochko
45aa5781ce
Change brand color and logotypes ( #18592 )
...
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
2022-06-09 22:25:23 +02:00
Eugen Rochko
27965ce5ed
Add trending statuses ( #17431 )
...
* Add trending statuses
* Fix dangling items with stale scores in localized sets
* Various fixes and improvements
- Change approve_all/reject_all to approve_accounts/reject_accounts
- Change Trends::Query methods to not mutate the original query
- Change Trends::Query#skip to offset
- Change follow recommendations to be refreshed in a transaction
* Add tests for trending statuses filtering behaviour
* Fix not applying filtering scope in controller
2022-02-25 00:34:14 +01:00
Eugen Rochko
6e50134a42
Add trending links ( #16917 )
...
* Add trending links
* Add overriding specific links trendability
* Add link type to preview cards and only trend articles
Change trends review notifications from being sent every 5 minutes to being sent every 2 hours
Change threshold from 5 unique accounts to 15 unique accounts
* Fix tests
2021-11-25 13:07:38 +01:00
ThibG
4babf5b8b5
Fix lock icon not being shown when locking account in profile settings ( #14190 )
2020-07-01 13:51:50 +02:00
ThibG
0e362b7678
Fix end-user-facing uses of inline CSS ( #13438 )
...
* Move some inline styles to CSS files
* Move default_account_display_name span to fix useless tags with duplicate id
* Change handling of public pages spoiler text from inline CSS to dataset attribute
* Use the `dir` HTML attribute instead of inline CSS
* Move status action bar inline CSS to CSS file
* Hide logo resources from CSS file, not inline CSS
Fixes #11601
* Move translation prompt styling from inline CSS to CSS file
* Move “invited by” styling on registration form from inline to CSS file
* Use the progress tag to display poll results in JS fallback
* Fix poll results JS-less fallback when the user has voted for an option
* Change account public page “moved” notice to use img tags instead of inline CSS
* Move OTP hint inline CSS to SCSS file
* Hide JS-less fallback vote progressbars from accessibility tools
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2020-04-28 10:16:55 +02:00
BSKY
fccf83e1f2
Add noopener and/or noreferrer ( #12202 )
2019-10-24 22:44:42 +02:00
Eugen Rochko
19cdc62765
Remove fallback to long description on sidebar and meta description ( #12119 )
...
Fix #12114
2019-10-08 22:08:55 +02:00
Eugen Rochko
16c1abdb2d
Fix user preference to show trends not working on public pages ( #11740 )
...
Fix #11738
2019-09-03 04:57:07 +02:00
Eugen Rochko
cb447b28c4
Add profile directory to web UI ( #11688 )
...
* Add profile directory to web UI
* Add a line of bio to the directory
2019-08-30 00:14:36 +02:00
Eugen Rochko
c6b4b923e6
Add trends to public pages sidebar ( #11594 )
2019-08-18 14:55:32 +02:00