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,805 Commits 69 Branches 22 Tags 360 MiB
Commit Graph

1621 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
github-actions[bot]
e78db58b65
New Crowdin Translations (automated) (#32708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-31 10:01:05 +00:00
github-actions[bot]
0a599d08d8
New Crowdin Translations (automated) (#32695) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-30 10:02:02 +00:00
github-actions[bot]
244aaf9a38
New Crowdin Translations (automated) (#32687) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-29 09:29:22 +00:00
Emelia Smith
dc0b1948be
Feat: Implement interaction modal for Polls (#32609) 2024-10-28 13:27:37 +00:00
github-actions[bot]
0426cb78f7
New Crowdin Translations (automated) (#32589) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-28 13:23:13 +00:00
Claire
8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
Claire
393f0a0159
Redesign Content Warning and filters (#32543) 2024-10-23 09:47:23 +00:00
Claire
6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-19 19:13:32 +02:00
github-actions[bot]
8eae0d067d
New Crowdin Translations (automated) (#32573) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-18 07:56:43 +00:00
github-actions[bot]
009f2ebc32
New Crowdin Translations (automated) (#32553) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-17 08:21:51 +00:00
Emelia Smith
bc2e642272
Fix: Reword 'pick one' to 'single choice' for polls (#32397) 2024-10-16 10:40:40 +00:00
Renaud Chaput
6c87c76e18
Add ability to group follow notifications in WebUI (#32520) 2024-10-16 08:33:11 +00:00
github-actions[bot]
acc1973f3a
New Crowdin Translations (automated) (#32533) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-16 08:12:43 +00:00
github-actions[bot]
7d89cea0ea
New Crowdin Translations (automated) (#32339) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-15 09:26:28 +00:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
github-actions[bot]
ff3e2c9cfa
New Crowdin Translations (automated) (#32295) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-08 08:10:39 +00:00
Claire
7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00
github-actions[bot]
498024558a
New Crowdin Translations (automated) (#32262) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-10-07 07:06:43 +00:00
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00