about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2023-01-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-21Revert "Remove LDSignature on actor Delete activities (#21466)" (#23185)Claire
This reverts commit f4f2b062ec7827ed7749d85579aca2da2ec40593.
2023-01-21[Glitch] Fix wrong text color on some buttons in light theme in web UIEugen Rochko
Port 13e9d91ba7adbf2b9d595b906f28e0c2caf4c90c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-21[Glitch] Fix wrong padding in RTL layout in web UIEugen Rochko
Port part of 4894deca7ef5aad3f1c42a3dd4a155362757715b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-21Fix Account Strike causing PG not null validation error (#23178)Jeong Arm
2023-01-20Advertise supported MIME types for statuses (#2090)Vyr Cossont
2023-01-19Fix wrong text color on some buttons in light theme in web UI (#23156)Eugen Rochko
2023-01-19Fix wrong padding in RTL layout in web UI (#23157)Eugen Rochko
2023-01-18Fix missing admin CSS in glitch-soc flavor (#2088)Claire
Port SCSS changes from 43f56f12917f154fbb70cbc305daba9e2fd364ed Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-01-19New Crowdin updates (#23052)Eugen Rochko
* New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Italian) * New translations en.json (German) * New translations en.yml (Estonian) * New translations simple_form.en.yml (Estonian) * New translations en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Spanish, Argentina) * New translations simple_form.en.yml (Ukrainian) * New translations doorkeeper.en.yml (Slovenian) * New translations doorkeeper.en.yml (Chinese Traditional) * New translations en.yml (Chinese Traditional) * New translations en.yml (Slovenian) * New translations simple_form.en.yml (Slovenian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Traditional) * New translations en.json (Portuguese) * New translations simple_form.en.yml (German) * New translations simple_form.en.yml (Hebrew) * New translations simple_form.en.yml (Slovenian) * New translations en.json (Esperanto) * New translations en.json (Esperanto) * New translations en.yml (Esperanto) * New translations simple_form.en.yml (Esperanto) * New translations doorkeeper.en.yml (Esperanto) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.json (Thai) * New translations doorkeeper.en.yml (Turkish) * New translations doorkeeper.en.yml (Thai) * New translations en.yml (Czech) * New translations simple_form.en.yml (Czech) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Turkish) * New translations en.yml (Thai) * New translations simple_form.en.yml (Thai) * New translations en.yml (Latvian) * New translations simple_form.en.yml (Latvian) * New translations simple_form.en.yml (Galician) * New translations en.yml (Galician) * New translations en.json (Portuguese) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations en.yml (Finnish) * New translations en.yml (Polish) * New translations en.yml (Italian) * New translations en.yml (Ukrainian) * New translations en.yml (Spanish, Argentina) * New translations en.json (Aragonese) * New translations doorkeeper.en.yml (Aragonese) * New translations en.yml (Aragonese) * New translations simple_form.en.yml (Aragonese) * New translations en.yml (German) * New translations en.yml (Hebrew) * New translations simple_form.en.yml (German) * New translations en.yml (Slovak) * New translations en.yml (Chinese Traditional) * New translations en.yml (Korean) * New translations simple_form.en.yml (Korean) * New translations devise.en.yml (German) * New translations en.yml (German) * New translations en.yml (Slovak) * New translations doorkeeper.en.yml (Slovak) * New translations en.yml (Spanish) * New translations en.yml (Czech) * New translations simple_form.en.yml (Slovak) * New translations en.yml (Slovenian) * New translations en.yml (Albanian) * New translations en.yml (Catalan) * New translations en.yml (German) * New translations simple_form.en.yml (Catalan) * New translations en.yml (Portuguese) * New translations en.yml (Galician) * New translations en.yml (Chinese Simplified) * New translations doorkeeper.en.yml (Russian) * New translations simple_form.en.yml (Russian) * New translations en.yml (Ukrainian) * New translations simple_form.en.yml (Chinese Simplified) * New translations en.yml (Faroese) * New translations simple_form.en.yml (Faroese) * New translations en.yml (Hungarian) * New translations en.yml (Danish) * New translations simple_form.en.yml (Danish) * New translations en.yml (Chinese Traditional) * New translations en.yml (Danish) * New translations en.yml (Catalan) * New translations simple_form.en.yml (Catalan) * New translations doorkeeper.en.yml (Spanish, Mexico) * New translations en.yml (Spanish, Mexico) * New translations en.yml (Thai) * New translations en.yml (Finnish) * New translations en.yml (Latvian) * New translations en.yml (Portuguese) * New translations en.yml (Turkish) * New translations simple_form.en.yml (Hungarian) * New translations simple_form.en.yml (Hungarian) * New translations en.json (Kazakh) * New translations en.yml (Frisian) * New translations simple_form.en.yml (Frisian) * New translations en.yml (Norwegian Nynorsk) * New translations en.yml (Polish) * New translations simple_form.en.yml (Polish) * New translations en.json (Irish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations en.yml (Irish) * New translations en.json (Irish) * New translations en.yml (Irish) * New translations doorkeeper.en.yml (Irish) * New translations simple_form.en.yml (Irish) * New translations devise.en.yml (Irish) * New translations en.json (Persian) * New translations en.json (Welsh) * New translations en.yml (Welsh) * New translations en.json (Welsh) * New translations doorkeeper.en.yml (English, United Kingdom) * New translations simple_form.en.yml (Welsh) * New translations en.json (Spanish, Argentina) * New translations en.json (English, United Kingdom) * New translations simple_form.en.yml (Catalan) * New translations simple_form.en.yml (English, United Kingdom) * New translations simple_form.en.yml (German) * New translations en.yml (Bulgarian) * New translations doorkeeper.en.yml (Bulgarian) * New translations simple_form.en.yml (Bulgarian) * New translations doorkeeper.en.yml (Icelandic) * New translations en.yml (Icelandic) * New translations simple_form.en.yml (Icelandic) * New translations activerecord.en.yml (Icelandic) * New translations devise.en.yml (Icelandic) * New translations en.json (Latin) * New translations en.yml (Slovak) * New translations en.yml (Slovak) * New translations en.yml (Belarusian) * New translations en.json (Estonian) * New translations en.yml (Belarusian) * New translations en.json (Albanian) * New translations doorkeeper.en.yml (Albanian) * New translations en.yml (Belarusian) * New translations en.yml (Albanian) * New translations simple_form.en.yml (Albanian) * New translations activerecord.en.yml (Albanian) * New translations devise.en.yml (Albanian) * New translations en.json (Asturian) * New translations en.json (Hindi) * New translations en.yml (Dutch) * New translations en.yml (Swedish) * New translations en.yml (Estonian) * New translations en.yml (Estonian) * New translations en.json (Latvian) * New translations en.yml (Latvian) * New translations en.yml (Slovak) * Normalize * New translations en.json (Romanian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Afrikaans) * New translations en.json (Arabic) * New translations en.json (Belarusian) * New translations en.json (Bulgarian) * New translations en.json (Catalan) * New translations en.json (Czech) * New translations en.json (Danish) * New translations en.json (German) * New translations en.json (Greek) * New translations en.json (Frisian) * New translations en.json (Basque) * New translations en.json (Finnish) * New translations en.json (Irish) * New translations en.json (Hebrew) * New translations en.json (Hungarian) * New translations en.json (Armenian) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Georgian) * New translations en.json (Korean) * New translations en.json (Lithuanian) * New translations en.json (Macedonian) * New translations en.json (Dutch) * New translations en.json (Norwegian) * New translations en.json (Punjabi) * New translations en.json (Polish) * New translations en.json (Portuguese) * New translations en.json (Russian) * New translations en.json (Slovak) * New translations en.json (Slovenian) * New translations en.json (Albanian) * New translations en.json (Serbian (Cyrillic)) * New translations en.json (Swedish) * New translations en.json (Turkish) * New translations en.json (Ukrainian) * New translations en.json (Chinese Simplified) * New translations en.json (Chinese Traditional) * New translations en.json (Urdu (Pakistan)) * New translations en.json (Vietnamese) * New translations en.json (Galician) * New translations en.json (Icelandic) * New translations en.json (Portuguese, Brazilian) * New translations en.json (Indonesian) * New translations en.json (Persian) * New translations en.json (Tamil) * New translations en.json (Spanish, Argentina) * 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 (Kazakh) * New translations en.json (Estonian) * New translations en.json (Latvian) * New translations en.json (Hindi) * New translations en.json (Malay) * New translations en.json (Telugu) * New translations en.json (English, United Kingdom) * New translations en.json (Burmese) * New translations en.json (Welsh) * New translations en.json (Faroese) * New translations en.json (Esperanto) * New translations en.json (Uyghur) * New translations en.json (Chinese Traditional, Hong Kong) * New translations en.json (Tatar) * New translations en.json (Malayalam) * New translations en.json (Breton) * New translations en.json (Latin) * New translations en.json (Bosnian) * New translations en.json (French, Quebec) * New translations en.json (Sinhala) * 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 (Aragonese) * New translations en.json (Occitan) * New translations en.json (Serbian (Latin)) * New translations en.json (Kurmanji (Kurdish)) * New translations en.json (Sorani (Kurdish)) * New translations en.json (Scots) * New translations en.json (Igbo) * 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) * Normalize Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-18[Glitch] Fix confusing wording in the sign in bannerClaire
Port 3588fbc76641311ab97ef530e2df4df4934805c5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18[Glitch] Add listing of followed hashtagsConnor Shea
Port 30e895299ceff095da3e4c8ee50b3d003225f021 to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18[Glitch] Add option to make the landing page be /about even when trends are ↵Claire
enabled Port 3970a6f433ad3cf79ef41d84baf6d788d25bd246 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18[Glitch] Add support for editing media description and focus point of ↵Claire
already-posted statuses Port 4b92e59f4fea4486ee6e5af7421e7945d5f7f998 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18[Glitch] Change account moderation notes to make links clickableClaire
Port 9b3e22c40d5a24ddfa0df42d8fe6e96a273e8afd to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18[Glitch] Add checkmark symbol to checkboxPeter Simonsson
Port 7e6ffa085f97dc4688e2655fe2447743ab807e44 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18[Glitch] Make visible change for new post notification setting iconJeong Arm
Port 1b2ef60cec381e69384c208589c3dcf0ca2661db to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18[Glitch] Fix /api/v1/admin/trends/tags using wrong serializerClaire
Port b034dc42be2250f9b754fb88c9163b62d41f78f5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
2023-01-18Fix confusing wording in the sign in banner (#22490)Claire
* Fix confusing wording in the sign in banner * Split into two sentences
2023-01-18Add more specific error messages to HTTP signature verification (#21617)Claire
* Return specific error on failure to parse Date header * Add error message when preferredUsername is not set * Change error report to be JSON and include more details * Change error report to differentiate unknown account and failed refresh * Add tests
2023-01-18Add listing of followed hashtags (#21773)Connor Shea
* Add followed_tags route. This at least gets us to the point where the page can actually be rendered, although it doesn't display any hashtags (yet?). Attempting to implement #20763. * Fix minor issues. * I've got the followed tags data partially working But the Hashtag component errors for some reason. Something about the value of the history attribute being invalid. * Fix a mistake in the code * Minor change. * Get the followed hashtags list fully working. Still need to add the Follow/Unfollow buttons, though. * Resolve JS linter issues. * Add pagination logic to followed tags list view. However, it currently loads further pages immediately on page load, so that's not ideal. Need to figure that one out. * Appease the linter. * Apply suggestions from code review Co-authored-by: Claire <claire.github-309c@sitedethib.com> * Fixes and resolve some other feedback. * Use set/update instead of setIn/updateIn. Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-18Add option to make the landing page be /about even when trends are enabled ↵Claire
(#20808) * Add option to make the landing page be /about even when trends are enabled * Restablish /explore as landing page by default
2023-01-18Add confirmation screen when handling reports (#22375)Claire
* Add confirmation screen on moderation actions * Add flash notice when a report has been processed * Refactor tests * Add tests
2023-01-18Add support for editing media description and focus point of already-posted ↵Claire
statuses (#20878) * Add backend support for editing media attachments of existing posts * Allow editing media attachments of already-posted toots * Add tests
2023-01-18Fix situations in which instance actor can be set to a Mastodon-incompatible ↵Claire
name (#22307) * Validate internal actor * Use “internal.actor” by default for the server actor username * Fix instance actor username on the fly if it includes ':' * Change actor name from internal.actor to mastodon.internal
2023-01-18Change account moderation notes to make links clickable (#22553)Claire
* Change account moderation notes to make links clickable Fixes #22539 * Fix styling of account moderation note links
2023-01-18Add checkmark symbol to checkbox (#22795)Peter Simonsson
2023-01-18Make visible change for new post notification setting icon (#22541)Jeong Arm
2023-01-18Fix /api/v1/admin/trends/tags using wrong serializer (#18943)Claire
* Fix /api/v1/admin/trends/tags using wrong serializer Fix regression from #18641 * Only use `REST::Admin::TagSerializer` when the user can `manage_taxonomies` * Fix admin trending hashtag component to not link if `id` is unknown
2023-01-18Fix REST API serializer for Account not including `moved` when the moved ↵Claire
account has itself moved (#22483) Instead of cutting immediately, cut after one recursion.
2023-01-18Fix scheduled_at input not using datetime-local when editing announcements ↵Claire
(#21896)
2023-01-18Fix spurious admin dashboard warning when using ElasticSearch 7.x (#23064)Claire
Some 7.x ElasticSearch versions support some 6.x nodes, thus the version check is inadequate. I am not sure there is a good way to check if a server implements all the 7.x APIs, so check server version and minimum wire version instead.
2023-01-18Change domain block CSV parsing to be more robust and handle more lists (#21470)Claire
* Change domain block CSV parsing to be more robust and handle more lists * Add some tests * Improve domain block import validation and reporting
2023-01-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.
2023-01-14Change confirm prompt for relationships management (#19411)Jeong Arm
* Change confirm prompt for relationships management * Add Korean translations * Apply suggestions from code review Co-authored-by: TobyWilkes <tobylwilkes@gmail.com> Co-authored-by: TobyWilkes <tobylwilkes@gmail.com>
2023-01-13Allow admins to toggle public statistics API (#22833)Darius Kazemi
* Allow admins to toggle public statistics API * Normalize i18n Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-13Add peers API endpoint toggle to Server Settings (#22810)Darius Kazemi
* Add peers endpoint toggle to Server Settings This places the toggle under "Discovery" and expands the hint text to explain further what the endpoint is used for. Added a "Recommended" tag since it was recommended in v3 before it was removed. Fixes https://github.com/mastodon/mastodon/issues/22222 * i18n normalize step
2023-01-13Allow changing hide_collections setting with the api (#22790)Carl Schwan
* Allow changing hide_collections setting with the api This is currently only possible with app/controllers/settings/profiles_controller.rb and is the only difference in the allowed parameter between the two controllers * Fix the lint issue * Use normal indent
2023-01-13Don't crash on unobtainable avatars (#22462)David Freedman
2023-01-13Remove title from mailer layout (#23078)nametoolong
2023-01-13Change wording of admin report handling actions (#18388)Claire
* Change admin report handling UI to display appropriate text for remote reports Change from “Decide which action to take to resolve this report. If you take a punitive action against the reported account, an e-mail notification will be sent to them, except when the Spam category is selected.” to “Decide which action to take to resolve this report. This will only affect how your server communicates with this remote account and handle its content.” * Reword admin actions descriptions to make clear which admin actions close reports
2023-01-13Fix crash when marking statuses as sensitive while some statuses are deleted ↵Claire
(#22134) * Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments * Fix crash when marking statuses as sensitive while some statuses are deleted Fixes #21910 * Fix multiple strikes being created for a single report when selecting “Mark as sensitive” * Add tests
2023-01-12[Glitch] Remove hardcoded width from dropdown overlaysClaire
Port f4a6365f55c3b16494337e0880b42108cc4a171a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-12Remove hardcoded width from dropdown overlays (#23062)Claire
* Remove hardcoded width from dropdown overlays * Fix emoji picker position
2023-01-12[Glitch] Fix dropdown menu positions when scrollingPeter Simonsson
Port fd33bcb3b25d3eaf593ade0aa8709a1184fc254e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-01-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.
2023-01-11fix: allow verification when page size exceeds 1MB (using HTML5 parser) (#22879)Markus Unterwaditzer
* fix: allow verification when page size exceeds 1MB Truncates the page after 1MB instead Closes #15316 * switch to HTML5 parser, fix rubocop errors * undo rubocop fixes Co-authored-by: Chris Zubak-Skees <chriszs@gmail.com>