1
0
Commit Graph

18675 Commits

Author SHA1 Message Date
Noa Himesaka
c14df2ee6b remove annoying workflows 2023-07-26 11:37:02 +09:00
Noa Himesaka
65a680d6d5 fix workflow part 3 2023-07-24 16:49:22 +09:00
Noa Himesaka
7d03969154 fix workflow part 2 2023-07-24 16:32:31 +09:00
Noa Himesaka
b23fda8334 fix workflow 2023-07-24 16:25:28 +09:00
Noa Himesaka
2a4e1764bd build image every time 2023-07-24 14:15:03 +09:00
Noa Himesaka
a52fafba6e Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-07-24 14:05:38 +09:00
Plastikmensch
cf9affdeac
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>
2023-07-23 18:50:24 +02:00
Plastikmensch
51311c1978
Fix CW icon being on wrong side in app settings in RTL languages (#2324)
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-07-23 17:19:09 +02:00
Jeong Arm
944c29033d
Fix relationship-tag background color (#2322) 2023-07-23 14:40:37 +02:00
github-actions[bot]
9ec43107f2
New Crowdin translations (#2319)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-23 14:31:38 +02:00
Claire
49767d20bd
Fix glitch local settings navigation items not being proper buttons (#2320) 2023-07-23 14:31:16 +02:00
Claire
dd09535bda
Annotate doodle parameters to please eslint (#2321) 2023-07-23 14:31:05 +02:00
Noa Himesaka
a6a42473c2
Merge branch 'glitch-soc:main' into main 2023-07-23 01:42:42 +09:00
Claire
52500965cc
Fix “Open in advanced web interface” being shown on mobile view (#2318)
Fixes #2307
2023-07-22 17:22:04 +02:00
github-actions[bot]
9a45198ab0
New Crowdin translations (#2317)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-22 09:53:26 +02:00
Noa Himesaka
294694c599 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-07-21 23:29:54 +09:00
github-actions[bot]
e7cb6c6c44
New Crowdin translations (#2314)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-21 09:26:08 +02:00
github-actions[bot]
2649fbce04
New Crowdin translations (#2310)
Co-authored-by: GitHub Actions <noreply@github.com>
2023-07-19 08:39:14 +02:00
Claire
949f1fc343
Fix Crowdin Github Action (#2311) 2023-07-19 08:36:25 +02:00
Claire
a04a30f852
Merge pull request #2309 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-07-19 08:18:05 +02:00
Claire
0092fe50ac 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`
2023-07-19 07:35:51 +02:00
Claire
111686c38b
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]
2023-07-19 07:05:33 +02:00
github-actions[bot]
47832a1ac0
New Crowdin Translations (automated) (#26054)
Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 21:13:25 +02:00
Claire
ff41e5426a
Change request timeout handling to use a longer deadline (#26055) 2023-07-18 20:51:20 +02:00
Matt Jankowski
6657695ec6
Fix haml-lint InstanceVariables rule for auth/registrations/edit (#26061) 2023-07-18 18:10:52 +02:00
Matt Jankowski
f6dda59e5d
Fix haml-lint Rubocop Style/SymbolProc cop (#26059) 2023-07-18 17:43:04 +02:00
Matt Jankowski
39d9804119
Fix haml-lint Rubocop Style/WordArray cop (#26058) 2023-07-18 17:25:41 +02:00
Matt Jankowski
b3f48089e6
Fix haml-lint rubocop style negation cops (#26057) 2023-07-18 17:02:02 +02:00
Renaud Chaput
b8931311a0
Fixes to the new Image build actions (#26056) 2023-07-18 16:56:42 +02:00
Renaud Chaput
626a7b6a77
Add a Github Action to send translations to Crowdin for each merge in main (#25869) 2023-07-18 16:56:01 +02:00
Renaud Chaput
d184524233
Rework the container image build actions (#26007) 2023-07-18 13:36:12 +02:00
Daniel M Brasil
59b38f9ee4
Migrate to request specs in /api/v1/mutes (#25622) 2023-07-18 13:05:19 +02:00
Matt Jankowski
e663e6d2c2
Fix haml-lint ConsecutiveSilentScripts rule (#26043) 2023-07-18 09:25:37 +02:00
renovate[bot]
6245cec185
Update dependency ox to v2.14.17 (#26044)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-18 09:24:48 +02:00
Daniel M Brasil
58bfe8c43a
Migrate to request specs in /api/v1/bookmarks (#25520) 2023-07-18 09:15:50 +02:00
Daniel M Brasil
5a7c6c6597
Migrate to request specs in /api/v1/timelines/public (#25746)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-18 09:15:18 +02:00
forsamori
55cf18b689
Add MacOS M1/2 setup steps to README (#25682)
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-18 09:02:45 +02:00
Claire
1a33f1df17
Merge pull request #2305 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-07-17 21:06:58 +02:00
Claire
0c45bed333 [Glitch] Fix “Back” button sometimes redirecting out of Mastodon
Port a442a1d1c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 19:12:09 +02:00
Claire
c04f2d0cf7 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.
2023-07-17 19:02:23 +02:00
Claire
0e1d2e15a3
Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-07-17 18:58:40 +02:00
Matt Jankowski
4207c95d4f
Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947) 2023-07-17 18:18:13 +02:00
Claire
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon (#25281) 2023-07-17 17:32:46 +02:00
Matt Jankowski
d0f00206dc
Fix haml-lint Rubocop Style/StringLiterals cop (#25948) 2023-07-17 16:57:18 +02:00
Daniel M Brasil
19208aa422
Migrate to request specs in /api/v1/statuses/:status_id/favourite (#25626) 2023-07-17 16:53:57 +02:00
Daniel M Brasil
6fb4a756ff
Migrate to request specs in /api/v1/statuses/:status_id/bookmark (#25624) 2023-07-17 16:51:49 +02:00
Daniel M Brasil
4859958a0c
Migrate to request specs in /api/v1/polls (#25596) 2023-07-17 16:50:00 +02:00
Daniel M Brasil
1aea938d3d
Migrate to request specs in /api/v1/statuses/:status_id/pin (#25635) 2023-07-17 16:24:05 +02:00
Daniel M Brasil
6cdc8408a9
Migrate to request specs in /api/v1/emails/confirmations (#25686) 2023-07-17 16:22:33 +02:00
Daniel M Brasil
8a1aabaac1
Migrate to request specs in /api/v1/timelines/home (#25743) 2023-07-17 16:20:11 +02:00