~cytrogen/masto-fe

ref: 8215df76c070f7d400a6091fcb1c0f6ff78474a0 masto-fe/app/javascript d---------
8215df76 — neatchee 3 years ago
[Glitch] Remove legacy decorators syntax

Port d1b057a0ac41a5756b6a416d2f290b086cb59220 to glitch-soc
00c839b9 — Nick Schonning 3 years ago
[Glitch] Remove isNaN polyfill

Port b46125224c26bc0144659b4319ea416b01289961 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
14b03110 — Claire 3 years ago
Merge branch 'main' into glitch-soc/main
6e8711ff — Yamagishi Kazutoshi 3 years ago
Add missing parenthesis (#24238)

d1b057a0 — Yamagishi Kazutoshi 3 years ago
Remove legacy decorators syntax (#18357)

867790e0 — Claire 3 years ago
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
b4612522 — Nick Schonning 3 years ago
Remove isNaN polyfill (#24224)

16da4a09 — Christian Schmidt 3 years ago
Fix broken links in account gallery (#24218)

b4f60bc6 — mogamin 3 years ago
[Glitch] Fit the max-width of media in .prose to parent box

Port 0a9def5498d9630bb9ebf1585f76b2af5fad5169 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
5ac380c1 — Claire 3 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream.
0a9def54 — mogamin 3 years ago
Fit the max-width of media in .prose to parent box (#24180)

02ac9449 — Plastikmensch 3 years ago
Add getting-started-misc to route (#2141)

* Add getting-started-misc to web_app_paths

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

* Add signed in check to navigation entries

Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.

Also fixed the keys as these were literally "i++".

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

* Remove "Extended information" from getting-started-misc

I couldn't find any reference to this translation string, so I removed it too.

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

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
00fe0f6c — Claire 3 years ago
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
8f97ffe9 — Christian Schmidt 3 years ago
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint

Port bd047acc356671727c112336bb237f979bba517d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
19325055 — Claire 3 years ago
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
f5daa20f — Claire 3 years ago
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
a0859011 — Eugen Rochko 3 years ago
New Crowdin updates (#23904)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
bd047acc — Christian Schmidt 3 years ago
Replace `Status#translatable?` with language matrix in separate endpoint (#24037)

32418f0f — Rodion Borisov 3 years ago
[Glitch] Center the text itself in upload area

Port a52ccd7ad98d7d60dffb520c0397ba8aa4c2eb9d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
17fb58bf — PauloVilarinho 3 years ago
[Glitch] add modal message when editing toot

Port 8770473dbb92042f76e058469a76e5bb4beecb9f to glitch-soc

Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Next