1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-13 14:18:34 +09:00
Commit Graph

23016 Commits

Author SHA1 Message Date
Eugen Rochko
bd68d2ab21 [Glitch] Change design of embed modal in web UI
Port 24ef8255b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 20:58:23 +02:00
Eugen Rochko
e705ec13db [Glitch] Change embedded posts to use web UI
Port 3d46f47817 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 20:58:02 +02:00
Claire
3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
2024-09-12 20:05:08 +02:00
Eugen Rochko
2d31cdbc28 [Glitch] Fix notifications re-rendering spuriously in web UI
Port f2a92c2d22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:35:05 +02:00
Claire
caaa412e6e Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream 2024-09-12 17:34:16 +02:00
renovate[bot]
17e3a12d3d [Glitch] Update typescript-eslint monorepo to v8 (major)
Port a27f7f4e56 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:32:41 +02:00
Eugen Rochko
196b141af5 [Glitch] Change inner borders in media galleries in web UI
Port a3215c0f88 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:28:44 +02:00
Michael Stanclift
eb28472ded [Glitch] Fix alt text modal styling
Port e09f9f885e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:23:59 +02:00
Claire
90d7a4bac4 Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI (#31801) 2024-09-12 12:54:16 +00:00
Claire
cb91629353
Merge pull request #2842 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 0c3c06f7cc
2024-09-12 13:55:14 +02:00
David Roetzel
ab763c493f
Ignore undefined as canonical url (#31882) 2024-09-12 11:14:42 +00:00
Eugen Rochko
77cbe2332a [Glitch] Add ability to manage which websites can credit you in link previews
Port CSS changes from e0c27a5047 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 12:30:31 +02:00
Eugen Rochko
abe1717215 [Glitch] Change design of hide media button in web UI
Port 3929e3c6d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 12:30:31 +02:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI (#31766)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Eugen Rochko
f2a92c2d22
Fix notifications re-rendering spuriously in web UI (#31879) 2024-09-12 08:16:07 +00:00
github-actions[bot]
7d53ca56d2
New Crowdin Translations (automated) (#31878)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-12 07:54:53 +00:00
Claire
7cfa8bb782
Merge pull request #2841 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to a021dee642
2024-09-12 08:51:21 +02:00
Eugen Rochko
e2c101ec35 [Glitch] Change labels on thread indicators in web UI
Partial port of a021dee642 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-11 21:27:46 +02:00
Claire
b240bad61a Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream 2024-09-11 20:58:35 +02:00
renovate[bot]
a27f7f4e56
Update typescript-eslint monorepo to v8 (major) (#31231)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-09-11 13:59:46 +00:00
github-actions[bot]
2babfafaff
New Crowdin Translations (automated) (#31855)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-11 08:18:10 +00:00
Matt Jankowski
cdcd834f3c
Add coverage for AnnualReport::* source child classes (#31849) 2024-09-11 08:01:32 +00:00
renovate[bot]
9769ffdcc2
Update dependency aws-sdk-s3 to v1.161.0 (#31853)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-11 07:47:37 +00:00
Matt Jankowski
cee71b9892
Remove fa_ prefix from status visibility icon method (#31846) 2024-09-11 07:47:16 +00:00
Eugen Rochko
a3215c0f88
Change inner borders in media galleries in web UI (#31852) 2024-09-11 07:29:18 +00:00
renovate[bot]
9e12fa254e
Update dependency propshaft to v1 (#31832)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-10 17:45:32 +00:00
renovate[bot]
e6f5b36a12
Update dependency express to v4.20.0 (#31836)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-10 17:45:16 +00:00
Michael Stanclift
e09f9f885e
Fix alt text modal styling (#31844) 2024-09-10 17:33:55 +00:00
Matt Jankowski
0c3c06f7cc
Remove vendor prefix from mobile-web-app-capable meta tag (#31845) 2024-09-10 17:32:58 +00:00
Claire
4ffaced8bc
Second attempt at disabling Codecov annotations (#31841) 2024-09-10 14:00:23 +00:00
Matt Jankowski
c4b09d684e
Extract method for account-referencing in CLI prune task (#31824) 2024-09-10 13:23:55 +00:00
Matt Jankowski
da07adfe6c
Add CustomEmoji.enabled scope (#31830) 2024-09-10 13:21:40 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Eugen Rochko
3929e3c6d2
Change design of hide media button in web UI (#31807) 2024-09-10 09:29:17 +00:00
github-actions[bot]
5260233b81
New Crowdin Translations (automated) (#31835)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-10 09:22:49 +00:00
Matt Jankowski
5b995143f1
Use with_options for shared Account validation option value (#31827) 2024-09-10 08:03:45 +00:00
renovate[bot]
9ea710e543
Update dependency oj to v3.16.6 (#31831)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-10 07:59:18 +00:00
Claire
592a7af27f
Fix translatable source string using “silenced” instead of “limited” (#31822) 2024-09-09 19:57:52 +00:00
Matt Jankowski
d0ab94c4d2
Add FeaturedTag coverage, use pick in model (#31828) 2024-09-09 19:57:19 +00:00
Claire
1436db389e
Merge pull request #2839 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 2caa3f365d
2024-09-09 20:02:04 +02:00
Claire
441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Eugen Rochko
a021dee642
Change labels on thread indicators in web UI (#31806) 2024-09-09 15:28:54 +00:00
github-actions[bot]
2caa3f365d
New Crowdin Translations (automated) (#31800)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-09 12:38:43 +00:00
renovate[bot]
1d03570080
Update dependency postcss-preset-env to v10.0.3 (#31821)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 11:16:09 +00:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 (#31814) 2024-09-09 10:59:42 +00:00
renovate[bot]
9d9901cc5b
Update peter-evans/create-pull-request action to v7 (#31818)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 08:43:12 +00:00
Matt Jankowski
e6969cf4e4
Add method for media-referencing status in AccountStatusCleanupPolicy (#31798) 2024-09-09 08:33:51 +00:00
renovate[bot]
1f13b87567
Update dependency pg to v1.5.8 (#31795)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-09-09 08:31:13 +00:00