Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,140 Commits 74 Branches 58 Tags
a06e96f99ee94f210c89331d99911c35601d51ec
Commit Graph

3060 Commits

Author SHA1 Message Date
renovate[bot]
c53ef51362 fix(deps): update dependency @reduxjs/toolkit to v2.6.0 (#33987) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-04 08:48:18 +00:00
renovate[bot]
e4c2cf54ed fix(deps): update dependency core-js to v3.41.0 (#34051) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-04 08:34:00 +00:00
renovate[bot]
d267e022c9 fix(deps): update dependency axios to v1.8.1 (#34020) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-04 08:33:39 +00:00
renovate[bot]
268b7806f1 fix(deps): update dependency react-select to v5.10.1 (#34059) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-04 08:22:11 +00:00
renovate[bot]
e5655a5f65 chore(deps): update dependency @types/lodash to v4.17.16 (#34055) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-03 08:25:22 +00:00
Claire
a682bd19f5 Merge commit '20531d1e078a27116dea53ce21c1b32bf3774eca' into glitch-soc/merge-upstream 2025-02-25 18:52:24 +01:00
renovate[bot]
288e61dfdf fix(deps): update dependency sass to v1.85.1 (#33998) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-25 10:57:12 +00:00
renovate[bot]
b1692628de fix(deps): update dependency postcss-preset-env to v10.1.5 (#33986) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-24 09:33:09 +00:00
Claire
524e8992ad Merge commit 'db971976853103017b1561f2c4f9406fa00c0a2e' into glitch-soc/merge-upstream 2025-02-22 21:31:46 +01:00
renovate[bot]
68e5f0c452 fix(deps): update dependency ws to v8.18.1 (#33970) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-21 11:48:32 +00:00
renovate[bot]
fc83fdc993 fix(deps): update dependency postcss to v8.5.3 (#33962) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-21 07:29:53 +00:00
renovate[bot]
52c6f6dffc fix(deps): update dependency uuid to v11.1.0 (#33964) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-21 07:24:35 +00:00
Claire
f3bc50778b Merge commit 'f1d4be1e7509f795706ff2310c5fc36e0e79bf4d' into glitch-soc/merge-upstream 2025-02-18 20:38:57 +01:00
renovate[bot]
405fa6de55 fix(deps): update babel monorepo to v7.26.9 (#33929) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-18 08:22:18 +00:00
renovate[bot]
32fd40d689 fix(deps): update dependency sass to v1.85.0 (#33924) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-18 08:21:53 +00:00
renovate[bot]
4d5ae1069c fix(deps): update dependency ioredis to v5.5.0 (#33878) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-18 08:21:24 +00:00
renovate[bot]
c433fd01a6 fix(deps): update dependency postcss-preset-env to v10.1.4 (#33915) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-13 07:58:52 +00:00
renovate[bot]
efd485cb46 fix(deps): update dependency pg to v8.13.3 (#33916) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-13 07:58:27 +00:00
Claire
28d85ede4c Merge commit '4fc8c6912979e8fd7882fb360b77e677ffd68565' into glitch-soc/merge-upstream 2025-02-12 18:40:21 +01:00
renovate[bot]
5c81921ef5 fix(deps): update dependency pg to v8.13.2 (#33892) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-12 08:04:34 +00:00
renovate[bot]
57373ee344 fix(deps): update dependency postcss to v8.5.2 (#33884) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-11 06:39:28 +00:00
renovate[bot]
8a2ebcb8ef fix(deps): update formatjs monorepo (#33877) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-10 10:16:04 +00:00
renovate[bot]
3a47dd78ac fix(deps): update babel monorepo to v7.26.8 (#33868) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-10 09:22:36 +00:00
Claire
a417d6f3fc Merge commit '1cf30717dbe7a0038a645c62f19deef7efc42207' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/precompute_feed_service.rb`:
  Upstream added an option to skip half-generated timelines.
  We have a conflict because we still maintain upstream's old chronological DM
  timelines.
  Update our code to apply the same logic to the DM timelines.
 2025-02-07 21:21:28 +01:00
renovate[bot]
9701c6f148 fix(deps): update dependency sass to v1.84.0 (#33845) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-06 10:54:22 +00:00
Claire
1dbeac2196 Merge commit '3b1ba46c93de63268d20104dee63374d0708deb0' into glitch-soc/merge-upstream 2025-02-04 18:38:41 +01:00
renovate[bot]
cefa829c1d chore(deps): update dependency typescript to v5.7.3 (#33814) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-03 07:48:45 +00:00
renovate[bot]
7481d94bb6 chore(deps): update definitelytyped types (non-major) (#33813) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-02-03 07:48:35 +00:00
Claire
c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream 
Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.
 2025-02-01 19:07:13 +01:00
renovate[bot]
005b2ba32f chore(deps): update dependency pino-pretty to v13 (#33778) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-29 15:18:48 +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
renovate[bot]
b868e30fdf Update dependency @reduxjs/toolkit to v2.5.1 (#33739) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-27 12:47:23 +00:00
renovate[bot]
f8f31826bd Update formatjs monorepo (#33656) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-27 12:46:11 +00:00
renovate[bot]
79cbb6160d Update dependency react-select to v5.10.0 (#33722) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-24 17:16:22 +00:00
renovate[bot]
469c8f8db1 Update babel monorepo to v7.26.7 (#33721) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-24 16:49:48 +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
08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01:00
renovate[bot]
7f866daf63 Update formatjs monorepo (#33652) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-20 10:36:25 +00: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
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
renovate[bot]
febdfefafe Update formatjs monorepo (#33627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-17 08:57:11 +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
renovate[bot]
bfe73e153d Update dependency postcss to v8.5.1 (#33586) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-14 16:34:26 +00:00
renovate[bot]
6356870dae Update dependency sass to v1.83.4 (#33585) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-14 14:14:03 +00:00
renovate[bot]
7b608b41f2 Update dependency @babel/plugin-transform-nullish-coalescing-operator to v7.26.6 (#33584) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-14 14:13:58 +00:00
renovate[bot]
44d9dc4bb0 Update dependency pino-http to v10.4.0 (#33560) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-13 08:51:46 +00:00
renovate[bot]
f3f6b65db4 Update dependency @babel/plugin-transform-nullish-coalescing-operator to v7.26.5 (#33553) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-13 08:47:43 +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
renovate[bot]
e0f6292492 Update dependency uuid to v11.0.5 (#33538) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-01-10 09:12:45 +00:00