djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-09 08:22:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
24,022 Commits 69 Branches 22 Tags 363 MiB
Commit Graph

4168 Commits

Author SHA1 Message Date
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]
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]
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]
1992c2a4fa
New Crowdin Translations (automated) (#33345) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-18 07:51:31 +00:00
Eugen Rochko
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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]
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
Claire
9ff01403ea
Fix middle-click handling conflicting with automatic scrolling (#33106) 2024-11-29 14:04:22 +00:00
github-actions[bot]
9296d58024
New Crowdin Translations (automated) (#33104) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-29 09:39:52 +00:00
Eugen Rochko
7f2cfcccab
Change design of modal loading and error screens in web UI (#33092) 2024-11-29 07:50:08 +00:00
Emelia Smith
eef8d2c855
Add link from Web UI for Hashtags to the Moderation UI (#31448) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2024-11-29 07:36:17 +00:00
github-actions[bot]
fa3577e04b
New Crowdin Translations (automated) (#33084) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-28 10:10:38 +00:00
Eugen Rochko
7a3dea385e
Change onboarding flow in web UI (#32998) 2024-11-26 16:10:12 +00:00
Eugen Rochko
429e08e3d2
Remove old notifications route from web UI (#33038) 2024-11-26 09:59:11 +00:00
github-actions[bot]
6b1dd1bf2a
New Crowdin Translations (automated) (#33074) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-26 07:24:28 +00:00
Eugen Rochko
1a88c05274
Fix arrow in the wrong place on empty list members screen in web UI (#33054) 2024-11-25 10:23:09 +00:00
github-actions[bot]
4521390163
New Crowdin Translations (automated) (#33043) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-25 08:17:41 +00:00
Claire
f740611820 Merge commit 'd0753ec276502ea28a1e853cbc6487020a0602e3' into glitch-soc/merge-upstream 2024-11-24 18:56:15 +01:00
Claire
6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 2024-11-24 16:46:28 +01:00
Nick Schonning
27e79da6b9
Update immutable imports for v5 (#33037) 2024-11-22 22:23:02 +00:00
github-actions[bot]
47190087f8
New Crowdin Translations (automated) (#33020) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-22 08:44:09 +00:00
Claire
4bfb8887bf
Fix duplicate notifications in notification groups when using slow mode (#33014) 2024-11-21 16:10:07 +00:00