Jeremy Kescher
e695bed558
Merge remote-tracking branch 'upstream/main'
2022-05-27 17:42:15 +02:00
Claire
53c89ee44b
Add language indicator icon and local settings for status icons ( #1788 )
...
* Add language indicator
* Add local settings for status icons
* Switch to text icon for language
2022-05-27 16:34:29 +02:00
Claire
6dd7180f05
Fix incorrect permission check for notifications destroy/dismiss endpoints ( #1787 )
2022-05-27 16:21:59 +02:00
Jeremy Kescher
df0616fd2a
Merge remote-tracking branch 'upstream/main'
2022-05-27 00:33:11 +02:00
Claire
3f10136a41
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-26 23:30:10 +02:00
Eugen Rochko
0a1992430d
Fix errors when rendering RSS feeds ( #18531 )
2022-05-26 23:02:42 +02:00
Claire
7c6fff34d0
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-26 22:49:47 +02:00
Eugen Rochko
52f4e834f2
Fix concurrent unfollowing decrementing follower count more than once ( #18527 )
2022-05-26 22:14:47 +02:00
Eugen Rochko
8a9acbe604
Fix being able to appeal a strike unlimited times ( #18529 )
...
Peculiarity of the `has_one` association is that the convenience
creation method deletes the previous association even if the new
one is invalid
2022-05-26 22:08:12 +02:00
Eugen Rochko
c4d2c39a75
Fix being able to report otherwise inaccessible statuses ( #18528 )
2022-05-26 22:08:02 +02:00
Eugen Rochko
1ff4877945
Fix empty votes arbitrarily increasing voters count in polls ( #18526 )
2022-05-26 22:06:10 +02:00
Eugen Rochko
976cd6413e
Fix moderator leak in undo_mark_statuses_as_sensitive ( #18525 )
...
Signed-off-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: 40826d <74816220+40826d@users.noreply.github.com>
2022-05-26 22:04:16 +02:00
Eugen Rochko
9f81b9f29a
Fix suspended users being able to access APIs that don't require a user ( #18524 )
2022-05-26 22:04:05 +02:00
Eugen Rochko
96129c2f10
Fix confirmation redirect to app without Location
header ( #18523 )
2022-05-26 22:03:54 +02:00
Jeremy Kescher
22699c9807
Revert reverting "Change algorithm of tootctl search deploy
to improve performance ( #18463 )".
...
This reverts commit 9076a7bdd4
, since the issue should be fixed by 088dc0ec5a
.
2022-05-26 20:58:16 +02:00
Jeremy Kescher
198a6803f3
Merge remote-tracking branch 'upstream/main'
2022-05-26 20:57:00 +02:00
Eugen Rochko
3e0e7a1cfb
Fix follower and other counters being able to go negative ( #18517 )
2022-05-26 20:32:48 +02:00
Claire
f13d910f3e
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-26 18:34:27 +02:00
Eugen Rochko
088dc0ec5a
Fix regression in tootctl search deploy
caused by unloaded attribute ( #18514 )
2022-05-26 18:05:47 +02:00
Eugen Rochko
a4fa9e23fc
Change "dangerous" to "sensitive" in privacy policy and web UI ( #18515 )
...
Fix #18470
2022-05-26 17:55:05 +02:00
Claire
440eb71310
Change unapproved and unconfirmed account to not be accessible in the REST API ( #17530 )
...
* Change unapproved and unconfirmed account to not be accessible in the REST API
* Change Account#searchable? to reject unconfirmed and unapproved users
* Disable search for unapproved and unconfirmed users in Account.search_for
* Disable search for unapproved and unconfirmed users in Account.advanced_search_for
* Remove unconfirmed and unapproved accounts from Account.searchable scope
* Prevent mentions to unapproved/unconfirmed accounts
* Fix some old tests for Account.advanced_search_for
* Add some Account.advanced_search_for tests for existing behaviors
* Add some tests for Account.search_for
* Add Account.advanced_search_for tests unconfirmed and unapproved accounts
* Add Account.searchable tests
* Fix Account.without_unapproved scope potentially messing with previously-applied scopes
* Allow lookup of unconfirmed/unapproved accounts through /api/v1/accounts/lookup
This is so that the API can still be used to check whether an username is free
to use.
2022-05-26 15:50:33 +02:00
Claire
25dda3061e
Fix unnecessary query on status creation ( #17901 )
2022-05-26 00:20:30 +02:00
Jeremy Kescher
360d5fb092
Merge remote-tracking branch 'upstream/main'
2022-05-25 17:06:22 +02:00
Claire
444b650094
Add checkmark on top of status icon buttons when they are active ( #1783 )
2022-05-25 15:09:45 +02:00
Claire
3fd2aadb23
Various code cleanup ( #1782 )
...
* Remove duplicate in_chosen_languages definition
* Use `DEFAULT_FIELDS_SIZE` instead of `MAX_FIELDS` to reduce code differences with upstream
* Remove duplicate annotation
* Fix incorrect cross-flavor imports
* Remove deprecated `hide_network` setting (replaced by account column)
* Remove unused KeywordMutesHelper
* Remove trailing spaces
* Remove commit_hash from InstancePresenter, as it has been unused since mid-2017
2022-05-25 12:27:11 +02:00
Jeremy Kescher
9076a7bdd4
Revert "Change algorithm of tootctl search deploy
to improve performance ( #18463 )"
...
This reverts commit a9b64b24d6
.
Reverted commit introduced a regression already reported at https://github.com/glitch-soc/mastodon/issues/1781 .
2022-05-24 21:22:48 +02:00
Jeremy Kescher
66426afd31
Merge remote-tracking branch 'upstream/main'
2022-05-24 17:19:20 +02:00
Eugen Rochko
96f29ce91a
New Crowdin updates ( #18458 )
...
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Armenian)
* New translations en.json (Armenian)
* New translations en.json (Armenian)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Russian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Russian)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-24 23:33:18 +09:00
Claire
4ab3ad3bef
Fix crash in glitch-soc search results when Elasticsearch is disabled ( #1780 )
2022-05-24 16:10:18 +02:00
Yamagishi Kazutoshi
228ec75048
[Glitch] Fix languages dropdown on light theme
...
Port e925b06721
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-24 14:23:03 +02:00
Claire
22111914bf
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-24 13:59:21 +02:00
Claire
fe65c0e44f
Fix leading spaces being stripped in Markdown code blocks
...
Fixes #1776
2022-05-24 10:24:59 +02:00
Claire
e5997a1956
Fix warning an account outside of a report closing all reports for that account ( #18387 )
...
* Fix warning an account outside of a report closing all reports for that account
* Make it clear what actions solve other reports
* Revert "Make it clear what actions solve other reports"
This reverts commit ad006de821f72e75480701298d13f0945b509059.
2022-05-23 20:38:29 +02:00
Eugen Rochko
a9b64b24d6
Change algorithm of tootctl search deploy
to improve performance ( #18463 )
2022-05-22 22:16:43 +02:00
Yamagishi Kazutoshi
e925b06721
Fix languages dropdown on light theme ( #18460 )
2022-05-19 19:26:19 +02:00
Eugen Rochko
9a0fa28993
New Crowdin updates ( #18419 )
...
* New translations en.json (German)
* New translations en.json (Welsh)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.json (Turkish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Asturian)
* New translations en.json (Irish)
* New translations en.json (Arabic)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Galician)
* New translations en.json (Czech)
* New translations en.json (Slovak)
* New translations en.json (Icelandic)
* New translations en.json (Sorani (Kurdish))
* New translations en.json (English, United Kingdom)
* New translations en.json (Norwegian)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Bulgarian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Malayalam)
* 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 (Kurmanji (Kurdish))
* New translations en.json (Serbian (Latin))
* New translations en.json (Occitan)
* New translations en.json (Kannada)
* New translations en.json (Cornish)
* New translations en.json (Sinhala)
* New translations en.json (Breton)
* New translations en.json (Tatar)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Kazakh)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Icelandic)
* New translations en.json (German)
* New translations en.json (Turkish)
* New translations en.json (Icelandic)
* New translations en.json (Greek)
* New translations en.json (Chinese Traditional)
* New translations en.json (Catalan)
* New translations en.json (Latvian)
* New translations en.json (Czech)
* New translations en.json (Indonesian)
* New translations en.json (Korean)
* New translations en.json (Russian)
* New translations en.json (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (German)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Danish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Afrikaans)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese)
* New translations en.yml (Italian)
* New translations en.json (Italian)
* New translations en.yml (Italian)
* New translations en.json (Catalan)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (French)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Catalan)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Korean)
* New translations en.json (Polish)
* New translations en.yml (Ido)
* New translations en.json (Czech)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Ido)
* New translations en.json (Russian)
* New translations en.json (Latvian)
* New translations en.yml (Russian)
* New translations en.json (Russian)
* New translations devise.en.yml (Russian)
* New translations en.yml (Ido)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese)
* New translations en.yml (Ido)
* New translations en.json (Catalan)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* Run `yarn manage:translations`
* New translations en.json (Chinese Simplified)
* New translations en.yml (Slovenian)
* New translations en.json (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.json (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Spanish)
* New translations en.json (Greek)
* New translations en.json (Thai)
* New translations en.json (Turkish)
* New translations en.json (Turkish)
* New translations en.json (Italian)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Afrikaans)
* New translations en.yml (Basque)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.json (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Chinese Simplified)
* New translations en.json (German)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations en.json (Galician)
* New translations devise.en.yml (Galician)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Russian)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Ido)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (German)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.yml (Korean)
* New translations en.json (Ukrainian)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Thai)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Russian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations devise.en.yml (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (French)
* New translations en.json (Indonesian)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Vietnamese)
* New translations en.json (Esperanto)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* New translations en.yml (Ido)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-19 19:58:16 +09:00
Eugen Rochko
679b7158e3
Change search indexing to use batches to minimize resource usage ( #18451 )
2022-05-18 23:29:14 +02:00
Jeremy Kescher
4d1c07e80f
Merge remote-tracking branch 'upstream/main'
2022-05-17 21:11:48 +02:00
Claire
e0bdaeab65
Fix NoMethodError when resolving a link that redirects to a local post ( #18314 )
...
* Fix NoMethodError when resolving a link that redirects to a local post
* Fix tests
2022-05-17 14:52:26 +02:00
Eugen Rochko
2e5fb45be5
[Glitch] Add language dropdown to compose in web UI
...
Port 0cdb077570
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-16 23:06:29 +02:00
Claire
4415005de7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict caused because of minor code style change upstream, while glitch-soc
has different code for handling variable maximum chars.
Ported the change.
- `app/serializers/initial_state_serializer.rb`:
Conflict because glitch-soc had two extra attributes where upstream added
one.
Added upstream's attribute.
2022-05-16 22:29:05 +02:00
Eugen Rochko
6c699b1723
Fix preferred posting language returning unusable value in REST API ( #18428 )
2022-05-16 19:13:36 +02:00
Claire
b91196f4b7
Add confirmation page when importing blocked domains ( #1773 )
...
* Move glitch-soc-specific strings to glitch-soc-specific locale files
* Add confirmation page when importing blocked domains
2022-05-16 18:26:49 +02:00
Jeremy Kescher
df99208718
Merge remote-tracking branch 'upstream/main'
2022-05-16 17:36:04 +02:00
Eugen Rochko
0cdb077570
Add language dropdown to compose in web UI ( #18420 )
2022-05-16 11:18:35 +02:00
Claire
040b7d37a4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict due to glitch-soc having extra code for a proper direct visibility
timeline, in a part of the code upstream refactored.
Restored glitch-soc's extra code in the refactored bit.
2022-05-16 09:42:32 +02:00
Levi Bard
94e98864e3
Allow import/export of instance-level domain blocks/allows ( #1754 )
...
* Allow import/export of instance-level domain blocks/allows.
Fixes #15095
* Pacify circleci
* Address simple code review feedback
* Add headers to exported CSV
* Extract common import/export functionality to
AdminExportControllerConcern
* Add additional fields to instance-blocked domain export
* Address review feedback
* Split instance domain block/allow import/export into separate pages/controllers
* Address code review feedback
* Pacify DeepSource
* Work around Paperclip::HasAttachmentFile for Rails 6
* Fix deprecated API warning in export tests
* Remove after_commit workaround
2022-05-16 09:29:01 +02:00
Yamagishi Kazutoshi
c3fac61f56
Fix Mastodon::RaceConditionError
that occurs when external status is reblogged ( #18424 )
...
* Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged
* Replace to `@object`
2022-05-16 01:00:09 +02:00
Jeremy Kescher
07c2a11959
Merge remote-tracking branch 'upstream/main'
2022-05-15 21:32:31 +02:00
Claire
dc350be6f5
Use upstream's settings for CW auto-expand and column swiping ( #1770 )
...
* Use Mastodon server-side settings for automatically expanding toots with CWs
* Add modal warning about settings changes
* Use Mastodon server-side settings for disabling swiping
2022-05-15 17:30:40 +02:00
Eugen Rochko
95a036c598
New Crowdin updates ( #18339 )
...
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Marathi)
* New translations en.yml (Malay)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Telugu)
* New translations en.yml (Breton)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Korean)
* New translations en.yml (Russian)
* New translations en.yml (Turkish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Swedish)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Spanish)
* New translations en.yml (Greek)
* New translations en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (German)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.yml (Asturian)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Persian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Japanese)
* New translations en.yml (Latvian)
* New translations en.yml (Galician)
* New translations en.yml (Thai)
* New translations en.yml (Italian)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Korean)
* New translations en.yml (Hungarian)
* New translations en.yml (Welsh)
* New translations en.yml (French)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.yml (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Ido)
* New translations en.json (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Catalan)
* New translations en.json (Catalan)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Catalan)
* New translations en.yml (Afrikaans)
* New translations en.yml (Latvian)
* New translations en.yml (Italian)
* New translations en.yml (Greek)
* New translations en.yml (Hungarian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Ido)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Korean)
* New translations en.yml (Russian)
* New translations en.yml (Hungarian)
* New translations en.yml (Turkish)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Portuguese)
* New translations en.yml (Icelandic)
* New translations en.yml (Albanian)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Polish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Ukrainian)
* New translations en.yml (Indonesian)
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.yml (German)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.yml (French)
* New translations en.json (Galician)
* New translations en.yml (French)
* New translations en.yml (Welsh)
* New translations en.yml (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Slovenian)
* New translations en.yml (Hungarian)
* New translations en.json (English, United Kingdom)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.json (Croatian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Tatar)
* New translations en.json (Tatar)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations devise.en.yml (Catalan)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Swedish)
* New translations en.yml (Spanish)
* New translations en.yml (Turkish)
* New translations en.yml (Welsh)
* New translations en.yml (Latvian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Slovak)
* New translations en.yml (Czech)
* New translations en.yml (Portuguese)
* New translations en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Ido)
* New translations en.json (Spanish, Argentina)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Polish)
* New translations en.yml (Indonesian)
* New translations en.yml (Korean)
* New translations en.yml (Italian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Polish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-15 18:04:59 +09:00
Jeremy Kescher
fae11ac949
Merge remote-tracking branch 'upstream/main'
2022-05-14 08:36:01 +02:00
Claire
aa08399e6f
Fix setting for trending tags and trending links notifications being swapped ( #1771 )
2022-05-13 22:57:47 +02:00
Eugen Rochko
6cf57c6765
Refactor how Redis locks are created ( #18400 )
...
* Refactor how Redis locks are created
* Fix autorelease duration on account deletion lock
2022-05-13 00:02:35 +02:00
Jeong Arm
12535568f7
Fix rss view on hashtag ( #18406 )
2022-05-12 22:40:54 +02:00
Jeremy Kescher
16c8a45c81
Merge remote-tracking branch 'upstream/main'
2022-05-11 17:32:34 +02:00
Eugen Rochko
6fb837aa1d
[Glitch] Add limited
attribute to accounts in REST API and a warning in web UI
...
Port b4d373a3df
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 11:59:08 +02:00
Eugen Rochko
bb1a3e902d
[Glitch] Remove Keybase integration
...
Port 7de0ee7aba
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 11:09:20 +02:00
Claire
b356a995c1
[Glitch] Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Port 662ed53c18
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 09:44:27 +02:00
Claire
5fd8780b14
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
Eugen Rochko
b4d373a3df
Add limited
attribute to accounts in REST API and a warning in web UI ( #18344 )
2022-05-10 09:44:35 +02:00
Claire
662ed53c18
Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Fixes #601
2022-05-09 23:20:19 +02:00
Eugen Rochko
2b8dc58b7f
Change RSS feeds ( #18356 )
...
* Change RSS feeds
- Use date and time for titles instead of ellipsized text
- Use full content in body, even when there is a content warning
- Use media extensions
* Change feed icons and add width and height attributes to custom emojis
* Fix custom emoji animate on hover breaking
* Fix tests
2022-05-09 07:43:08 +02:00
Jeremy Kescher
89b01152a7
Merge remote-tracking branch 'upstream/main'
2022-05-09 06:52:28 +02:00
Claire
dc1685c1e6
[Glitch] Fix streaming notifications not using quick filter logic
...
Port f17e73da09
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-08 21:05:56 +02:00
Claire
703c7ae4b9
[Glitch] Fix floating action button obscuring last element
...
Port 5a448d0d71
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-08 21:05:21 +02:00
Claire
22080786df
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-08 21:00:49 +02:00
Claire
f17e73da09
Fix streaming notifications not using quick filter logic ( #18316 )
...
Fixes #18309
The quickFilter logic was used on display and to request new notification
pages, but not for live updates. The main issue this caused is bump the unread
notifications count regardless of the quickFilter setting.
Since notifications are re-fetched when changing quickFilter settings, it is
safe to drop live notifications that do not match the selected filter.
2022-05-07 04:50:40 +02:00
Claire
991353682d
Fix ambiguous wording on appeal actions ( #18328 )
...
Fixes #18322
2022-05-06 21:41:34 +02:00
Claire
5a448d0d71
Fix floating action button obscuring last element ( #18332 )
...
Fixes #18331
Add some padding below the last element of scrollable lists when the FAB is
shown in order for users to always be able to fully see the last element.
2022-05-06 21:40:49 +02:00
Claire
a53003c6f1
Fix account warnings not being recorded in audit log ( #18338 )
...
* Fix account warnings not being recorded in audit log
Fixes #18334
* Only record warnings if they are not associated to another action
2022-05-06 21:40:20 +02:00
Eugen Rochko
9250578e6b
New Crowdin updates ( #18255 )
...
* 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 (Standard Moroccan Tamazight)
* New translations en.json (Chinese Traditional)
* New translations en.json (Catalan)
* New translations en.json (Japanese)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Korean)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Korean)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.json (Vietnamese)
* New translations en.json (Turkish)
* New translations en.json (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* Add whitelist_en-GB.json [ci skip]
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.json (Thai)
* New translations en.yml (Hebrew)
* New translations en.yml (Ukrainian)
* New translations en.json (Polish)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (Thai)
* New translations en.yml (Hebrew)
* New translations en.yml (Ukrainian)
* New translations en.json (Danish)
* New translations en.json (Hebrew)
* New translations en.json (Ido)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Danish)
* New translations en.json (Ido)
* New translations en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hebrew)
* New translations en.json (Ido)
* New translations en.yml (Hebrew)
* New translations en.yml (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.yml (Hebrew)
* New translations en.json (Afrikaans)
* New translations en.json (Hebrew)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Hebrew)
* New translations en.json (Slovenian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (German)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Hungarian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.json (Czech)
* New translations en.yml (Hebrew)
* New translations en.json (Czech)
* New translations en.yml (Spanish)
* New translations en.yml (Hebrew)
* New translations en.json (Spanish)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.json (Portuguese)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.json (Danish)
* New translations activerecord.en.yml (Japanese)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Welsh)
* New translations en.yml (Slovenian)
* New translations en.json (Italian)
* New translations en.yml (Slovenian)
* New translations en.json (Indonesian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Danish)
* New translations en.json (Swedish)
* New translations en.yml (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Slovenian)
* New translations en.yml (Welsh)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Danish)
* New translations en.yml (Slovenian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Slovenian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Slovenian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Welsh)
* New translations en.json (French)
* New translations en.json (Welsh)
* New translations en.json (French)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations simple_form.en.yml (Welsh)
* New translations en.json (French)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (German)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Arabic)
* New translations en.json (Asturian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (German)
* New translations en.json (Ido)
* New translations en.json (Welsh)
* New translations en.json (Ido)
* New translations en.json (Welsh)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Albanian)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.json (German)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-06 21:53:22 +09:00
Stefano Pigozzi
99d7684dfd
Replace leftover envelope
icons with at
icons ( #18305 )
2022-05-06 00:41:56 +02:00
Sara Golemon
336c23336a
Allow VerifyLinkService to accept backlinks with differing case ( #18320 )
2022-05-06 00:41:42 +02:00
Jeremy Kescher
c58c13822a
Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc ( #1763 )
2022-05-05 19:11:56 +02:00
Jeremy Kescher
328121d974
Merge branch 'fix-incorrect-custom-emojis-size-limit-hint'
2022-05-05 18:20:45 +02:00
Jeremy Kescher
0495ac2651
Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc
2022-05-05 18:15:30 +02:00
Jeremy Kescher
d69e3b3eca
Merge remote-tracking branch 'upstream/main'
2022-05-05 01:02:11 +02:00
Claire
c85c3fb708
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated `jest`, moving its config in a separate file.
This config was modified in glitch-soc, so the corresponding changes have
been ported to `jest.config.js`
2022-05-04 19:15:50 +02:00
Jeremy Kescher
4bfc4068aa
Merge remote-tracking branch 'upstream/main'
2022-05-04 17:40:13 +02:00
mayaeh
a01580f09f
Update translation strings for direct message ( #18300 )
2022-05-04 02:40:26 +02:00
Claire
e2d1d3b428
Change “Only people I mention” to “Mentioned people only” ( #18291 )
2022-05-03 12:30:40 +02:00
Claire
fa22b8ed22
Move DM conversation/timeline tab to column settings switch
2022-05-03 11:45:23 +02:00
Claire
3dd4f40a0e
Fix backend terms link not being used
2022-05-03 11:10:58 +02:00
Claire
3093ed1b7d
Refactor visibility icon using VisibilityIcon
2022-05-03 11:04:09 +02:00
Claire
e4bec702ac
[Glitch] Rename toots to posts in various places, add or reword DM warnings
...
Port part of be0bc9acbf
and 7e244879fe
to glitch-soc
2022-05-03 10:59:23 +02:00
Claire
3869daef09
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
Eugen Rochko
7e244879fe
Change "Conversations" back to "Direct messages" and add warning in web UI ( #18289 )
...
Partially reverts #18146
2022-05-03 09:09:09 +02:00
Claire
0597e5db68
Fix ArgumentError when processing pinned posts from Friendica ( #18260 )
...
Follow-up to #18254
2022-05-02 19:34:39 +02:00
Claire
71d02ffcf3
Fix compatibility with Friendica regarding pinned posts ( #18254 )
...
* Fix multiple database queries when fetching pinned posts for remote account
* Fix compatibility with Friendica regarding pinned posts
Fixes #18066
* Add tests
2022-05-02 17:41:01 +02:00
Eugen Rochko
6b7765a73b
New Crowdin updates ( #18213 )
...
* New translations activerecord.en.yml (Ido)
* New translations en.json (Ido)
* New translations activerecord.en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Russian)
* New translations en.yml (Armenian)
* New translations en.json (Armenian)
* New translations en.yml (Armenian)
* New translations en.json (Japanese)
* New translations en.json (Armenian)
* New translations en.yml (Armenian)
* New translations en.json (Japanese)
* New translations doorkeeper.en.yml (Armenian)
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations en.json (Spanish)
* New translations en.json (Portuguese)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Portuguese)
* New translations devise.en.yml (Chinese Simplified)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Japanese)
* New translations activerecord.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Japanese)
* New translations en.json (Galician)
* New translations en.json (Japanese)
* New translations en.json (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations devise.en.yml (Japanese)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (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 doorkeeper.en.yml (Scottish Gaelic)
* New translations en.yml (Danish)
* New translations en.yml (Danish)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Welsh)
* New translations en.json (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.json (Czech)
* New translations en.json (Czech)
* New translations doorkeeper.en.yml (Ido)
* New translations en.json (Icelandic)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Korean)
* New translations en.yml (Hungarian)
* 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 (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 (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 (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 (Slovenian)
* New translations en.yml (German)
* New translations en.yml (Vietnamese)
* New translations en.yml (Thai)
* 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 (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Cornish)
* New translations en.yml (Irish)
* New translations en.yml (Standard Moroccan Tamazight)
* 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 (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Marathi)
* New translations en.yml (Malay)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Telugu)
* New translations en.yml (Breton)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Ido)
* New translations en.json (Chinese Simplified)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations en.yml (Japanese)
* New translations en.yml (Turkish)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Vietnamese)
* New translations en.yml (Greek)
* New translations en.yml (Catalan)
* New translations en.yml (French)
* New translations en.yml (Spanish)
* New translations en.yml (Polish)
* New translations doorkeeper.en.yml (Persian)
* New translations en.yml (Czech)
* New translations en.yml (Icelandic)
* New translations en.json (Icelandic)
* New translations en.yml (Russian)
* New translations en.yml (Hungarian)
* New translations en.yml (Swedish)
* New translations en.yml (Indonesian)
* New translations en.yml (Swedish)
* New translations en.yml (Welsh)
* New translations en.json (Swedish)
* New translations en.yml (Danish)
* New translations en.yml (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-02 23:19:23 +09:00
Jeremy Kescher
8d34a2c2f5
Change emoji picker icon to :blobCat:.
2022-05-02 01:20:49 +02:00
Claire
9a3be0ad68
Fix error when looking handle with surrounding spaces ( #18225 )
2022-05-02 01:00:08 +02:00
Claire
cb9a919ff2
Remove “I don't like it” option from report modal
2022-05-01 21:58:20 +02:00
Claire
26a51291c7
Fix error due to glitch-soc's theming system
2022-05-01 17:07:11 +02:00
Eugen Rochko
277c3fa816
[Glitch] Fix being able to scroll away from the loading bar in web UI
...
Port a8e27ac4d1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-01 16:57:35 +02:00
Claire
392ca0472a
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.js`:
Conflicts due to glitch-soc's theming system.
Upstream changes have been ported to `app/javascript/core/admin.js`
- `app/models/trends/statuses.rb`:
Minor conflict due to glitch-soc's option to allow CWed toots in trends.
Ported upstream changes.
2022-05-01 16:52:27 +02:00
Eugen Rochko
33f3818d66
Fix double render error when authorizing interaction ( #18203 )
2022-05-01 00:56:34 +02:00
Claire
6e4d932da5
Fix possible crash when a post references an invalid media attachment ( #18211 )
2022-05-01 00:55:26 +02:00
Eugen Rochko
5a48bf1085
Fix error when trying to revoke OAuth token without supplying a token ( #18205 )
2022-05-01 00:51:32 +02:00