~cytrogen/masto-fe

fbfc4145 — Claire 2 years ago
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
1b5d3fdc — Claire 2 years ago
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
e67c28a5 — Christian Schmidt 2 years ago
[Glitch] Remove redundant ready() wrapper

Port bb51c0676d0cf27babc2c01ee337ca5fd24ae37c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7b09f585 — Claire 2 years ago
Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did.
8eb09466 — Claire 2 years ago
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc
452f15be — Claire 2 years ago
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
c053bfc4 — Claire 2 years ago
[Glitch] Fix “legal” report category not showing up in moderation interface

Port 0446394465c505660c4b29185980e58a040da037 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
10404aec — Claire 2 years ago
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
245fe855 — Claire 2 years ago
[Glitch] Fix unfollow icon styling in advanced column

Port d9c21293aa6e105cedeff6b5e469af40a20909d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2126812f — Claire 2 years ago
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
128daefc — Claire 2 years ago
Remove leftover `.orig` files that were mistakenly included (#2379)

4f1d2262 — Claire 2 years ago
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714
724d7738 — mogaminsk 2 years ago
[Glitch] Fix "Create Account" button in interaction modal

Port a664e1570242c98abcfd7d74e78473bdb8b85587 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7e25e311 — Claire 2 years ago
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
1cdcd9dc — renovate[bot] 2 years ago
Update eslint (non-major) (#26567)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
d3b4422b — renovate[bot] 2 years ago
Update dependency core-js to v3.32.1 (#26548)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
872fe2d6 — Christian Schmidt 2 years ago
Do not start LibreTranslate and Elasticsearch on GitHub Codespaces (#26382)

d24a87ce — Daniel M Brasil 2 years ago
Add ability to delete avatar or header picture via the API (#25124)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
bb23116e — Christian Schmidt 2 years ago
Fix profile picture preview (#26538)

ee702e36 — Claire 2 years ago
Change follow recommendation materialized view to be faster in most cases (#26545)

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Next