Commit graph

39663 commits

Author SHA1 Message Date
txt-file
0f5e6dd02b
Add support for AVIF uploads (#19647) 2022-11-01 22:08:41 +01:00
prplecake
6fbca53935 Fix CharacterCount in vanilla UI (#1883) 2022-11-01 18:06:07 +01:00
prplecake
56eb1da0f5
Fix CharacterCount in vanilla UI (#1883) 2022-11-01 18:06:07 +01:00
Eugen Rochko
ca1dec3831 Add support for HEIC uploads (#19618) 2022-11-01 16:26:25 +01:00
Eugen Rochko
ae07cfb868
Add support for HEIC uploads (#19618) 2022-11-01 16:26:25 +01:00
Claire
4390103b44 Fix N+1 on mentions in PushUpdateWorker (#19637) 2022-11-01 16:03:51 +01:00
Claire
6804228fdf
Fix N+1 on mentions in PushUpdateWorker (#19637) 2022-11-01 16:03:51 +01:00
Eugen Rochko
529fe25add Change post-processing to be deferred only for large media types (#19617) 2022-11-01 15:27:58 +01:00
Eugen Rochko
15bae3e0e4
Change post-processing to be deferred only for large media types (#19617) 2022-11-01 15:27:58 +01:00
pea-sys
066fcb0d41 png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
pea-sys
c68e6b52d9
png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
Jeong Arm
3e14bba31b Add translatable scripts (js) (#19624) 2022-11-01 13:05:39 +01:00
Jeong Arm
55f54be23c
Add translatable scripts (js) (#19624) 2022-11-01 13:05:39 +01:00
Eugen Rochko
0c0daf7142 Change max. thumbnail dimensions to 640x360px (360p) (#19619) 2022-11-01 13:01:39 +01:00
Eugen Rochko
d0ba77047e
Change max. thumbnail dimensions to 640x360px (360p) (#19619) 2022-11-01 13:01:39 +01:00
Claire
14e07428ec Fix UserCleanupScheduler crash when an unconfirmed account has a moderation note (#19629)
Fixes #19109
2022-11-01 12:59:23 +01:00
Claire
03d9618595
Fix UserCleanupScheduler crash when an unconfirmed account has a moderation note (#19629)
Fixes #19109
2022-11-01 12:59:23 +01:00
Eugen Rochko
3bbe112208 New Crowdin updates (#19517)
* New translations en.json (Persian)

* New translations en.json (Spanish, Argentina)

* New translations simple_form.en.yml (Arabic)

* New translations activerecord.en.yml (Slovenian)

* New translations activerecord.en.yml (Turkish)

* New translations en.json (Persian)

* New translations en.yml (Persian)

* New translations activerecord.en.yml (Spanish)

* New translations en.json (Czech)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.json (Catalan)

* New translations en.json (Greek)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Polish)

* New translations en.json (Chinese Traditional)

* New translations en.json (Latvian)

* New translations simple_form.en.yml (Basque)

* New translations activerecord.en.yml (Greek)

* New translations activerecord.en.yml (Basque)

* New translations activerecord.en.yml (Polish)

* New translations en.yml (German)

* New translations en.json (Vietnamese)

* New translations en.json (Kurmanji (Kurdish))

* New translations simple_form.en.yml (German)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Romanian)

* New translations en.json (Chinese Traditional)

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

* New translations activerecord.en.yml (Afrikaans)

* New translations en.json (German)

* New translations en.json (Romanian)

* New translations en.json (Afrikaans)

* New translations en.json (German)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations activerecord.en.yml (Japanese)

* New translations en.yml (German)

* New translations en.yml (Portuguese, Brazilian)

* New translations simple_form.en.yml (German)

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

* New translations activerecord.en.yml (German)

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

* New translations en.json (Polish)

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

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Italian)

* New translations en.json (Portuguese)

* New translations simple_form.en.yml (German)

* New translations en.json (Bulgarian)

* New translations en.json (Chinese Traditional)

* New translations en.json (Danish)

* New translations en.json (Finnish)

* New translations en.json (Dutch)

* New translations en.json (Danish)

* New translations simple_form.en.yml (Danish)

* New translations activerecord.en.yml (Danish)

* New translations en.json (Dutch)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

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

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

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Spanish, Argentina)

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

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

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

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

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.json (Chinese Simplified)

* New translations en.json (French)

* New translations en.yml (French)

* New translations simple_form.en.yml (French)

* New translations en.yml (German)

* New translations en.json (French)

* New translations en.json (Afrikaans)

* New translations en.yml (Afrikaans)

* New translations en.json (Kabyle)

* New translations en.yml (Kabyle)

* New translations simple_form.en.yml (Kabyle)

* New translations en.yml (Czech)

* New translations en.json (German)

* New translations en.json (French)

* New translations en.yml (Catalan)

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

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

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

* New translations en.yml (German)

* New translations en.json (Bulgarian)

* New translations en.json (German)

* New translations en.yml (Italian)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Greek)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Portuguese)

* New translations en.yml (Vietnamese)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Polish)

* New translations en.yml (Latvian)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Turkish)

* New translations en.yml (Ukrainian)

* New translations simple_form.en.yml (German)

* New translations en.json (German)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Asturian)

* New translations simple_form.en.yml (German)

* New translations doorkeeper.en.yml (German)

* New translations en.json (German)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Basque)

* New translations en.json (Chinese Simplified)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Slovenian)

* New translations simple_form.en.yml (Basque)

* New translations en.yml (Spanish)

* New translations en.json (Spanish)

* New translations en.yml (Basque)

* New translations activerecord.en.yml (Spanish)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Ukrainian)

* New translations activerecord.en.yml (Ukrainian)

* New translations en.json (German)

* New translations en.yml (Ukrainian)

* New translations en.json (Slovenian)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Ukrainian)

* New translations doorkeeper.en.yml (Ukrainian)

* New translations en.json (German)

* New translations en.json (Esperanto)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations doorkeeper.en.yml (Dutch)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Japanese)

* New translations en.json (Slovenian)

* New translations en.yml (Slovenian)

* New translations en.yml (German)

* New translations en.json (Japanese)

* New translations en.json (Indonesian)

* New translations simple_form.en.yml (German)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Indonesian)

* New translations en.yml (Russian)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations en.json (Burmese)

* New translations en.yml (Burmese)

* New translations simple_form.en.yml (Burmese)

* New translations activerecord.en.yml (Burmese)

* New translations devise.en.yml (Burmese)

* New translations doorkeeper.en.yml (Burmese)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations activerecord.en.yml (Indonesian)

* New translations en.json (Burmese)

* New translations en.json (German)

* New translations en.json (Indonesian)

* New translations en.json (Swedish)

* New translations en.json (Icelandic)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations en.json (Hungarian)

* New translations en.json (German)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (German)

* New translations en.yml (Arabic)

* New translations en.json (Hindi)

* New translations en.json (Scottish Gaelic)

* New translations simple_form.en.yml (Arabic)

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

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

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

* New translations activerecord.en.yml (Danish)

* New translations en.json (German)

* New translations en.json (Scottish Gaelic)

* New translations en.json (German)

* New translations en.json (Persian)

* New translations en.yml (Persian)

* New translations en.json (Persian)

* New translations activerecord.en.yml (Persian)

* New translations en.json (Igbo)

* New translations en.yml (Igbo)

* New translations simple_form.en.yml (Igbo)

* New translations activerecord.en.yml (Igbo)

* New translations devise.en.yml (Igbo)

* New translations doorkeeper.en.yml (Igbo)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Spanish, Argentina)

