Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-16 01:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,205 Commits 74 Branches 58 Tags
8b418b84d0d022823e7fc23b385aef35c456875f
Commit Graph

4611 Commits

Author SHA1 Message Date
Claire
17ba99e5de Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict because of glitch-soc's theming change.
  Adapted upstream's changes.
- `docker-compose.yml`:
  Conflict because of container repo name change.
  Adapted upstream's changes.
- `yarn.lock`:
  Conflict because of an additional glitch-soc dependency.
  Updated the dependencies upstream did.
 2025-12-10 18:05:44 +01:00
Claire
6838497fe8 Add title and description to Opengraph data for Wrapstodon share page (#37188) 2025-12-10 11:27:10 +00:00
Claire
05e45beb34 Merge commit '607449336da198ea9fe9c014220a5374a0ca1ae4' into glitch-soc/merge-upstream 2025-12-08 16:33:27 +01:00
github-actions[bot]
85bf5be604 New Crowdin Translations (automated) (#37146) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-08 11:42:24 +00:00
David Roetzel
8625721805 Draft API to get all collections by an account (#37139) 2025-12-08 08:56:13 +00:00
Claire
2f6cdd6d47 Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream 2025-12-05 20:00:40 +01:00
github-actions[bot]
429d6bcab4 New Crowdin Translations (automated) (#37131) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-05 09:43:12 +00:00
Claire
c8f365fd1d Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream 2025-12-04 20:59:54 +01:00
Claire
34aa825e96 Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream 2025-12-04 20:16:21 +01:00
David Roetzel
9921fa1af7 First draft API to delete collections (#37117) 2025-12-04 13:47:23 +00:00
David Roetzel
5a7a4fff11 First draft of Collection update API (#37110) 2025-12-04 10:00:21 +00:00
github-actions[bot]
9cf52fb976 New Crowdin Translations (automated) (#37115) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-04 09:19:08 +00:00
Claire
5d84957117 Add shareable wrapstodon links (#37047) 2025-12-03 11:00:41 +00:00
github-actions[bot]
954f397743 New Crowdin Translations (automated) (#37098) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-03 10:11:20 +00:00
Claire
13cf55c501 Merge commit '92278796c3d0fa43c08bd59f66815b196fb273a3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream removed the feature flag and refactored, while we have a slightly
  different theming system.
  Updated accordingly.
- `stylelint.config.js`:
  Upstream removed overrides for the temporary themes.
  Did the same.
 2025-12-02 20:45:10 +01:00
Claire
f8422e1fa4 Add API for on-demand generation of annual reports (#37055) 2025-12-02 13:37:05 +00:00
Claire
2b25b65972 Add missing translations for web push notifications (#37078) 2025-12-02 10:52:08 +00:00
github-actions[bot]
2e5744e8c6 New Crowdin Translations (automated) (#37088) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-02 10:20:40 +00:00
David Roetzel
2d203ca72a First draft of API to get a single collection (#37053) 2025-12-01 15:04:52 +00:00
github-actions[bot]
f562ad9f67 New Crowdin Translations (automated) (#37063) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-12-01 09:42:49 +00:00
Claire
99ff59b7b2 Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream 2025-11-30 17:47:27 +01:00
Claire
44e6abe48b Merge commit '0004ed4c8021ebd400d32eb32a5e479ebd7bcf91' into glitch-soc/merge-upstream 2025-11-30 16:40:18 +01:00
diondiondion
92278796c3 Remove theme_tokens feature flag & make new styles the default (#37056) 2025-11-28 15:58:46 +00:00
David Roetzel
f896bbac3b Draft API to create Collections (#37049) 2025-11-28 13:30:43 +00:00
github-actions[bot]
6b38352b17 New Crowdin Translations (automated) (#37042) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-28 10:44:50 +00:00
github-actions[bot]
90466d0262 New Crowdin Translations (automated) (#37026) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-27 09:51:15 +00:00
github-actions[bot]
384594f462 New Crowdin Translations (automated) (#37018) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-26 10:25:41 +00:00
Claire
868d45df2f Merge commit 'ca53195b31ef7eb9205f879e022b09b28efc9314' into glitch-soc/merge-upstream 2025-11-25 18:22:48 +01:00
github-actions[bot]
f0d7ea61ef New Crowdin Translations (automated) (#37000) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-25 09:52:51 +00:00
Claire
b76530a7f1 Merge commit '76d8ac3fe680e92d20059c590ccb1cd8f74078c2' into glitch-soc/merge-upstream 2025-11-24 19:08:03 +01:00
github-actions[bot]
e44a9c0879 New Crowdin Translations (automated) (#36984) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-24 08:08:01 +00:00
Claire
652ed7ab50 Merge commit '585545d0d5678a6ea4b958af4a3bc6593134d0f6' into glitch-soc/merge-upstream 2025-11-21 19:33:14 +01:00
David Roetzel
7ffa5fa0c4 Add models to represent "Collections" (#36977) 2025-11-21 10:28:23 +00:00
github-actions[bot]
cfa4f402ef New Crowdin Translations (automated) (#36976) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-21 09:34:55 +00:00
Claire
dd7d750f5d Merge commit '21ce99f746e17867df74029d3b2caca45588818d' into glitch-soc/merge-upstream 2025-11-20 18:13:37 +01:00
github-actions[bot]
8e8669b5ef New Crowdin Translations (automated) (#36957) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-20 10:54:39 +00:00
Claire
7a56972381 Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream 2025-11-19 21:49:09 +01:00
Claire
a4fd9b704a Merge commit '284b46fee7ad682b52c99d0455a1134e1d4e3fc3' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added an experimental feature flag to try out theme refactors.
  Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
  Ditto.
 2025-11-19 21:34:53 +01:00
diondiondion
366856f3bc Fix theme-related Vite errors even when theme_tokens feature flag is disabled (#36936) 2025-11-19 12:37:15 +00:00
github-actions[bot]
81ffd1d3c7 New Crowdin Translations (automated) (#36933) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-19 10:09:54 +00:00
github-actions[bot]
b14f113929 New Crowdin Translations (automated) (#36922) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-18 08:22:25 +00:00
diondiondion
284b46fee7 Implement CSS theme tokens behind feature flag (#36861) 2025-11-17 09:44:55 +00:00
github-actions[bot]
489bee8f4e New Crowdin Translations (automated) (#36898) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-17 09:33:15 +00:00
Claire
e0d7230f97 Merge commit 'c87b05282909383353a9561e97b9f18a2db0766d' into glitch-soc/merge-upstream 2025-11-14 18:19:00 +01:00
github-actions[bot]
ebc99cd597 New Crowdin Translations (automated) (#36893) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-14 15:57:35 +00:00
Matt Jankowski
f8ffb85566 Use date attribute for date of birth (#36039) 2025-11-14 15:17:53 +00:00
github-actions[bot]
f243a00b90 New Crowdin Translations (automated) (#36875) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-14 10:27:20 +00:00
Claire
bebc79d160 Merge commit '98c8c1ebd278f59e97c7d17628e7710cd4c933d4' into glitch-soc/merge-upstream 2025-11-13 18:12:49 +01:00
github-actions[bot]
3f292e0f5b New Crowdin Translations (automated) (#36858) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-11-13 10:18:16 +00:00
Claire
9525134c28 Merge commit '7e7f63a2efc83edd7c59a12e55eaab9509a4c15b' into glitch-soc/merge-upstream 2025-11-12 18:11:41 +01:00