djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-03 21:43:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,836 Commits 69 Branches 22 Tags 360 MiB
Commit Graph

4140 Commits

Author SHA1 Message Date
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
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
Eugen Rochko
62603508c7
Change design of lists in web UI (#32881) 2024-11-21 16:10:04 +00:00
github-actions[bot]
e4d5cc0ca6
New Crowdin Translations (automated) (#33010) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-21 10:58:45 +00:00
Eugen Rochko
683db3ab25
Add ability to middle-mouse click posts in web UI (#32988) 2024-11-20 15:56:35 +00:00
github-actions[bot]
4252b13a4b
New Crowdin Translations (automated) (#32990) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-20 08:24:50 +00:00
github-actions[bot]
9fc2fc2251
New Crowdin Translations (automated) (#32969) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-19 09:05:39 +00:00
Eugen Rochko
e856838e0c
Fix notification polling showing a loading bar in web UI (#32960) 2024-11-19 08:57:12 +00:00
github-actions[bot]
02985aae69
New Crowdin Translations (automated) (#32927) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-18 09:20:37 +00:00
Jeong Arm
60801ab914
Add missing autofocus on boost modal (#32953) 2024-11-18 08:48:27 +00:00
Claire
4f1242964b Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream 2024-11-15 18:44:32 +01:00
github-actions[bot]
c546aa57cb
New Crowdin Translations (automated) (#32900) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-15 10:30:11 +00:00
Claire
2de018256a
Fix filters not being correctly applied to boosted posts (#32895) 2024-11-14 19:42:43 +00:00
Claire
ec663eaba1
Fix Content Warning and filter states not applying to boosted posts properly (#32887) 2024-11-14 12:50:36 +00:00
github-actions[bot]
aaebf142aa
New Crowdin Translations (automated) (#32884) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-14 09:39:33 +00:00
github-actions[bot]
baad795384
New Crowdin Translations (automated) (#32868) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-13 09:33:02 +00:00
Eugen Rochko
32e5e1d3f1
Fix a few visual issues with annual reports in web UI (#32807) 2024-11-12 12:35:35 +00:00
github-actions[bot]
0d06d70d11
New Crowdin Translations (automated) (#32811) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-12 08:47:59 +00:00
Christian Schmidt
157fba4698
Backspace hotkey should override default behaviour (#32826) 2024-11-10 16:16:07 +00:00
Claire
f0f807cec7 Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream 2024-11-10 13:18:43 +01:00
github-actions[bot]
8df867b20a
New Crowdin Translations (automated) (#32803) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-08 09:53:47 +00:00
Claire
6ae1fcd059
Fix list of follow requests not having a back button (#32797) 2024-11-07 11:45:46 +00:00
github-actions[bot]
4ed3ce2377
New Crowdin Translations (automated) (#32793) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-07 09:45:05 +00:00
Claire
d482211aa6
Fix out-of-view post contents being inconsistent with in-view post contents (#32778) 2024-11-06 13:30:53 +00:00
github-actions[bot]
871e3b25e8
New Crowdin Translations (automated) (#32782) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-06 08:21:13 +00:00
Eugen Rochko
d6349c0e9a
Add year in review feature to web UI (#32709) 2024-11-05 14:40:07 +00:00
github-actions[bot]
933fa81baf
New Crowdin Translations (automated) (#32772) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-05 08:41:09 +00:00
Claire
0a1b5df202
Fix alt-text pop-in not using the translated description (#32766) 2024-11-04 11:08:19 +00:00
github-actions[bot]
2271b39a5c
New Crowdin Translations (automated) (#32733) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-11-04 08:56:11 +00:00
Claire
f624ef2778 Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
  Wrapped the modified code.
 2024-11-03 20:51:58 +01:00