* New translations simple_form.en.yml (Korean)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Igbo)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Galician)

* New translations en.yml (Galician)

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

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-01 18:42:04 +09:00
Eugen Rochko
fea142fb9a
New Crowdin updates (#19517)
* New translations en.json (Persian)

* New translations en.json (Spanish, Argentina)

* New translations simple_form.en.yml (Arabic)

* New translations activerecord.en.yml (Slovenian)

* New translations activerecord.en.yml (Turkish)

* New translations en.json (Persian)

* New translations en.yml (Persian)

* New translations activerecord.en.yml (Spanish)

* New translations en.json (Czech)

* New translations en.json (Arabic)

* New translations en.yml (Arabic)

* New translations en.json (Catalan)

* New translations en.json (Greek)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Polish)

* New translations en.json (Chinese Traditional)

* New translations en.json (Latvian)

* New translations simple_form.en.yml (Basque)

* New translations activerecord.en.yml (Greek)

* New translations activerecord.en.yml (Basque)

* New translations activerecord.en.yml (Polish)

* New translations en.yml (German)

* New translations en.json (Vietnamese)

* New translations en.json (Kurmanji (Kurdish))

* New translations simple_form.en.yml (German)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Romanian)

* New translations en.json (Chinese Traditional)

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

* New translations activerecord.en.yml (Afrikaans)

