tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,277 Commits 5 Branches 0 Tags
78a4d617a3870eb0a3fa9e934453036dd746acee
Commit Graph
24277 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire 78a4d617a3 Merge pull request #2952 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3dcf5e12b1
 2025-01-22 08:57:37 +01:00
Eugen Rochko 5e7c079787 [Glitch] Change design of edit media modal in web UI 
Port 11786f1114 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-21 19:43:38 +01:00
Claire 05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
 2025-01-21 19:23:25 +01:00
Claire b0bf355911 Merge pull request #2951 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 4ebdfed8ea
 2025-01-21 13:22:49 +01:00
Claire 3dcf5e12b1 Change notifications from moderators to not be filtered (#33654) 2025-01-21 11:39:53 +00:00
Eugen Rochko 11786f1114 Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
Claire 785543b5a6 [Glitch] Fix opening modals losing some location parameters 
Port 4ebdfed8ea to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-21 12:07:40 +01:00
Claire ce7fb94306 Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream 2025-01-21 12:06:49 +01:00
Claire 4ebdfed8ea Fix opening modals losing some location parameters (#33670) 2025-01-21 09:53:52 +00:00
github-actions[bot]andGitHub Actions 9e90248abc New Crowdin Translations (automated) (#33668) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-21 08:37:53 +00:00
Matt Jankowski 45149cd5e1 Use expect for nested params in auth/setup#update (#33657) 2025-01-21 08:16:40 +00:00
Matt Jankowski 7543c90642 Use bundler version 2.6.3 (#33658) 2025-01-21 08:00:35 +00:00
renovate[bot] 004e120e02 Update dependency selenium-webdriver to v4.28.0 (#33667) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-21 07:59:52 +00:00
Claire c400122665 Merge pull request #2950 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 7f866daf63
 2025-01-20 23:52:49 +01:00
Eugen Rochko 89b7f8884a [Glitch] Add warning when selected and detected language is different in web UI 
Port 8962f11578 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-01-20 18:07:59 +01:00
Claire 08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01:00
renovate[bot] 7f866daf63 Update formatjs monorepo (#33652) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-20 10:36:25 +00:00
renovate[bot] 2deab346b3 Update dependency nokogiri to v1.18.2 (#33651) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-20 10:36:21 +00:00
renovate[bot] a0c76f6017 Update dependency i18n to v1.14.7 (#33650) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-20 10:36:19 +00:00
Claire ac59ed39dd Fix re-encoding of high-framerate VFR videos with FFmpeg 6+ (#33634) 2025-01-20 09:22:49 +00:00
Eugen Rochko 8962f11578 Add warning when selected and detected language is different in web UI (#33042) 2025-01-20 09:17:13 +00:00
github-actions[bot]andGitHub Actions 329a9e1ac1 New Crowdin Translations (automated) (#33643) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-20 08:59:23 +00:00
Claire 0d09884521 Merge pull request #2947 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 4bd969e4bb
 2025-01-18 15:01:00 +01:00
Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
Nicholas La Roux 4bd969e4bb Fix broken CONTRIBUTING link in DEVELOPMENT (#33637) 2025-01-17 15:53:32 +00:00
Matt Jankowski bc63f2b908 Update CONTRIBUTING doc with various clarifications (#33517) 2025-01-17 15:38:06 +00:00
Claire ab4874ff13 Further harden the warnings against changing encryption secrets (#33631) 2025-01-17 10:42:52 +00:00
Claire b37e48d5c8 Revert "Update dependency aws-sdk-s3 to v1.178.0 (#33611)" (#33628) 2025-01-17 10:33:03 +00:00
Matt Jankowski 5be938e661 Migrate visibility interaction checks on statuses to request spec (#33622) 2025-01-17 10:06:52 +00:00
github-actions[bot]andGitHub Actions 1c23ebd62f New Crowdin Translations (automated) (#33626) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-17 10:05:41 +00:00
renovate[bot] 531ca4b968 Update dependency tzinfo-data to v1.2025.1 (#33625) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-17 09:35:34 +00:00
Claire 092e60eb7d Change activity distribution error handling to skip retrying for deleted accounts (#33617) 2025-01-17 09:12:59 +00:00
renovate[bot] febdfefafe Update formatjs monorepo (#33627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-17 08:57:11 +00:00
Christian Schmidt a3baae0b99 API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Matt Jankowski 3af6739f21 Add coverage for AnnualReport.prepare method (#33618) 2025-01-16 15:45:48 +00:00
Matt Jankowski a19141441d Move clear environment portion of mastodon:setup to private method (#33616) 2025-01-16 15:45:02 +00:00
renovate[bot] 29b355b699 Update dependency concurrent-ruby to v1.3.5 (#33610) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-16 15:24:31 +00:00
renovate[bot] 9e2f930eed Update dependency aws-sdk-s3 to v1.178.0 (#33611) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-16 15:23:37 +00:00
renovate[bot] da208771b9 Update opentelemetry-ruby (non-major) (#33613) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-16 15:23:32 +00:00
Matt Jankowski 69b8a0b9bf Collect errors in setup rake task (#33603) 2025-01-16 14:58:59 +00:00
Claire 160019235b Merge pull request #2945 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 0aa9bb8130
 2025-01-16 12:26:03 +01:00
Claire ad3bb614f0 Merge commit '0aa9bb8130b77b01f6a08c64b7e93876d892868b' into glitch-soc/merge-upstream 2025-01-16 12:13:56 +01:00
Claire 0aa9bb8130 Bump version to v4.4.0-alpha.2 (#33615) 2025-01-16 11:02:54 +00:00
Claire 4cfa5c14c0 Merge pull request #2944 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to da4e55eb17
 2025-01-16 11:54:26 +01:00
Claire f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
Claire da4e55eb17 Merge commit from fork 2025-01-16 11:10:08 +01:00
github-actions[bot]andGitHub Actions 4a44c47982 New Crowdin Translations (automated) (#33609) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-16 09:13:39 +00:00
Matt Jankowski 3db8498903 Fix Style/MutableConstant cop (#33602) 2025-01-16 09:09:06 +00:00
Matt Jankowski 998cf0dd53 Convert auth/setup spec controller->system/request (#33604) 2025-01-16 09:03:46 +00:00
Matt Jankowski 72abf05269 Add "needs refresh" scenario to api/v1/polls request spec (#33608) 2025-01-16 09:00:04 +00:00