tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,086 Commits 5 Branches 0 Tags
807bf8be243d5bebd756cf3f7ead1fc044b1cb42
Commit Graph
4183 Commits
Author SHA1 Message Date
Claire 807bf8be24 Merge commit '9712518b2fb2585df3bcff95a687c291f04a4199' into glitch-soc/merge-upstream 2025-01-04 15:27:49 +01:00
Claire 9712518b2f Refactor status handleClick and handleHotkeyOpen handlers (#33435) 2025-01-03 22:00:52 +00:00
Claire 02fe176fd4 Fix audio player modal having white-on-white buttons in light theme (#33444) 2025-01-03 21:51:51 +00:00
Claire 7e1f8babbd Merge commit '7d6da219c0fccb8693282a99765135050173d7c4' into glitch-soc/merge-upstream 2025-01-03 20:26:28 +01:00
Claire 7d6da219c0 Remove old notifications actions and reducers (#31843) 2025-01-03 16:12:08 +00:00
Christian Schmidt f9582bcfc3 Localize language names (#33402) 2025-01-03 15:29:25 +00:00
Claire 68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00
Claire 79a9069deb Add t hotkey for post translations (#33441) 2025-01-03 09:24:50 +00:00
github-actions[bot]andGitHub Actions a8a16695f1 New Crowdin Translations (automated) (#33439) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-03 07:53:00 +00:00
Claire cef665788a Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream 2025-01-02 21:14:14 +01:00
Jeong Arm a557f9bbaa Fix keyboard shortcut for open status (#33419) 2025-01-02 15:48:59 +00:00
gunchleoc 3201485df2 Fix favorite & bookmark text toggle in timeline, status and image view (#27209) 2025-01-02 13:52:07 +00:00
Claire 655c4a5ebb Fix processing of incoming notifications for unfilterable types (#33429) 2025-01-02 13:22:25 +00:00
Claire 68bfa7ae3f Fix WebUI erroneously stopping to offer expanding search results after second page (#33428) 2025-01-02 10:58:00 +00:00
github-actions[bot]andGitHub Actions ba18289477 New Crowdin Translations (automated) (#33378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-02 09:02:47 +00:00
Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00
github-actions[bot]andGitHub Actions dd56292d1f New Crowdin Translations (automated) (#33370) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-20 08:06:18 +00:00
github-actions[bot]andGitHub Actions 7a08fe91b5 New Crowdin Translations (automated) (#33358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-19 08:47:20 +00:00
github-actions[bot]andGitHub Actions 1992c2a4fa New Crowdin Translations (automated) (#33345) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-18 07:51:31 +00:00
Eugen RochkoandClaire f19fd0b889 Change design of interaction modal in web UI (#33278) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-17 12:36:32 +00:00
github-actions[bot]andGitHub Actions 02748f172d New Crowdin Translations (automated) (#33332) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-17 09:33:42 +00:00
Claire a837f7d693 Fix clicking on a profile mention while logged out potentially leading to incorrect account (#33324) 2024-12-16 19:29:51 +00:00
github-actions[bot]andGitHub Actions 504ea31bd3 New Crowdin Translations (automated) (#33310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-16 07:54:12 +00:00
Eugen Rochko 3cf6681736 Change animation on feed generation screen in web UI (#33311) 2024-12-16 07:38:56 +00:00
github-actions[bot]andGitHub Actions 7200f9d25c New Crowdin Translations (automated) (#33300) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-13 10:38:09 +00:00
Eugen Rochko 0636bcdbe1 Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
github-actions[bot]andGitHub Actions e0a49af47d New Crowdin Translations (automated) (#33280) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-12 09:10:00 +00:00
Renaud Chaput da279df8ae Fix voting on polls (#33266) 2024-12-11 10:32:03 +00:00
Claire a4560d9278 Change label of grouped favourite notification on private mentions (#31659) 2024-12-11 10:25:51 +00:00
github-actions[bot]andGitHub Actions f12b3a9cef New Crowdin Translations (automated) (#33262) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-11 08:20:44 +00:00
Renaud Chaput ded799f913 Convert polls to Typescript / Immutable Records (#29789) 2024-12-10 22:54:07 +00:00
github-actions[bot]andGitHub Actions 801cd731be New Crowdin Translations (automated) (#33235) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-10 09:10:28 +00:00
Eugen Rochko 425311e1d9 Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00
Eugen Rochko 30aa0df88c Add terms of service (#33055) 2024-12-09 10:04:46 +00:00
github-actions[bot]andGitHub Actions 7a2a345c08 New Crowdin Translations (automated) (#33210) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-09 09:20:28 +00:00
github-actions[bot]andGitHub Actions 8dc7f8533d New Crowdin Translations (automated) (#33193) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-06 15:44:21 +00:00
Eugen Rochko 25387dc423 Refactor <HashtagHeader> to TypeScript (#33096) 2024-12-06 08:42:24 +00:00
github-actions[bot]GitHub ActionsClaire
 		8b223f3b15 New Crowdin Translations (automated) (#33185) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-05 09:37:49 +00:00
github-actions[bot]andGitHub Actions 0262310c88 New Crowdin Translations (automated) (#33166) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-04 10:04:02 +00:00
github-actions[bot]andGitHub Actions 836810e88b New Crowdin Translations (automated) (#33146) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-03 09:44:20 +00:00
Eugen Rochko 7135f513a4 Add ability to search for all accounts when creating a list in web UI (#33036) 2024-12-03 09:42:52 +00:00
Eugen Rochko 6cf87762a4 Change percentile label in year in review in web UI (#33148) 2024-12-03 08:57:29 +00:00
Claire c2817c7fad Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Upstream changed how notifications from follow subscriptions were handled,
  refactoring this file in the process.
  Conflict is due to glitch-soc having an extra timeline type (direct).
  Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
  Ditto.
 2024-12-02 21:08:15 +01:00
Eugen Rochko 346a27b6fc Refactor <Column> to TypeScript (#33081) 2024-12-02 20:07:48 +00:00
github-actions[bot]andGitHub Actions 4b80ff92bd New Crowdin Translations (automated) (#33114) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-02 08:27:19 +00:00
Eugen Rochko ca11740dc9 Change profile bios to be displayed during onboarding in web UI (#33119) 2024-12-02 08:11:45 +00:00
Claire 10a24d67d4 Merge commit '75ecc6df068ec2c21b26f05692eb5dfdc35671fa' into glitch-soc/merge-upstream 2024-12-01 18:57:49 +01:00
Claire 7d52d5df0f Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict due to upstream adding fallback support for MathML Core while
  glitch-soc supported slightly more tags than upstream.
  Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
  Ditto.
 2024-12-01 18:22:00 +01:00
Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream 
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
  Minor conflict due to glitch-soc's theming system.
 2024-12-01 17:36:49 +01:00
Eugen Rochko 4de108e755 Change "social web" to "fediverse" in a few banners in web UI (#33101) 2024-11-29 16:44:05 +00:00