Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,683 Commits 74 Branches 58 Tags
e7498887a7f66ff7fe4877f18d2f464ce7c5f5ff
Commit Graph

2883 Commits

Author SHA1 Message Date
Claire
e7498887a7 Merge commit '2e9b2df570af19b67a5ccc754c7b581034ca79c6' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Upstream removed some code that somehow had been modified in glitch-soc.
  Removed it as upstream did.
 2025-03-24 20:06:25 +01:00
Eugen Rochko
2e9b2df570 Add double tap to zoom and swipe to dismiss to media modal in web UI (#34210) 
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com>
 2025-03-24 17:25:30 +00:00
renovate[bot]
82acef50b0 fix(deps): update dependency sass to v1.86.0 (#34197) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-24 15:46:38 +00:00
renovate[bot]
0a5bbf5ac6 chore(deps): update definitelytyped types (non-major) (#34247) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-24 08:10:07 +00:00
Claire
f1fa6b3cd0 Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream 2025-03-22 15:41:48 +01:00
renovate[bot]
c03e3129a0 fix(deps): update dependency axios to v1.8.4 (#34219) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-20 15:12:59 +00:00
Claire
d2c4f69148 Merge commit '30e334b51a4e7add05401895bff5a2ea4a97e0bd' into glitch-soc/merge-upstream 2025-03-17 20:25:32 +01:00
renovate[bot]
2a5853989f fix(deps): update dependency pg to v8.14.1 (#34194) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-17 16:27:45 +00:00
Claire
0efa669fe9 Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream 2025-03-15 17:49:32 +01:00
renovate[bot]
f4f444528a Update dependency react-textarea-autosize to v8.5.8 (#34169) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-14 09:03:20 +00:00
Claire
b330cc21c4 Merge commit 'aff51823752b809c3349698b6be02bfdda7a9010' into glitch-soc/merge-upstream 2025-03-12 19:48:51 +01:00
renovate[bot]
98d703ac91 Update dependency pg to v8.14.0 (#34141) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-12 16:25:27 +00:00
renovate[bot]
2454a81e71 Update dependency axios to v1.8.3 (#34146) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-12 15:51:43 +00:00
renovate[bot]
41e8eaa872 Update babel monorepo to v7.26.10 (#34144) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-12 15:10:37 +00:00
Claire
fb55d09f77 Merge commit 'fb34d9c5909116d586a0187d86ada36ee1234f61' into glitch-soc/merge-upstream 2025-03-10 19:48:45 +01:00
renovate[bot]
ddfcf1c092 fix(deps): update dependency @reduxjs/toolkit to v2.6.1 (#34113) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-10 09:33:55 +00:00
Claire
4bea9a0a66 Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream 2025-03-07 18:34:27 +01:00
Claire
9d5a9123b9 Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream 2025-03-07 13:15:10 +01:00
renovate[bot]
feedab26f0 fix(deps): update dependency axios to v1.8.2 (#34101) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-07 09:39:53 +00:00
Claire
b6f3cfb302 Merge commit 'e5655a5f65eb8116640ae434125553e0fe77f35e' into glitch-soc/merge-upstream 2025-03-06 20:10:00 +01:00
renovate[bot]
5fa034fe68 fix(deps): update dependency ioredis to v5.6.0 (#34085) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-03-06 15:28:34 +00:00
renovate[bot]
d2ce9a6064 chore(deps): update eslint (non-major) (#33061) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2025-03-06 13:55:44 +00:00
Damien Erambert
debe6c0545 Add emoji from Twemoji 15.0 to the emoji picker/completion (#33395) 2025-03-05 17:05:15 +00:00
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