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

4097 Commits

Author SHA1 Message Date
Claire
844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
github-actions[bot]
9c85825ac6
New Crowdin Translations (automated) (#33766) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-29 08:38:53 +00:00
Claire
353e5f797c Merge commit '5b291fcbe41564264954618fb1f4086a3be1c600' into glitch-soc/merge-upstream 
Conflicts:
- `app/validators/poll_options_validator.rb`:
  Upstream split `PollValidator` in two, and glitch-soc had local changes to
  make the options configurable.
  Refactored as upstream did, keeping glitch-soc's configurable limits.
 2025-01-28 18:29:46 +01:00
github-actions[bot]
80f72ee501
New Crowdin Translations (automated) (#33753) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-28 09:40:50 +00:00
Claire
fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream 
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
 2025-01-27 18:19:09 +01:00
Renaud Chaput
59384282ed
Add an optional metric exporter (#33734) 2025-01-27 12:52:30 +00:00
github-actions[bot]
b53bf23df0
New Crowdin Translations (automated) (#33731) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-27 08:39:56 +00:00
github-actions[bot]
e44b78413a
New Crowdin Translations (automated) (#33711) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-24 09:06:25 +00:00
Claire
4b4de02fee
Remove broken link to Terms of Service when none are defined (#33699) 2025-01-23 14:34:30 +00:00
Claire
ffaf458f99
Change “Prohibited uses” section of ToS template according to feedback (#33703) 2025-01-23 14:09:33 +00:00
github-actions[bot]
1b2c952471
New Crowdin Translations (automated) (#33697) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-23 13:36:03 +00:00
Claire
19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
github-actions[bot]
38c27a7708
New Crowdin Translations (automated) (#33679) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-22 08:35:41 +00: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
Eugen Rochko
11786f1114
Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
Claire
ce7fb94306 Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream 2025-01-21 12:06:49 +01:00
github-actions[bot]
9e90248abc
New Crowdin Translations (automated) (#33668) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-21 08:37:53 +00:00
Claire
08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01: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]
329a9e1ac1
New Crowdin Translations (automated) (#33643) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-20 08:59:23 +00: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
github-actions[bot]
1c23ebd62f
New Crowdin Translations (automated) (#33626) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-17 10:05:41 +00:00
Christian Schmidt
a3baae0b99
API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
github-actions[bot]
4a44c47982
New Crowdin Translations (automated) (#33609) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-16 09:13:39 +00:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
Matt Jankowski
7c56517c7c
Move mastodon version config to config_for yml (#33577) 2025-01-14 14:32:29 +00:00
github-actions[bot]
ee4edbb94f
New Crowdin Translations (automated) (#33582) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-14 08:44:58 +00:00
github-actions[bot]
53885b0fdb
New Crowdin Translations (automated) (#33559) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-13 09:13:47 +00:00
Claire
155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `README.md`:
  Upstream changed the file, while we had a different one.
  Updated the common parts.
- `app/helpers/application_helper.rb`:
  Upstream added helpers where glitch-soc had extra ones.
  Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
  Upstream added some custom handling of one setting, while
  glitch-soc had additional code.
  Ported upstream's code.
- `lib/mastodon/version.rb`:
  Upstream moved some things to `config/mastodon.yml`.
  Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
  I don't know honestly.
 2025-01-10 20:41:36 +01:00
Matt Jankowski
34cd7d6585
Use config_for for Mastodon::Version metadata/prerelease values (#33548) 2025-01-10 15:52:43 +00:00
github-actions[bot]
846c89b66e
New Crowdin Translations (automated) (#33541) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-10 09:00:41 +00:00
github-actions[bot]
4e2c15b45d
New Crowdin Translations (automated) (#33522) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-09 08:21:47 +00:00
github-actions[bot]
35e57138f1
New Crowdin Translations (automated) (#33500) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-08 09:01:28 +00:00
Matt Jankowski
c0264c8013
Extend custom CSS cache time with digest paths (#33207) 2025-01-08 08:48:45 +00:00
github-actions[bot]
9715bd796f
New Crowdin Translations (automated) (#33480) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-07 07:50:27 +00:00
Claire
126ce9a232 Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
Matt Jankowski
fbd283329e
Avoid "double icon" near each other in nav sidebar (#33449) 2025-01-06 18:24:39 +00:00
github-actions[bot]
c93c1f38b7
New Crowdin Translations (automated) (#33451) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-06 08:13:39 +00:00
Tim Rogers
3bdfa3eb4c
Added validator for extra profile field values with empty name (#33421) 2025-01-04 19:42:27 +00:00
Claire
163a8569ed Merge commit '9b82bedc6f589b19c1cf9dc8f566f4c19702d965' into glitch-soc/merge-upstream 2025-01-04 18:55:35 +01:00
Matt Jankowski
9b82bedc6f
Only register stats dirs when command available (#33454) 2025-01-04 17:44:49 +00:00
Claire
807bf8be24 Merge commit '9712518b2fb2585df3bcff95a687c291f04a4199' into glitch-soc/merge-upstream 2025-01-04 15:27:49 +01:00
Matt Jankowski
af7d6e59af
Replace deprecated STATS_DIRECTORIES with Rails::CodeStatistics.register_directory approach (#33445) 2025-01-03 21:52:16 +00:00
Claire
7e1f8babbd Merge commit '7d6da219c0fccb8693282a99765135050173d7c4' into glitch-soc/merge-upstream 2025-01-03 20:26:28 +01:00
Matt Jankowski
535866218e
Update rails to version 8.0.1 (#32357) 2025-01-03 16:08:21 +00:00
Claire
68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00
github-actions[bot]
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
github-actions[bot]
ba18289477
New Crowdin Translations (automated) (#33378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-02 09:02:47 +00:00