Ariadne Conill
716858b8c7
th: fix autocomplete
2022-11-07 17:32:46 +00:00
Ariadne Conill
f28a74d014
th: config: CSP: add unsafe-eval for scripts
2022-11-07 17:30:16 +00:00
Ariadne Conill
5b92324e54
th: app: api: base_controller: allow API access to be configurable
2022-11-06 19:13:50 +00:00
Ariadne Conill
9ee65200fd
th: locales: fix YAML quoting issue
...
Psych::SyntaxError: (/opt/mastodon/config/locales/simple_form.en.yml): mapping values are not allowed in this context at line 102 column 103
2022-11-06 18:43:54 +00:00
dfa1d7b22e
Merge branch 'rebase/4.0.0rc1'
2022-11-06 18:23:41 +00:00
kouhai dev
ced3e4e27c
th: update account request question prompt
2022-11-06 18:22:00 +00:00
Ariadne Conill
697b1f4a2d
th: vanilla: emoji: use 63x63 grid for emoji
2022-11-06 18:21:57 +00:00
Ariadne Conill
5ab9afa33f
th: glitch: emoji: set sprite sheet to 63x63
2022-11-06 18:21:52 +00:00
Ariadne Conill
b17c429263
th: dockerfile: implement emoji-mart patch
2022-11-06 18:20:15 +00:00
Ariadne Conill
5ac86a2097
th: update emoji-mart sprite sheet for emoji 13.1
2022-11-06 18:20:15 +00:00
Ariadne Conill
e79855991e
th: add emoji 13.1 data for emoji-mart
2022-11-06 18:20:15 +00:00
kouhai dev
eb1ef52ba9
th: update account request question prompt
2022-11-06 01:36:06 -07:00
6543708c41
Fix users not being able to change their hide_followers_count setting ( #1889 )
2022-11-05 11:55:25 +01:00
b6e72884ca
Fix 'App settings' label visible in sidebar on mobile UI ( #1888 )
2022-11-05 08:12:04 +01:00
0527968d31
Allow number of trending hashtags to be customizable ( #1884 )
2022-11-02 09:20:47 +01:00
6fbca53935
Fix CharacterCount in vanilla UI ( #1883 )
2022-11-01 18:06:07 +01:00
71e4e22f9f
Change ul, ol margin-left to 2em ( #1879 )
2022-11-01 09:41:58 +01:00
e8e547b23d
Fix 'App settings' link in basic web UI ( #1880 )
2022-11-01 09:38:55 +01:00
f00756b79e
Remove/update old "tootsuite" references, except those needed for Docker ( #1860 )
2022-11-01 09:38:05 +01:00
0bfb3187fc
Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-10-31 18:25:34 +01:00
4a8b813a1f
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-31 08:37:32 +01:00
fdfe1eae4a
Remove language filtering from hashtag timelines ( #19563 )
2022-10-30 21:29:23 +01:00
96bd245f04
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-30 19:35:59 +01:00
8c94b641a9
Fix invites ( #19560 )
...
Fixes #19507
Fix regression from #19296
2022-10-30 19:04:39 +01:00
974c21ac09
[Glitch] Fix sidebar and tabs on settings on small screens in admin UI
...
Port 361a2a3516
2022-10-30 18:32:20 +01:00
b12ffe1fbf
[Glitch] Fix upload progress not communicating processing phase in web UI
...
Port 89ef2cf044
2022-10-30 18:30:58 +01:00
a1fed002e8
[Glitch] Fix logged out search and changed logged-in search placeholder
...
Port 973d496b86
2022-10-30 18:24:57 +01:00
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
3455b9001f
Add reputation and followers score boost to SQL-only account search ( #19251 )
2022-10-30 13:23:05 +01:00
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
69f2f514d2
Fix admin APIs returning deleted object instead of empty object upon delete ( #19479 )
...
Fix #19153
2022-10-30 02:43:57 +02:00
fa30d092f2
Fix language not being saved when editing status ( #19543 )
...
Fix #19542
2022-10-30 02:43:27 +02:00
c129275c25
Fix not being able to input featured tag with `#` ( #19535 )
2022-10-30 02:43:20 +02:00
361a2a3516
Fix sidebar and tabs on settings on small screens in admin UI ( #19533 )
2022-10-30 02:43:15 +02:00
6682f12a9e
Fix helm chart use of Postgres Password ( #19537 )
...
Fixes #19536
2022-10-30 01:30:16 +02:00
89ef2cf044
Fix upload progress not communicating processing phase in web UI ( #19530 )
2022-10-29 20:05:53 +02:00
87b5ede13a
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
57d54172f4
Fix wrong host being used for custom.css when asset host configured ( #19521 )
2022-10-29 14:04:24 +02:00
150f5b0e6c
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
973d496b86
Fix logged out search and changed logged-in search placeholder ( #19514 )
2022-10-29 13:32:49 +02:00
6ad2304088
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
6099eecf57
Fix account migration form ever using outdated account data ( #18429 )
2022-10-29 01:31:45 +02:00
92a6d04ba6
Fix error when uploading malformed CSV import ( #19509 )
2022-10-28 23:30:44 +02:00
1686374b2f
Fix domain block export not exporting blocks with only media rejection
2022-10-28 20:14:25 +02:00
ba03c25249
Revert Home controller test to upstream
2022-10-28 20:12:04 +02:00
1a71d95760
[Glitch] Fix closed registrations message not appearing in web UI
...
Port 528f96e769
2022-10-28 19:49:45 +02:00
96e921ff5e
[Glitch] Fix number of uses being shown again on trending hashtags in web UI
...
Port c7f1ae40b5
2022-10-28 19:49:45 +02:00
b1875bdb6f
[Glitch] Change admin announcement edition interface to use datetime-local
...
Port 9cb523d3be
2022-10-28 19:49:45 +02:00
c7f3efb312
[Glitch] fix(component): adjust style of counter button to fix overflow issue
...
Port 21aa2217de
2022-10-28 19:49:45 +02:00
d192bdf6f6
Merge branch 'main' into glitch-soc/merge-upstream
2022-10-28 19:49:42 +02:00
Ariadne Conill
Ariadne Conill
kouhai dev