* New translations en.json (German)

* New translations en.json (Romanian)

* New translations en.json (Afrikaans)

* New translations en.json (German)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations activerecord.en.yml (Japanese)

* New translations en.yml (German)

* New translations en.yml (Portuguese, Brazilian)

* New translations simple_form.en.yml (German)

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

* New translations activerecord.en.yml (German)

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

* New translations en.json (Polish)

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

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Italian)

* New translations en.json (Portuguese)

* New translations simple_form.en.yml (German)

* New translations en.json (Bulgarian)

* New translations en.json (Chinese Traditional)

* New translations en.json (Danish)

* New translations en.json (Finnish)

* New translations en.json (Dutch)

* New translations en.json (Danish)

* New translations simple_form.en.yml (Danish)

* New translations activerecord.en.yml (Danish)

* New translations en.json (Dutch)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

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

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

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Spanish, Argentina)

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

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

* New translations en.json (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

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

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

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

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.json (Chinese Simplified)

* New translations en.json (French)

* New translations en.yml (French)

* New translations simple_form.en.yml (French)

* New translations en.yml (German)

* New translations en.json (French)

* New translations en.json (Afrikaans)

* New translations en.yml (Afrikaans)

* New translations en.json (Kabyle)

* New translations en.yml (Kabyle)

* New translations simple_form.en.yml (Kabyle)

* New translations en.yml (Czech)

* New translations en.json (German)

* New translations en.json (French)

* New translations en.yml (Catalan)

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

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

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

* New translations en.yml (German)

* New translations en.json (Bulgarian)

* New translations en.json (German)

* New translations en.yml (Italian)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Greek)

* New translations en.json (Hungarian)

* New translations en.yml (Hungarian)

* New translations en.yml (Portuguese)

* New translations en.yml (Vietnamese)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Polish)

* New translations en.yml (Latvian)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Turkish)

* New translations en.yml (Ukrainian)

* New translations simple_form.en.yml (German)

* New translations en.json (German)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Asturian)

* New translations simple_form.en.yml (German)

* New translations doorkeeper.en.yml (German)

* New translations en.json (German)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Basque)

* New translations en.json (Chinese Simplified)

* New translations en.json (Basque)

* New translations en.yml (Basque)

* New translations en.json (Slovenian)

* New translations simple_form.en.yml (Basque)

* New translations en.yml (Spanish)

* New translations en.json (Spanish)

* New translations en.yml (Basque)

* New translations activerecord.en.yml (Spanish)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Ukrainian)

* New translations activerecord.en.yml (Ukrainian)

* New translations en.json (German)

* New translations en.yml (Ukrainian)

* New translations en.json (Slovenian)

* New translations en.json (Ukrainian)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Ukrainian)

* New translations doorkeeper.en.yml (Ukrainian)

* New translations en.json (German)

* New translations en.json (Esperanto)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations doorkeeper.en.yml (Dutch)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Japanese)

* New translations en.json (Slovenian)

* New translations en.yml (Slovenian)

* New translations en.yml (German)

* New translations en.json (Japanese)

* New translations en.json (Indonesian)

* New translations simple_form.en.yml (German)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.json (Indonesian)

* New translations en.yml (Russian)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations en.json (Burmese)

* New translations en.yml (Burmese)

* New translations simple_form.en.yml (Burmese)

* New translations activerecord.en.yml (Burmese)

* New translations devise.en.yml (Burmese)

* New translations doorkeeper.en.yml (Burmese)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations activerecord.en.yml (Indonesian)

* New translations en.json (Burmese)

* New translations en.json (German)

