Claire
aaa9ec340b
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/formatter.rb`:
Upstream completely refactored the formatting code and removed that file,
while glitch-soc had code for Markdown and HTML toots.
Took upstream code, glitch-soc changes will be re-implemented on top of the
refactored classes in a later commit.
- `app/models/status.rb`:
Upstream refactored status edit handling and moved code to
`app/models/concerns/status_snapshot_concern.rb`.
Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
Not really a conflict, just a line added too close to one modified by
glitch-soc.
Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
Not really a conflict, upstream modified a line adjacent to one added by
glitch-soc.
Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
Upstream refactored formatting, glitch-soc changed the markup slightly.
Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
Upstream completely refactored the formatting code and removed that file,
while glitch-soc had code for Markdown and HTML toots.
Took upstream code, glitch-soc changes will be re-implemented on top of the
refactored classes in a later commit.
2022-03-26 19:18:55 +01:00
Eugen Rochko
24e78969ae
Fix typo ( #17875 )
2022-03-26 04:02:19 +01:00
Eugen Rochko
cefa526c6d
Refactor formatter ( #17828 )
...
* Refactor formatter
* Move custom emoji pre-rendering logic to view helpers
* Move more methods out of Formatter
* Fix code style issues
* Remove Formatter
* Add inline poll options to RSS feeds
* Remove unused helper method
* Fix code style issues
* Various fixes and improvements
* Fix test
2022-03-26 02:53:34 +01:00
Eugen Rochko
2dd30804b6
Change how unconfirmed accounts are displayed in admin UI ( #17874 )
...
Fix #17815
2022-03-26 02:53:13 +01:00
mayaeh
52813830be
Add a hashtag public link to the trending hashtag page ( #17140 )
...
* Add a hashtag public link to the hashtag management page
* Add support for element 'target' to Counter.js.
Remove 'rel' element.
* Update app/javascript/mastodon/components/admin/Counter.js
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-03-26 02:52:51 +01:00
Jeong Arm
6907605026
Add stop delivery link also for failing instance ( #17871 )
2022-03-26 00:39:54 +01:00
Eugen Rochko
71f2b95106
Fix edits with no actual changes being allowed ( #17843 )
...
* Fix edits with no actual changes being allowed locally
* Fix edits with no actual changes being allowed through ActivityPub
* Fix false positive changes caused by description processing in model
* Fix not recording poll expiration update
* Fix test
* Revert changes to ProcessStatusUpdateService
* Various fixes and improvements
* Fix code style issues
* Various changes and improvements
* Add guard clause
2022-03-26 00:38:44 +01:00
Eugen Rochko
e3a2203061
Add offset pagination to trends in REST API ( #17872 )
2022-03-26 00:26:50 +01:00
Claire
f65eaa5aae
Add admin dashboard checks for Elasticsearch version ( #17863 )
2022-03-25 21:00:59 +01:00
Eugen Rochko
b58db8f12e
Add workaround for YouTube Shorts links ( #17869 )
...
* Add workaround for YouTube Shorts links
* Update link_details_extractor_spec.rb
2022-03-25 19:31:35 +01:00
Eugen Rochko
9565b17d5d
New Crowdin updates ( #17829 )
...
* New translations en.json (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Sinhala)
* New translations en.yml (Breton)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Catalan)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Latvian)
* New translations en.yml (Icelandic)
* New translations en.yml (Swedish)
* New translations en.yml (Thai)
* New translations en.yml (Portuguese)
* New translations en.yml (Thai)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Thai)
* New translations en.yml (Danish)
* New translations en.yml (Spanish)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Japanese)
* New translations en.yml (German)
* New translations en.yml (Hungarian)
* New translations en.yml (Italian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Indonesian)
* New translations en.yml (Turkish)
* New translations en.json (Persian)
* New translations simple_form.en.yml (Persian)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Persian)
* New translations en.yml (Thai)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations en.json (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations activerecord.en.yml (Dutch)
* New translations en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* Run `bundle exec i18n-tasks normalize`
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-24 19:23:46 +09:00
Claire
2287eebae0
Fix description of “Allow posts with Content Warnings to trend” setting
2022-03-24 09:49:15 +01:00
Eugen Rochko
6391a869ae
[Glitch] Fix color of show more link in report dialog in web UI
...
Port 69f9dc4f4e
2022-03-23 09:32:59 +01:00
Claire
276b26b614
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-23 08:52:41 +01:00
Claire
749fe73ec4
Add tooltip for instance delivery warnings ( #17854 )
2022-03-22 18:41:46 +01:00
Eugen Rochko
8751c3c495
Fix crash when search fails in web UI ( #17853 )
2022-03-22 18:20:25 +01:00
Eugen Rochko
2de44d3e47
Fix regression of status colors in actions modal in web UI ( #17851 )
...
Regression in #17844
2022-03-22 18:20:08 +01:00
Eugen Rochko
33e7ef4d3d
[Glitch] Fix wrong position of fade-out element in account card in web UI
...
Port d5df9d4797
2022-03-22 18:00:38 +01:00
Eugen Rochko
91e6df7026
[Glitch] Add hint about missing media attachment description in web UI
...
Port 4e9855e09a
2022-03-22 17:55:17 +01:00
Claire
59864ff495
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream modified it, but we deleted it in glitch-soc.
Keep it deleted.
2022-03-22 17:00:38 +01:00
Eugen Rochko
67d550830b
Fix locale not being set in REST API ( #17847 )
2022-03-22 12:29:04 +01:00
Eugen Rochko
d5df9d4797
Fix wrong position of fade-out element in account card in web UI ( #17846 )
2022-03-22 11:58:13 +01:00
Eugen Rochko
392b367835
Fix IDN domains not being rendered correctly in a few left-over places ( #17848 )
2022-03-22 10:07:11 +01:00
Eugen Rochko
4e9855e09a
Add hint about missing media attachment description in web UI ( #17845 )
2022-03-22 09:48:12 +01:00
Eugen Rochko
69f9dc4f4e
Fix color of show more link in report dialog in web UI ( #17844 )
2022-03-22 06:08:05 +01:00
Gomasy
cf5435bb27
Fix being unable to search by domain ( #17832 )
2022-03-21 04:45:58 +01:00
Eugen Rochko
c0e3b20c58
New Crowdin updates ( #17817 )
...
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.json (Russian)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.json (Catalan)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Catalan)
* New translations en.json (Slovak)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations devise.en.yml (Catalan)
* New translations devise.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations devise.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Ukrainian)
* New translations devise.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations devise.en.yml (Danish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations en.json (Persian)
* New translations en.json (Persian)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.json (Vietnamese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Russian)
* New translations en.json (Russian)
* New translations en.json (Russian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* Run `bundle exec i18n-tasks normalize`
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-20 00:23:01 +09:00
Jeong Arm
3349cbeb3e
Fix clean_discarded_statuses ( #17822 )
2022-03-19 09:24:08 +01:00
Claire
a22043ebff
Add missing locales to glitch-soc
2022-03-18 16:41:51 +01:00
Claire
4e3c68e025
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream fixed an issue that glitch-soc did not have, in a place with
glitch-soc changes to hide the number of followers.
Kept glitch-soc's code.
2022-03-17 19:23:39 +01:00
Claire
443d114574
Fix encoding error in OpenGraph account description ( #17821 )
...
Fixes #17816
2022-03-17 16:32:11 +01:00
Claire
a9bafe5df5
Fix some language endonyms ( #17810 )
...
Some language endonyms have been changed with #17478 . I went through them and
tried to pick the one that made the more sense.
2022-03-17 12:55:09 +01:00
Claire
1ffda4cdd4
Fix Sanskrit translation not being used when selected ( #17820 )
...
It is still a very partial translation, though, and the localeData I added is
very partial as well, but at least it now uses the strings that actually got
translated, instead of using English strings.
2022-03-17 12:54:40 +01:00
Claire
588d2b27a7
Remove old files for renamed translation ( #17818 )
...
Follow-up to #17812 in which `kmr` has been renamed to `ku`
2022-03-17 12:54:07 +01:00
Claire
b07906bdb0
Fix wrong language code for Kurdish languages ( #17812 )
2022-03-17 01:37:03 +01:00
Eugen Rochko
779efc7656
New Crowdin updates ( #17771 )
...
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Albanian)
* New translations doorkeeper.en.yml (Asturian)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Esperanto)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* 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 (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Galician)
* New translations doorkeeper.en.yml (Persian)
* New translations doorkeeper.en.yml (Georgian)
* New translations activerecord.en.yml (Welsh)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Asturian)
* New translations doorkeeper.en.yml (Korean)
* New translations devise.en.yml (Asturian)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Spanish)
* New translations doorkeeper.en.yml (Arabic)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Czech)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Armenian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Tamil)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Romanian)
* New translations doorkeeper.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (French)
* New translations devise.en.yml (Esperanto)
* New translations devise.en.yml (Romanian)
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations devise.en.yml (Spanish)
* New translations activerecord.en.yml (Arabic)
* New translations devise.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Corsican)
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* 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 (Kazakh)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Hindi)
* New translations doorkeeper.en.yml (Welsh)
* New translations doorkeeper.en.yml (Serbian (Latin))
* 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 (Breton)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Occitan)
* New translations activerecord.en.yml (Czech)
* New translations devise.en.yml (Polish)
* New translations activerecord.en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations devise.en.yml (Norwegian)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations devise.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations devise.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations devise.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations devise.en.yml (Slovenian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations devise.en.yml (Korean)
* New translations devise.en.yml (Czech)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (German)
* New translations devise.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations devise.en.yml (Greek)
* New translations activerecord.en.yml (Basque)
* New translations devise.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations devise.en.yml (Finnish)
* New translations devise.en.yml (Hebrew)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Hungarian)
* New translations devise.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations devise.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations devise.en.yml (Italian)
* New translations activerecord.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations activerecord.en.yml (Georgian)
* New translations devise.en.yml (Georgian)
* New translations devise.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Bengali)
* New translations devise.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations devise.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations devise.en.yml (Croatian)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations devise.en.yml (Latvian)
* New translations activerecord.en.yml (Hindi)
* New translations devise.en.yml (Hindi)
* New translations devise.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Swedish)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Turkish)
* New translations devise.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations devise.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations devise.en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Vietnamese)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Galician)
* New translations devise.en.yml (Galician)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations devise.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations devise.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Welsh)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations devise.en.yml (Corsican)
* New translations activerecord.en.yml (Sardinian)
* New translations devise.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Kabyle)
* New translations devise.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Tatar)
* New translations devise.en.yml (Tatar)
* New translations activerecord.en.yml (Malayalam)
* New translations devise.en.yml (Malayalam)
* New translations devise.en.yml (Breton)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sinhala)
* New translations devise.en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations activerecord.en.yml (Occitan)
* New translations devise.en.yml (Occitan)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* Run `bundle exec i18n-tasks normalize`
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-17 09:33:25 +09:00
Claire
c9b3cf8510
Fix searching already-known converted activities by URL ( #17814 )
...
Fixes #17813
2022-03-17 00:46:49 +01:00
Claire
c79a03b319
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our README.
2022-03-15 20:45:27 +01:00
Claire
9b139d4ef9
Fix “edited at” in public pages not being properly localized ( #17806 )
...
Fixes #17804
2022-03-15 19:07:25 +01:00
Eugen Rochko
a794117679
Fix individually approved/rejected statuses/links showing as pending review ( #17787 )
2022-03-15 07:51:55 +01:00
Eugen Rochko
e6ffbfb5e7
Add types param to GET /api/v1/notifications in REST API ( #17767 )
...
* Add `types` param to `GET /api/v1/notifications` in REST API
* Improve tests
2022-03-15 04:11:29 +01:00
Eugen Rochko
eebafe24a8
Fix statuses not being referenced in strike when category is spam ( #17786 )
2022-03-15 04:11:13 +01:00
Eugen Rochko
d182470c9d
New Crowdin updates ( #17742 )
...
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Macedonian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Galician)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Tamil)
* New translations en.json (Lithuanian)
* New translations en.json (Georgian)
* New translations en.json (Slovenian)
* New translations en.json (French)
* New translations en.json (Persian)
* New translations en.json (Arabic)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Norwegian)
* New translations en.json (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Dutch)
* New translations en.json (Romanian)
* New translations en.json (Japanese)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Armenian)
* New translations en.json (Occitan)
* New translations en.json (Bengali)
* New translations en.json (Telugu)
* New translations en.json (Marathi)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Uyghur)
* New translations en.json (Welsh)
* New translations en.json (Esperanto)
* New translations en.json (Malay)
* New translations en.json (Hindi)
* New translations en.json (Estonian)
* New translations en.json (Kazakh)
* New translations en.json (Croatian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Silesian)
* New translations en.json (Taigi)
* New translations en.json (Ido)
* New translations en.json (Kabyle)
* New translations en.json (Sanskrit)
* New translations en.json (Sardinian)
* New translations en.json (Corsican)
* New translations en.json (Sinhala)
* New translations en.json (Serbian (Latin))
* New translations en.json (Asturian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Kannada)
* New translations en.json (Cornish)
* New translations en.json (Breton)
* New translations en.json (Malayalam)
* New translations en.json (Tatar)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Vietnamese)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Japanese)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.json (Catalan)
* New translations en.json (Greek)
* New translations en.json (German)
* New translations en.json (Icelandic)
* New translations en.json (Russian)
* New translations en.json (Swedish)
* New translations en.json (Russian)
* New translations en.yml (Indonesian)
* New translations en.json (Russian)
* New translations en.json (Indonesian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Indonesian)
* New translations en.json (Russian)
* New translations en.json (Latvian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.json (Asturian)
* New translations en.yml (Danish)
* New translations en.yml (Asturian)
* New translations en.json (Danish)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Danish)
* New translations en.json (Portuguese)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Danish)
* New translations doorkeeper.en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Italian)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Danish)
* New translations en.json (Spanish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Georgian)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Dutch)
* New translations en.yml (Norwegian)
* New translations en.yml (Punjabi)
* New translations en.yml (Polish)
* New translations en.yml (Albanian)
* New translations en.yml (Basque)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Finnish)
* New translations en.yml (Greek)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Swedish)
* New translations en.yml (Arabic)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Italian)
* New translations en.yml (Japanese)
* New translations en.yml (Russian)
* New translations en.yml (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Occitan)
* New translations en.yml (Persian)
* New translations en.yml (Romanian)
* New translations en.yml (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Sinhala)
* New translations en.yml (Silesian)
* New translations en.yml (Taigi)
* New translations en.yml (Ido)
* New translations en.yml (Kabyle)
* New translations en.yml (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.yml (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kannada)
* New translations en.yml (Cornish)
* New translations en.yml (Breton)
* New translations en.yml (Marathi)
* New translations en.yml (Malayalam)
* New translations en.yml (Tatar)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Uyghur)
* New translations en.yml (Esperanto)
* New translations en.yml (Welsh)
* New translations en.yml (Telugu)
* New translations en.yml (Malay)
* New translations en.yml (Hindi)
* New translations en.yml (Latvian)
* New translations en.yml (Estonian)
* New translations en.yml (Kazakh)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Croatian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Greek)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Latvian)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Japanese)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (Icelandic)
* New translations en.yml (Slovenian)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Catalan)
* New translations en.yml (Russian)
* New translations en.yml (Italian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Spanish)
* New translations en.yml (French)
* New translations en.yml (Turkish)
* New translations en.yml (Indonesian)
* New translations en.json (Turkish)
* New translations en.yml (Indonesian)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Tatar)
* New translations en.json (Tatar)
* New translations simple_form.en.yml (Tatar)
* New translations activerecord.en.yml (Tatar)
* New translations en.yml (Tatar)
* New translations en.json (Tatar)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-03-15 03:01:59 +09:00
Claire
80c4db160e
Fix blank screen when trying to copy emoji with a too large file size ( #1718 )
...
Fixes #1714
2022-03-14 17:34:53 +01:00
Claire
a945182b56
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-14 16:44:35 +01:00
Eugen Rochko
91616004fe
Fix not being able to upload GIF emojis in admin UI ( #17759 )
2022-03-14 05:45:22 +01:00
Eugen Rochko
5db1f377ea
Fix nil error when viewing suspended domain in admin UI ( #17765 )
2022-03-14 05:27:37 +01:00
mayaeh
71e7d38421
Changed to display the "Explore" in "Getting-Started" at all resolutions ( #17762 )
2022-03-13 15:01:30 +01:00
Eugen Rochko
fa47c37f13
Fix public timelines being inaccessible on one stage of responsive layout in web UI ( #17760 )
...
Fix #17756
2022-03-13 09:48:39 +01:00
mayaeh
e38a01c41a
Change the "Explore" icon from fa-globe to fa-hashtag ( #17757 )
2022-03-13 05:15:19 +01:00
