~cytrogen/masto-fe

ref: e69fe94669295245503ed56f3912a5caf4bdbc2f masto-fe/app/javascript d---------
e69fe946 — Plastikmensch 2 years ago
Fix "All" live feed not loading automatically. (#2332)

The dispatch to expand the timeline was missing the `allowLocalOnly` param.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
8864d5b5 — github-actions[bot] 2 years ago
New Crowdin translations (#2327)

Co-authored-by: GitHub Actions <noreply@github.com>
6256cee0 — Claire 2 years ago
Change error boundary to upstream's (#2323)

cf9affde — Plastikmensch 2 years ago
Apply padding to all notifications in notif-cleaning mode (#2325)

* Add missing padding to notif-cleaning for admin-sign-up

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Apply padding to all notification types instead

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
51311c19 — Plastikmensch 2 years ago
Fix CW icon being on wrong side in app settings in RTL languages (#2324)

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
944c2903 — Jeong Arm 2 years ago
Fix relationship-tag background color (#2322)

9ec43107 — github-actions[bot] 2 years ago
New Crowdin translations (#2319)

Co-authored-by: GitHub Actions <noreply@github.com>
49767d20 — Claire 2 years ago
Fix glitch local settings navigation items not being proper buttons (#2320)

dd09535b — Claire 2 years ago
Annotate doodle parameters to please eslint (#2321)

52500965 — Claire 2 years ago
Fix “Open in advanced web interface” being shown on mobile view (#2318)

Fixes #2307
9a45198a — github-actions[bot] 2 years ago
New Crowdin translations (#2317)

Co-authored-by: GitHub Actions <noreply@github.com>
e7cb6c6c — github-actions[bot] 2 years ago
New Crowdin translations (#2314)

Co-authored-by: GitHub Actions <noreply@github.com>
a04a30f8 — Claire 2 years ago
Merge pull request #2309 from ClearlyClaire/glitch-soc/merge-upstream

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

Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`
111686c3 — Claire 2 years ago
New Crowdin updates (#2306)

* New translations en.json (French)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.json (Afrikaans)
[ci skip]

* New translations en.json (Arabic)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.json (German)
[ci skip]

* New translations en.json (Irish)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.json (Georgian)
[ci skip]

* New translations en.json (Korean)
[ci skip]

* New translations en.json (Lithuanian)
[ci skip]

* New translations en.json (Macedonian)
[ci skip]

* New translations en.json (Punjabi)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Turkish)
[ci skip]

* New translations en.json (Ukrainian)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Chinese Traditional)
[ci skip]

* New translations en.json (Urdu (Pakistan))
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.json (Persian)
[ci skip]

* New translations en.json (Tamil)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.json (Spanish, Mexico)
[ci skip]

* New translations en.json (Bengali)
[ci skip]

* New translations en.json (Marathi)
[ci skip]

* New translations en.json (Croatian)
[ci skip]

* New translations en.json (Kazakh)
[ci skip]

* New translations en.json (Telugu)
[ci skip]

* New translations en.json (English, United Kingdom)
[ci skip]

* New translations en.json (Esperanto)
[ci skip]

* New translations en.json (Uyghur)
[ci skip]

* New translations en.json (Tatar)
[ci skip]

* New translations en.json (Malayalam)
[ci skip]

* New translations en.json (Latin)
[ci skip]

* New translations en.json (Bosnian)
[ci skip]

* New translations en.json (French, Quebec)
[ci skip]

* New translations en.json (Cornish)
[ci skip]

* New translations en.json (Kannada)
[ci skip]

* New translations en.json (Occitan)
[ci skip]

* New translations en.json (Igbo)
[ci skip]

* New translations en.json (Sardinian)
[ci skip]

* New translations en.json (Kabyle)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Italian)
[ci skip]

* New translations en.yml (Norwegian)
[ci skip]

* New translations en.yml (Ukrainian)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Mexico)
[ci skip]

* New translations en.yml (Esperanto)
[ci skip]

* New translations simple_form.en.yml (French)
[ci skip]

* New translations simple_form.en.yml (Spanish)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations simple_form.en.yml (German)
[ci skip]

* New translations simple_form.en.yml (Italian)
[ci skip]

* New translations simple_form.en.yml (Korean)
[ci skip]

* New translations simple_form.en.yml (Norwegian)
[ci skip]

* New translations simple_form.en.yml (Polish)
[ci skip]

* New translations simple_form.en.yml (Ukrainian)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]

* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]

* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]

* New translations simple_form.en.yml (French, Quebec)
[ci skip]

* New translations en.json (Polish)
[ci skip]

* New translations en.json (Spanish, Argentina)
[ci skip]

* New translations en.yml (Spanish, Argentina)
[ci skip]
47832a1a — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26054)

Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1a33f1df — Claire 2 years ago
Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
0c45bed3 — Claire 2 years ago
[Glitch] Fix “Back” button sometimes redirecting out of Mastodon

Port a442a1d1c69e5d477ca1c05f0bc5fc0f6894b223 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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.
0e1d2e15 — Claire 2 years ago
Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
Next