* New translations en.json (Indonesian)

* New translations en.json (Swedish)

* New translations en.json (Icelandic)

* New translations en.yml (Indonesian)

* New translations simple_form.en.yml (Indonesian)

* New translations en.json (Hungarian)

* New translations en.json (German)

* New translations en.json (Icelandic)

* New translations en.yml (Icelandic)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Scottish Gaelic)

* New translations en.json (German)

* New translations en.yml (Arabic)

* New translations en.json (Hindi)

* New translations en.json (Scottish Gaelic)

* New translations simple_form.en.yml (Arabic)

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

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

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

* New translations activerecord.en.yml (Danish)

* New translations en.json (German)

* New translations en.json (Scottish Gaelic)

* New translations en.json (German)

* New translations en.json (Persian)

* New translations en.yml (Persian)

* New translations en.json (Persian)

* New translations activerecord.en.yml (Persian)

* New translations en.json (Igbo)

* New translations en.yml (Igbo)

* New translations simple_form.en.yml (Igbo)

* New translations activerecord.en.yml (Igbo)

* New translations devise.en.yml (Igbo)

* New translations doorkeeper.en.yml (Igbo)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Spanish, Argentina)

* New translations simple_form.en.yml (Korean)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Igbo)

* New translations en.json (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations en.json (Galician)

* New translations en.yml (Galician)

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

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-01 18:42:04 +09:00
prplecake
71e4e22f9f Change ul, ol margin-left to 2em (#1879) 2022-11-01 09:41:58 +01:00
prplecake
fc340c9154
Change ul, ol margin-left to 2em (#1879) 2022-11-01 09:41:58 +01:00
prplecake
e8e547b23d Fix 'App settings' link in basic web UI (#1880) 2022-11-01 09:38:55 +01:00
prplecake
c199556f64
Fix 'App settings' link in basic web UI (#1880) 2022-11-01 09:38:55 +01:00
Jeremy Kescher
f00756b79e Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
Jeremy Kescher
41885c8715
Remove/update old "tootsuite" references, except those needed for Docker (#1860) 2022-11-01 09:38:05 +01:00
Claire
0bfb3187fc Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-10-31 18:25:34 +01:00
Claire
968f343006
Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-10-31 18:25:34 +01:00
Claire
78f77cb5d4 Change featured hashtag deletion to be done synchronously (#19590) 2022-10-31 16:31:44 +01:00
Claire
bb1ef11c30
Change featured hashtag deletion to be done synchronously (#19590) 2022-10-31 16:31:44 +01:00
Eugen Rochko
0b91816814 Change design of link footer (#19562) 2022-10-31 13:06:17 +01:00
Eugen Rochko
2d9a85db6e
Change design of link footer (#19562) 2022-10-31 13:06:17 +01:00
Claire
4a8b813a1f Merge branch 'main' into glitch-soc/merge-upstream 2022-10-31 08:37:32 +01:00
Claire
1fe4e5e38c Merge branch 'main' into glitch-soc/merge-upstream 2022-10-31 08:37:32 +01:00
Eugen Rochko
fdfe1eae4a Remove language filtering from hashtag timelines (#19563) 2022-10-30 21:29:23 +01:00
Eugen Rochko
26478f461c
Remove language filtering from hashtag timelines (#19563) 2022-10-30 21:29:23 +01:00
Claire
96bd245f04 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 19:35:59 +01:00
Claire
5fd758fad1 Merge branch 'main' into glitch-soc/merge-upstream 2022-10-30 19:35:59 +01:00
Claire
8c94b641a9 Fix invites (#19560)
Fixes #19507

Fix regression from #19296
2022-10-30 19:04:39 +01:00
Claire
a529d6d93e
Fix invites (#19560)
Fixes #19507

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:32:20 +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
b12ffe1fbf [Glitch] Fix upload progress not communicating processing phase in web UI
Port 89ef2cf044 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:30:58 +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
a1fed002e8 [Glitch] Fix logged out search and changed logged-in search placeholder
Port 973d496b86 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-10-30 18:24:57 +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
525919c04f 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
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
3455b9001f Add reputation and followers score boost to SQL-only account search (#19251) 2022-10-30 13:23:05 +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
eedf46b243 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