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,995 Commits 74 Branches 58 Tags
a5020a3ed35a563b8cc01389344b58d84b6c2629
Commit Graph

1934 Commits

Author SHA1 Message Date
Claire
3ec3814f8e Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream 2025-05-03 17:37:26 +02:00
Eugen Rochko
926c67c648 Refactor <ActionsModal> to TypeScript (#34559) 2025-04-28 11:43:42 +00:00
Claire
5e679f41f9 Merge commit 'e097f0e9eb76514efc405f3d1cef0692ff4cff35' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  glitch-soc-specific dependency too close to a dependency updated upstream.
  Updated dependencies as upstream did.
 2025-04-22 19:55:29 +02:00
Gomasy
6027764c31 Fix icon crushed when account name was too long (#34514) 2025-04-22 12:39:35 +00:00
Claire
3628717595 Merge commit '3159f3b2f6ed444d4f247c5e7864e4c41ca285df' into glitch-soc/merge-upstream 2025-04-21 15:47:21 +02:00
Claire
8cbd99e645 Merge commit 'a324edabdfc19b6978ed31800b92e36022006cd5' into glitch-soc/merge-upstream 2025-04-21 14:32:47 +02:00
Eugen Rochko
ee62ac53e1 Add "Mutual" relationship tag to profiles in web UI (#34467) 2025-04-17 08:10:11 +00:00
SASAGAWA Hiroto
5991caae87 Disable kerning for Japanese text to preserve monospaced alignment for readability (#34448) 2025-04-14 10:57:21 +00:00
Claire
2e16be22bf Merge commit '0e5be63fb327403902076df602ec2dd410ada789' into glitch-soc/merge-upstream 2025-04-08 20:26:30 +02:00
Claire
4b491674b2 Merge commit '887336f2c66b6ac5049d10bf5f27fa69a15e0745' into glitch-soc/merge-upstream 2025-04-08 19:12:28 +02:00
Eugen Rochko
bdf9baa2e8 Refactor <FollowedTags> into TypeScript (#34355) 2025-04-08 16:06:23 +00:00
Echo
ff7230df06 Forces radio buttons to be correctly centred (#34389) 2025-04-07 10:56:30 +00:00
Echo
54aefa9014 Fix visual glitches with filtering posts (#34387) 2025-04-07 10:55:04 +00:00
Claire
99e3ea232f Merge commit '5f87ae101c5e0e940e148d493eaac1ce31fe24c1' into glitch-soc/merge-upstream 2025-04-04 20:00:24 +02:00
Eugen Rochko
2c70c28bbb Refactor <DomainBlocks> to TypeScript (#34347) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2025-04-02 12:31:39 +00:00
Claire
aebb6c8ab7 Merge commit 'b4e56822c72db54ba338940e2517a4e25e2159a6' into glitch-soc/merge-upstream 2025-03-31 17:12:44 +02:00
Eugen Rochko
70e14c1ed0 Fix being unable to hide controls in full screen video in web UI (#34308) 2025-03-31 08:17:57 +00:00
Essem
5e74cb6c40 Fix remaining Sass deprecation logs in win95 style (#3022) 2025-03-31 08:54:03 +02:00
Claire
c06527cf5d Merge commit 'e5fd61a84eb3a919c1e53f688e424df9d0f20924' into glitch-soc/merge-upstream 2025-03-28 20:48:53 +01:00
Eugen Rochko
e5fd61a84e Refactor <Video> to TypeScript (#34284) 2025-03-28 12:15:43 +00:00
Claire
e8a652a8dd Fix win95 theme 2025-03-27 20:46:46 +01:00
Claire
eb8dd42de0 Merge commit '8a3bed1933b7afdaa196639b753f41e743c4491a' into glitch-soc/merge-upstream 2025-03-27 20:31:48 +01:00
Echo
8a3bed1933 Fix SASS deprecation notices (#34278) 2025-03-27 13:09:42 +00:00
Claire
4ace929129 Merge commit '94d71c992e0fd88fc3a3fc92b598f139c874ab3f' into glitch-soc/merge-upstream 2025-03-25 21:12:37 +01:00
Eugen Rochko
94d71c992e Refactor alerts to TypeScript, remove react-notification dependency (#34239) 2025-03-25 18:25:07 +00:00
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
Claire
f1fa6b3cd0 Merge commit '1960aac90b16fce1ec620ac990aa931efcf04700' into glitch-soc/merge-upstream 2025-03-22 15:41:48 +01:00
Eugen Rochko
1960aac90b Fix display of failed-to-load image attachments in web UI (#34217) 2025-03-21 10:23:49 +00:00
Claire
0efa669fe9 Merge commit '2f98134ac69ee840095c9d8389e4b2fff72f20c1' into glitch-soc/merge-upstream 2025-03-15 17:49:32 +01:00
Eugen Rochko
d213c585ff Add age verification on sign-up (#34150) 2025-03-14 14:07:29 +00:00
Claire
24ec83ee52 Fix timeline banners sizing (#34171) 2025-03-14 11:10:26 +00:00
Claire
dbd3e05812 Merge commit 'b57687083f4af178f2e2f43665eb4e49d32a50c2' into glitch-soc/merge-upstream 2025-03-07 17:37:36 +01:00
Claire
9d5a9123b9 Merge commit 'ce23342d72a7f2ca6f8c35727c86ba54c9c365ca' into glitch-soc/merge-upstream 2025-03-07 13:15:10 +01:00
Eugen Rochko
cadda2f957 Add effective date to terms of service (#33993) 2025-03-05 09:01:33 +00:00
Eugen Rochko
43f616a1c8 Fix infinite scroll not working on profile media tab in web UI (#33860) 2025-03-03 14:16:17 +00:00
Claire
844ae90dad Merge commit '2beab34ca405a0beb3ea9f5ab684779dc2eb6374' into glitch-soc/merge-upstream 2025-01-29 12:05:09 +01:00
Eugen Rochko
82183d8a79 Add loading indicator to timeline gap indicators in web UI (#33762) 2025-01-29 08:46:04 +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
Eugen Rochko
81271a18c5 Fix color of language indicator in light theme in web UI (#33724) 2025-01-27 08:08:31 +00:00
Eugen Rochko
2df86d6413 Fix wrong styles on rules and buttons in the sign-up form (#33725) 2025-01-24 22:20:05 +00:00
Eugen Rochko
0885c31633 Add information about alt text to alt text modal in web UI (#33702) 2025-01-23 13:01:11 +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
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
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
Claire
50449ae7ac Fix media preview height in compose form when 3 or more images are attached (#33571) 2025-01-13 11:48: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
Claire
82e046ea06 Fix preview card sizing in “Author attribution” in profile settings (#33482) 2025-01-07 11:29:38 +00:00