Jeremy Kescher
f0422fb416
v3.5.3+1.1.3
2022-11-05 12:26:41 +01:00
Jeremy Kescher
96afc222d2
Merge remote-tracking branch 'upstream/main' into develop
2022-11-05 12:26:08 +01:00
Claire
2f8fb49d13
Fix users not being able to change their hide_followers_count setting ( #1889 )
2022-11-05 11:55:25 +01:00
prplecake
34ba7612d1
Fix 'App settings' label visible in sidebar on mobile UI ( #1888 )
2022-11-05 08:12:04 +01:00
Jeremy Kescher
3bc0621c3c
v3.5.3+1.1.2
2022-11-02 21:16:39 +01:00
Jeremy Kescher
c3bffb95b6
Vanilla flavor: Reduce amount of data stored in initial state for min_options on polls
2022-11-02 21:16:10 +01:00
Jeremy Kescher
3d2fc73ecb
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# app/javascript/mastodon/initial_state.js
2022-11-02 21:12:42 +01:00
prplecake
f359b15303
Allow number of trending hashtags to be customizable ( #1884 )
2022-11-02 09:20:47 +01:00
prplecake
56eb1da0f5
Fix CharacterCount in vanilla UI ( #1883 )
2022-11-01 18:06:07 +01:00
Jeremy Kescher
e1d17e6f34
Update README.md
...
Editing is now enabled in vanilla and glitch-soc
2022-11-01 12:05:14 +01:00
Jeremy Kescher
b127fa6d36
Assign lowest possible scheduling priorities to Sidekiq
2022-11-01 11:54:45 +01:00
Jeremy Kescher
025e6ce643
v3.5.3+1.1.1
2022-11-01 10:30:21 +01:00
Jeremy Kescher
9c8fb2d475
Improve min poll options, expose value in API
2022-11-01 10:29:44 +01:00
Jeremy Kescher
22427cd43c
Merge remote-tracking branch 'upstream/main'
...
# Conflicts:
# app/javascript/flavours/glitch/features/ui/components/link_footer.js
# app/javascript/flavours/glitch/features/ui/components/onboarding_modal.js
2022-11-01 10:23:35 +01:00
prplecake
fc340c9154
Change ul, ol margin-left to 2em ( #1879 )
2022-11-01 09:41:58 +01:00
prplecake
c199556f64
Fix 'App settings' link in basic web UI ( #1880 )
2022-11-01 09:38:55 +01:00
Jeremy Kescher
41885c8715
Remove/update old "tootsuite" references, except those needed for Docker ( #1860 )
2022-11-01 09:38:05 +01:00
Jeremy Kescher
d797cefec3
Change missing profile picture image
2022-10-31 23:05:20 +01:00
Jeremy Kescher
06c090fda5
Redirect old /web links
2022-10-31 22:29:47 +01:00
Jeremy Kescher
30223ea224
Revert version bump for now
...
Shorten "catstodon" to "cat" in version suffix
2022-10-31 21:47:02 +01:00
Jeremy Kescher
7f6215984b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# .github/workflows/build-image.yml
2022-10-31 21:37:48 +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
1fe4e5e38c
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-31 08:37:32 +01:00
Eugen Rochko
26478f461c
Remove language filtering from hashtag timelines ( #19563 )
2022-10-30 21:29:23 +01:00
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
2022-10-30 18:32:20 +01:00
Eugen Rochko
ebfe393e9c
[Glitch] Fix upload progress not communicating processing phase in web UI
...
Port 30ef110224
2022-10-30 18:30:58 +01:00
Eugen Rochko
eb307ec1bd
[Glitch] Fix logged out search and changed logged-in search placeholder
...
Port 55af04b253
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
Jeremy Kescher
6067b452ae
Use mimalloc instead of jemalloc
2022-10-29 23:41:37 +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
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
2022-10-28 19:49:45 +02:00
