luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-17 12:24:31 +00:00
Code Issues Projects Releases Wiki Activity
16215 commits 1 branch 0 tags 248 MiB
Commit graph

16215 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire 5fd758fad1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 19:35:59 +01:00
Claire a529d6d93e
Fix invites (#19560) 
Fixes #19507

Fix regression from #19296
 2022-10-30 19:04:39 +01:00
Eugen Rochko 8048874a3a [Glitch] Fix sidebar and tabs on settings on small screens in admin UI 
Port ad83e64795 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:32:20 +01:00
Eugen Rochko ebfe393e9c [Glitch] Fix upload progress not communicating processing phase in web UI 
Port 30ef110224 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:30:58 +01:00
Eugen Rochko eb307ec1bd [Glitch] Fix logged out search and changed logged-in search placeholder 
Port 55af04b253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-30 18:24:57 +01:00
Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
 2022-10-30 18:15:28 +01:00
Eugen Rochko ac9fb0d654
Add reputation and followers score boost to SQL-only account search (#19251) 2022-10-30 13:23:05 +01:00
Eugen Rochko 40c7f3e830
Fix account action type validation (#19476) 
* Fix account action type validation

Fix #19143

* Fix #19145

* Fix code style issues
 2022-10-30 02:44:32 +02:00
Eugen Rochko 276b85bc91
Fix admin APIs returning deleted object instead of empty object upon delete (#19479) 
Fix #19153
 2022-10-30 02:43:57 +02:00
Eugen Rochko 5724da0780
Fix language not being saved when editing status (#19543) 
Fix #19542
 2022-10-30 02:43:27 +02:00
Eugen Rochko 3b024c563c
Fix not being able to input featured tag with # (#19535) 2022-10-30 02:43:20 +02:00
Eugen Rochko ad83e64795
Fix sidebar and tabs on settings on small screens in admin UI (#19533) 2022-10-30 02:43:15 +02:00
Ben Hardill 6094a916b1
Fix helm chart use of Postgres Password (#19537) 
Fixes #19536
 2022-10-30 01:30:16 +02:00
Eugen Rochko 30ef110224
Fix upload progress not communicating processing phase in web UI (#19530) 2022-10-29 20:05:53 +02:00
Yurii Izorkin a449ee8654
nginx: optimize locations (#19438) 
* nginx: optimize locations

* nginx: don't use regex in locations

* nginx: optimize Cache-Control headaers

* nginx: use 404 error_page for missing static files

* nginx: sort locations

* nginx: add missing HSTS header
 2022-10-29 15:06:23 +02:00
Eugen Rochko f910f0dc92
Fix wrong host being used for custom.css when asset host configured (#19521) 2022-10-29 14:04:24 +02:00
Matthias Bethke 7926cb1bc7
fix name of Lao language (#19520) 
It said ພາສາ or pha-sa, which means just "language" in Lao. "ພາສາລາວ",
pha-sa lao, is the full name but the short "ລາວ" is commonly used.
 2022-10-29 13:34:56 +02:00
Eugen Rochko 55af04b253
Fix logged out search and changed logged-in search placeholder (#19514) 2022-10-29 13:32:49 +02:00
Eugen Rochko e6d415bb1f
New Crowdin updates (#19425) 
* New translations en.yml (Occitan)

* New translations doorkeeper.en.yml (Armenian)

* New translations doorkeeper.en.yml (Danish)

* New translations doorkeeper.en.yml (German)

* New translations doorkeeper.en.yml (Greek)

* New translations doorkeeper.en.yml (Frisian)

* New translations doorkeeper.en.yml (Basque)

* New translations doorkeeper.en.yml (Finnish)

* New translations doorkeeper.en.yml (Hebrew)

* New translations doorkeeper.en.yml (Hungarian)

* New translations doorkeeper.en.yml (Italian)

* New translations doorkeeper.en.yml (Catalan)

* New translations doorkeeper.en.yml (Japanese)

* New translations doorkeeper.en.yml (Georgian)

* New translations doorkeeper.en.yml (Korean)

* New translations doorkeeper.en.yml (Dutch)

* New translations doorkeeper.en.yml (Norwegian)

* New translations doorkeeper.en.yml (Polish)

* New translations doorkeeper.en.yml (Portuguese)

* New translations doorkeeper.en.yml (Czech)

* New translations doorkeeper.en.yml (Bulgarian)

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Corsican)

* New translations en.yml (Sardinian)

* New translations en.yml (Sanskrit)

* New translations en.yml (Kabyle)

* New translations doorkeeper.en.yml (Arabic)

* New translations en.yml (Taigi)

* New translations en.yml (Silesian)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations doorkeeper.en.yml (Romanian)

* New translations doorkeeper.en.yml (French)

* New translations doorkeeper.en.yml (Spanish)

* New translations doorkeeper.en.yml (Afrikaans)

* New translations doorkeeper.en.yml (Russian)

* New translations doorkeeper.en.yml (Slovak)

* New translations doorkeeper.en.yml (Breton)

* New translations doorkeeper.en.yml (Welsh)

* New translations doorkeeper.en.yml (Esperanto)

* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)

* New translations doorkeeper.en.yml (Tatar)

* New translations doorkeeper.en.yml (Malayalam)

* New translations doorkeeper.en.yml (Sinhala)

* New translations doorkeeper.en.yml (Latvian)

* New translations doorkeeper.en.yml (Scottish Gaelic)

* New translations doorkeeper.en.yml (Asturian)

* New translations doorkeeper.en.yml (Occitan)

* New translations doorkeeper.en.yml (Serbian (Latin))

* New translations doorkeeper.en.yml (Kurmanji (Kurdish))

* New translations doorkeeper.en.yml (Sorani (Kurdish))

* New translations doorkeeper.en.yml (Corsican)

* New translations doorkeeper.en.yml (Sardinian)

* New translations doorkeeper.en.yml (Hindi)

* New translations doorkeeper.en.yml (Estonian)

* New translations doorkeeper.en.yml (Slovenian)

* New translations doorkeeper.en.yml (Icelandic)

* New translations doorkeeper.en.yml (Albanian)

* New translations doorkeeper.en.yml (Serbian (Cyrillic))

* New translations doorkeeper.en.yml (Swedish)

* New translations doorkeeper.en.yml (Turkish)

* New translations doorkeeper.en.yml (Ukrainian)

* New translations doorkeeper.en.yml (Chinese Simplified)

* New translations doorkeeper.en.yml (Chinese Traditional)

* New translations doorkeeper.en.yml (Vietnamese)

* New translations doorkeeper.en.yml (Galician)

* New translations doorkeeper.en.yml (Portuguese, Brazilian)

* New translations doorkeeper.en.yml (Kazakh)

* New translations doorkeeper.en.yml (Indonesian)

* New translations doorkeeper.en.yml (Persian)

* New translations doorkeeper.en.yml (Tamil)

* New translations doorkeeper.en.yml (Spanish, Argentina)

* New translations doorkeeper.en.yml (Spanish, Mexico)

* New translations doorkeeper.en.yml (Marathi)

* New translations doorkeeper.en.yml (Thai)

* New translations doorkeeper.en.yml (Croatian)

* New translations doorkeeper.en.yml (Norwegian Nynorsk)

* New translations doorkeeper.en.yml (Kabyle)

* New translations doorkeeper.en.yml (Ido)

* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Czech)

* New translations en.json (Czech)

* New translations simple_form.en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.yml (Hungarian)

* New translations en.yml (Polish)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations simple_form.en.yml (Icelandic)

* New translations activerecord.en.yml (Icelandic)

* New translations devise.en.yml (Icelandic)

* New translations en.yml (Polish)

* New translations en.json (Russian)

* New translations en.yml (Russian)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.json (Latvian)

* New translations en.yml (Latvian)

* New translations simple_form.en.yml (Icelandic)

* New translations en.json (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Vietnamese)

* New translations en.yml (Finnish)

* New translations en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Finnish)

* New translations en.yml (Turkish)

* New translations en.json (Finnish)

* New translations en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Turkish)

* New translations en.json (Dutch)

* New translations en.yml (Catalan)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations activerecord.en.yml (Scottish Gaelic)

* New translations devise.en.yml (Scottish Gaelic)

* New translations en.yml (Greek)

* New translations en.yml (Italian)

* New translations en.yml (Dutch)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Dutch)

* New translations en.yml (Slovenian)

* New translations en.yml (Ukrainian)

* New translations en.yml (Galician)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Chinese Simplified)

* New translations en.yml (Galician)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations en.json (French)

* New translations en.yml (Thai)

* New translations simple_form.en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations simple_form.en.yml (Spanish)

* New translations en.json (French)

* New translations en.yml (French)

* New translations simple_form.en.yml (French)

* New translations en.json (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Portuguese)

* New translations simple_form.en.yml (Portuguese)

* New translations en.yml (Dutch)

* New translations en.json (Dutch)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.json (Breton)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Arabic)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations en.yml (German)

* New translations en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations en.yml (German)

* New translations activerecord.en.yml (Turkish)

* New translations activerecord.en.yml (Polish)

* New translations activerecord.en.yml (Portuguese)

* New translations activerecord.en.yml (Russian)

* New translations activerecord.en.yml (Slovak)

* New translations activerecord.en.yml (Slovenian)

* New translations activerecord.en.yml (Albanian)

* New translations activerecord.en.yml (Serbian (Cyrillic))

* New translations activerecord.en.yml (Swedish)

* New translations activerecord.en.yml (Ukrainian)

* New translations activerecord.en.yml (Dutch)

* New translations activerecord.en.yml (Chinese Simplified)

* New translations activerecord.en.yml (Chinese Traditional)

* New translations activerecord.en.yml (Vietnamese)

* New translations activerecord.en.yml (Galician)

* New translations activerecord.en.yml (Portuguese, Brazilian)

* New translations activerecord.en.yml (Indonesian)

* New translations activerecord.en.yml (Persian)

* New translations activerecord.en.yml (Tamil)

* New translations activerecord.en.yml (Spanish, Argentina)

* New translations activerecord.en.yml (Norwegian)

* New translations activerecord.en.yml (Greek)

* New translations activerecord.en.yml (Romanian)

* New translations activerecord.en.yml (French)

* New translations activerecord.en.yml (Spanish)

* New translations activerecord.en.yml (Afrikaans)

* New translations activerecord.en.yml (Arabic)

* New translations activerecord.en.yml (Bulgarian)

* New translations activerecord.en.yml (Catalan)

* New translations activerecord.en.yml (Czech)

* New translations activerecord.en.yml (Danish)

* New translations activerecord.en.yml (German)

* New translations activerecord.en.yml (Frisian)

* New translations activerecord.en.yml (Basque)

* New translations activerecord.en.yml (Finnish)

* New translations activerecord.en.yml (Hebrew)

* New translations activerecord.en.yml (Hungarian)

* New translations activerecord.en.yml (Armenian)

* New translations activerecord.en.yml (Italian)

* New translations activerecord.en.yml (Japanese)

* New translations activerecord.en.yml (Georgian)

* New translations activerecord.en.yml (Korean)

* New translations activerecord.en.yml (Spanish, Mexico)

* New translations activerecord.en.yml (Bengali)

* New translations activerecord.en.yml (Sorani (Kurdish))

* New translations activerecord.en.yml (Asturian)

* New translations activerecord.en.yml (Occitan)

* New translations activerecord.en.yml (Serbian (Latin))

* New translations activerecord.en.yml (Kurmanji (Kurdish))

* New translations activerecord.en.yml (Corsican)

* New translations activerecord.en.yml (Breton)

* New translations activerecord.en.yml (Sardinian)

* New translations activerecord.en.yml (Kabyle)

* New translations activerecord.en.yml (Ido)

* New translations activerecord.en.yml (Sinhala)

* New translations activerecord.en.yml (Malayalam)

* New translations activerecord.en.yml (Marathi)

* New translations activerecord.en.yml (Hindi)

* New translations activerecord.en.yml (Thai)

* New translations activerecord.en.yml (Croatian)

* New translations activerecord.en.yml (Norwegian Nynorsk)

* New translations activerecord.en.yml (Kazakh)

* New translations activerecord.en.yml (Estonian)

* New translations activerecord.en.yml (Latvian)

* New translations activerecord.en.yml (Tatar)

* New translations activerecord.en.yml (Welsh)

* New translations activerecord.en.yml (Esperanto)

* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)

* New translations activerecord.en.yml (Standard Moroccan Tamazight)

* New translations activerecord.en.yml (Catalan)

* New translations activerecord.en.yml (Italian)

* New translations activerecord.en.yml (Dutch)

* New translations activerecord.en.yml (Swedish)

* New translations activerecord.en.yml (Ukrainian)

* New translations activerecord.en.yml (Latvian)

* New translations activerecord.en.yml (Icelandic)

* New translations activerecord.en.yml (Chinese Traditional)

* New translations activerecord.en.yml (Vietnamese)

* New translations activerecord.en.yml (Spanish, Argentina)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations simple_form.en.yml (Korean)

* New translations activerecord.en.yml (Korean)

* New translations activerecord.en.yml (Portuguese)

* New translations en.yml (Korean)

* New translations en.json (Galician)

* New translations en.yml (Galician)

* New translations activerecord.en.yml (Galician)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-10-29 14:35:49 +09:00
Eugen Rochko dc5c86add7
Fix account migration form ever using outdated account data (#18429) 2022-10-29 01:31:45 +02:00
Eugen Rochko 317ec06dc7
Fix error when uploading malformed CSV import (#19509) 2022-10-28 23:30:44 +02:00
Claire 26ff48ee48 Fix domain block export not exporting blocks with only media rejection 2022-10-28 20:14:25 +02:00
Claire bbdf61c9e4 Revert Home controller test to upstream 2022-10-28 20:12:04 +02:00
Eugen Rochko 8814a1b949 [Glitch] Fix closed registrations message not appearing in web UI 
Port 5fa340931e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:49:45 +02:00
Eugen Rochko 9f6c175550 [Glitch] Fix number of uses being shown again on trending hashtags in web UI 
Port 923f06a07c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:49:45 +02:00
Claire 2cb3dd9364 [Glitch] Change admin announcement edition interface to use datetime-local 
Port d9d722d74b to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:49:45 +02:00
Robert Laurenz 047a2f1f1b [Glitch] fix(component): adjust style of counter button to fix overflow issue 
Port 10922294ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:49:45 +02:00
Claire b514998dc1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:49:42 +02:00
Eugen Rochko 5fa340931e
Fix closed registrations message not appearing in web UI (#19508) 
Regression from #19486
 2022-10-28 19:34:22 +02:00
Claire 592147b902 Remove local settings items that make no sense anymore 2022-10-28 19:30:51 +02:00
Claire f405ad69b3 [Glitch] Remove navigation links to /explore when trends are disabled 
Port 267978d4fe to glithc-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:26:28 +02:00
Eugen Rochko 89fdfb8fe6 [Glitch] Fix redirecting to /publish when compose form is visible in web UI 
Port 5452af2188 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:26:28 +02:00
Eugen Rochko 80b53623e1 [Glitch] Change settings area to be separated into categories in admin UI 
Port 7c152acb2c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 58e2b0973d [Glitch] Fix media, following and followers tabs in web UI 
Port 73de39e632 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko c9d3c7d63a [Glitch] Fix too many featured tags causing navigation panel scroll in web UI 
Port 23d367f544 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 7bb1b917b2 [Glitch] Change featured hashtags to be displayed in navigation panel 
Port aefa9253d6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 2cea6e5564 [Glitch] Remove volume number from hashtags in web UI 
Port c55219efa8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Takeshi Umeda 8be350cc82 [Glitch] Add featured tags selector for WebUI 
Port 4c7b5fb6c1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko a2942fd0b8 [Glitch] Fix nofollow rel being removed in web UI 
Port 9757c917da to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko e9ccee38a7 [Glitch] Change floating action button to be a button in header in web UI 
Port 1fd6460b02 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Claire 05c1dd9114 [Glitch] Add closed registrations modal 
Port 2277913f3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko ce27c6502b [Glitch] Fix notifications about deleted reports not being also deleted 
Port d2eb726962 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 5dfb7ba35c [Glitch] Fix missing delete and redraft link in web UI 
Port 371d969403 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko b36c58b99e [Glitch] Change post editing to be enabled in web UI 
Port 8ebff0efcb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 2d731dbde6 [Glitch] Add ability to view previous edits of a status in admin UI 
Port f8ca3bb2a1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Claire d9f182e5f3 [Glitch] Fix WebUI notification settings for new user and new report notifications 
Port dd76bbf8b7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko bfa47eb7d6 [Glitch] Fix language dropdown causing zoom on mobile devices in web UI 
Port 3ad0a2ae3d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 1315c149c0 [Glitch] Add error boundary around routes in web UI 
Port a43a823768 to glitch-soc

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 92385da9c3 [Glitch] Fix reply not opening compose page on certain screen sizes in web UI 
Port 56efa8d22f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00
Eugen Rochko 7d3acb1f2c [Glitch] Fix error when rendering limited account in web UI 
Port 73a48318a1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-10-28 19:24:02 +02:00