treehouse
/
mastodon
19
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/javascript
History
Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.
 		2023-02-25 14:00:40 +01:00
..
core [Glitch] Run eslint --fix 2023-02-03 20:52:07 +01:00
flavours [Glitch] Fix focus point of already-attached media not saving after edit 2023-02-19 10:54:04 +01:00
fonts Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
locales
…
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
packs Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00