~cytrogen/masto-fe

ref: 15733b2844e9dd4cd808c47cf4f6dee6dedb7071 masto-fe/config d---------
0f77cb59 — Thiago 'Jedi' Cerqueira 1 year, 1 month ago
[chore] Add dev script for easier development loop (#16)

This PR adds a npm "dev" script. Upon executing `npm run dev`, the project will be served (default port 3035) in "watch" mode, every local change of the files will refresh the page.

This change should enable faster development loop.

Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/16
Co-authored-by: Thiago 'Jedi' Cerqueira <thiagoa7@gmail.com>
Co-committed-by: Thiago 'Jedi' Cerqueira <thiagoa7@gmail.com>
[chore] Remove more unused files (#3)

Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/3
Co-authored-by: tobi <tobi.smethurst@protonmail.com>
Co-committed-by: tobi <tobi.smethurst@protonmail.com>
weeeeeeeee
6ac4848f — Laura Hausmann 2 years ago
Merge remote-tracking branch 'upstream' into glitch
45a19ddf — Claire 2 years ago
Merge pull request #2440 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 27e84c069112a3d2abfad947642457cc997a261a
3735e6f7 — Claire 2 years ago
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
1a4a23b5 — Claire 2 years ago
Merge pull request #2439 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 4c2aca777f6ae6942d0cf11aee56a925694ccdef
1a2a4c38 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27347)

Co-authored-by: GitHub Actions <noreply@github.com>
3da7afde — Claire 2 years ago
Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream
9af24835 — Claire 2 years ago
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f
d235afc3 — Laura Hausmann 2 years ago
Disable chunking
89b48681 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27321)

Co-authored-by: GitHub Actions <noreply@github.com>
53f5b27b — Claire 2 years ago
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
86c9c5af — Claire 2 years ago
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
ac237077 — Claire 2 years ago
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream

Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
e9a181c5 — Claire 2 years ago
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
702d1629 — Claire 2 years ago
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
d7fcd700 — Claire 2 years ago
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
19ebf779 — Claire 2 years ago
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
e0b54ed3 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#27304)

Co-authored-by: GitHub Actions <noreply@github.com>
Next