mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,043 Commits
69 Branches
20 Tags
358 MiB
Commit Graph

23043 Commits (346919178d52df376e27b7aa934545fe760ea81b)

Author SHA1 Message Date
Claire 346919178d
Merge pull request #2845 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 5ba3405be4
 2024-09-13 23:40:06 +02:00
Claire 117ac13d12 Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream 2024-09-13 21:37:34 +02:00
Claire 065abf2918
Merge pull request #2843 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0226bbe516
 2024-09-13 21:35:17 +02:00
renovate[bot] 5ba3405be4
Update dependency opentelemetry-instrumentation-pg to '~> 0.29.0' (#31897) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-13 12:07:33 +00:00
David Roetzel c1b2c4fd9a
Strip protocol from attribution domains (#31900) 2024-09-13 11:37:15 +00:00
Claire ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899) 2024-09-13 09:11:10 +00:00
Matt Jankowski a2c4f5f5c0
Add coverage for `ListAccount` follow/follow_request set up (#31896) 2024-09-13 08:49:03 +00:00
Matt Jankowski 49cbee3836
Remove unused argument from `AccountMigration.within_cooldown` (#31892) 2024-09-13 08:43:21 +00:00
github-actions[bot] 353ade767b
New Crowdin Translations (automated) (#31898) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-13 08:41:46 +00:00
Claire 427ed60274 Fix link handling within detailed status contents 2024-09-12 22:42:07 +02:00
Claire 4050beb6e2 Fix detailed status timestamp link target not being the original URL 2024-09-12 22:30:40 +02:00
Matt Jankowski 202077517c
Add "search" group for chewy classes in simplecov config (#31890) 2024-09-12 20:09:55 +00:00
Michael Stanclift 9b1ecf7aee [Glitch] Fix review history and action modal styling 
Port a269ff9253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 21:38:15 +02:00
Claire afd3953cdd [Glitch] Autofocus primary button in modals 
Port 5f782f9629 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-12 21:35:03 +02:00
Claire 83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
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
renovate[bot] 0226bbe516
Update dependency express to v4.21.0 (#31877) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-12 14:21:06 +00:00
renovate[bot] cc3cf9c465
Update dependency aws-sdk-s3 to v1.162.0 (#31875) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-12 14:20:44 +00:00
Michael Stanclift a269ff9253
Fix review history and action modal styling (#31864) 2024-09-12 14:18:43 +00:00
Matt Jankowski 207c073bf8
Remove debug output in migration controller spec (#31886) 2024-09-12 14:04:46 +00:00
Taylor Chaparro 1b6a82b799
Fix invalid date searches returning 503 (#31526) 2024-09-12 13:40:20 +00:00
Matt Jankowski f3c4874522
Remove unused `statuses#embed` body class assignment (#31787) 2024-09-12 13:38:15 +00:00
Matt Jankowski 4aa600387e
Move redirect/base body class to view (#31796) 2024-09-12 13:31:50 +00:00
Christian Schmidt 8cdc148167
Handle invalid visibility (#31571) 2024-09-12 13:29:55 +00:00
Matt Jankowski 17c57c46e7
Add coverage for title/limit validations in `List` model (#31869) 2024-09-12 13:25:23 +00:00
Claire a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive (#26897) 2024-09-12 13:24:19 +00:00
Claire 5f782f9629
Autofocus primary button in modals (#31883) 2024-09-12 13:15:05 +00:00
Claire c35ea59ee6
Fix security context sometimes not being added in LD-Signed activities (#31871) 2024-09-12 12:58:12 +00: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