~cytrogen/masto-fe

ref: 09ebf7e37c8bdaaf15f02cfec0d117ed55d63dae masto-fe/app/javascript/mastodon/features d---------
b2515feb — Claire 2 years ago
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
42f36aa5 — Claire 2 years ago
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
993d0a99 — Claire 2 years ago
Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream

Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file.
217ef7f2 — gunchleoc 2 years ago
Replace 'favourite' by 'favorite' for American English (#26009)

59478a1b — Trevor Wolf 2 years ago
change focus ui for keyboard only input (#25935)

e4ea80d8 — Claire 2 years ago
Change thread view to scroll to the selected post rather than the post being replied to (#24685)

586b1c9d — Stanislas Signoud 2 years ago
Fix a missing redirection on getting-started in multi column mode (#26070)

1a33f1df — Claire 2 years ago
Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
c04f2d0c — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes.
a442a1d1 — Claire 2 years ago
Fix “Back” button sometimes redirecting out of Mastodon (#25281)

2f6ac6b4 — Claire 2 years ago
Merge pull request #2300 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
d9adda1a — Claire 2 years ago
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
3952d175 — Claire 2 years ago
Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
71db616f — Claire 2 years ago
Change “About” and “Privacy policy” links to open in a new tab in advanced interface (#25973)

5fad7bd5 — Stanislas Signoud 2 years ago
Change links in multi-column mode so tabs are open in single-column mode (#25893)

41f65edb — Claire 2 years ago
Fix embed dropdown menu item for unauthenticated users (#25964)

25571b18 — Claire 2 years ago
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
447ab7ab — Renaud Chaput 2 years ago
[Glitch] Convert Home timeline components to Typescript

Port a75138d07336c2f10a8cbdba86f72f08c81cf9d7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
177497b3 — Claire 2 years ago
Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream
95a1fde6 — Claire 2 years ago
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
Next