about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-08-26Merge pull request #674 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Add aria-label to notifications (#8460)Eugen Rochko
Fix #8192
2018-08-26Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462)Eugen Rochko
Remove old deprecated rake tasks
2018-08-26Delay e-mail notifications by 2 minutes (#8438)Eugen Rochko
Fix #8430
2018-08-26Add CLI interface for importing custom emoji (#8437)Eugen Rochko
bin/tootctl emoji import PATH_TO_TAR Fix #8435
2018-08-26Add messages informing that collections are empty (fixes #4115) (#8418)Jakub Mendyk
* Add messages informing that collections are empty Adds empty messages to blocked users, domain blocks, favourited statuses, users that favourited toot, follow requests, followers of given user, user's being followed by given user, lists, muted users, toots' boosts. Switched from using ScrollContainer to ScrollableList and/or added empty message's text. Fixes #4115 * Update localization files with strings for #4115 * Fix whitespace issues pointed out by codeclimate
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Update _bio.html.haml (#8449)Tad Thorley
On my local instance (https://ruby.social) we have a custom emoji for octocat (:octocat:). I would love to be able to use the emoji in the metadata for my profile. Instead of: | github | https://github.com/phaedryx It could be: | :octocat: | https://github.com/phaedryx (using a single emoji makes it easier to read the urls)
2018-08-26Fix regression from #8439 (#8455)Eugen Rochko
Missing no-reduce-motion/reduce-motion body class
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.
2018-08-26Merge pull request #671 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-08-26Add health endpoint to streaming API (#8441)Eugen Rochko
GET /api/v1/streaming/health Answers with OK. Fix #8337
2018-08-26Fix CW issues in static view on Safari (Fixes #8354) (#8446)PatrickRWells
* Fix CW issues in static view on Safari (8354) * Fixed formatting issues * Trailing space
2018-08-26Spread out crawling randomly to avoid DDoSing the link (#8445)Eugen Rochko
* Spread out crawling randomly to avoid DDoSing the link Fix #4486 * Remove trailing whitespace
2018-08-26Specify allowed media in upload button tooltip. (#8443)M Somerville
2018-08-26Revert "Default puma to running on localhost only." (#8444)Eugen Rochko
* Revert "Default puma to running on localhost only. (#8429)" This reverts commit 2a59c6a5e7ea1794232a12a3d0b46b24d8a9c858.
2018-08-25Add theme identifier to body classes for easier custom CSS styling (#8439)Eugen Rochko
Add forgotten custom CSS admin setting strings
2018-08-25Wait until relationship is loaded before showing follow button (#8440)Eugen Rochko
Fix #8410
2018-08-25fix pam authentication for certain hostnames (#8412)Alexander
2018-08-25Default puma to running on localhost only. (#8429)M Somerville
2018-08-25Disable retries on all scheduled tasks (#8413)Eugen Rochko
2018-08-25Weblate translations (2018-08-25) (#8420)Yamagishi Kazutoshi
* Translated using Weblate (Georgian) Currently translated at 99.8% (674 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/ * Translated using Weblate (Korean) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 96.8% (654 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Japanese) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Danish) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ * Translated using Weblate (Danish) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 87.2% (589 of 675 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Galician) Currently translated at 100.0% (680 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Czech) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.4% (676 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Danish) Currently translated at 88.0% (599 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Arabic) Currently translated at 97.6% (664 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.7% (678 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Occitan) Currently translated at 99.5% (677 of 680 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Arabic) Currently translated at 97.9% (668 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Persian) Currently translated at 99.7% (680 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Dutch) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Occitan) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Japanese) Currently translated at 0.0% (0 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 0.1% (1 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 0.1% (676 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (682 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Greek) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 98.8% (674 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Danish) Currently translated at 89.2% (609 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (French) Currently translated at 100.0% (82 of 82 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (681 of 682 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Korean) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Occitan) Currently translated at 100.0% (310 of 310 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * yarn manage:translations * i18n-tasks normalize && i18n-tasks remove-unused * revert * Add defaultMessage
2018-08-25Support ActivityStreams’ summaryMap. (#8422)M Somerville
In the same way as contentMap and nameMap.
2018-08-25Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)M Somerville
Still check for S3_CLOUDFRONT_HOST for existing installs.
2018-08-25Hide reject media checkbox when not relevant. (#8426)M Somerville
2018-08-25Add improved CLI interface for removing remote media (#8411)Eugen Rochko
./bin/tootctl media remove --days 7 --background Make the old rake task point to it
2018-08-25Revice Japanese translation of `deleted_status` (#8419)MIYAGI Hikaru
レポート関連の翻訳にある`deleted_status`は、ステータスが削除された残骸を示すものなので、 動作ではなく名詞として翻訳する方がより適切です。
2018-08-24Add missing video descriptions (#8416)M Somerville
* Pass through video description as necessary. * Add title to video, matching aria-label.
2018-08-24Reword the "Delete and rewrite" warning (#8415)Sylvhem
* Change "Delete and rewrite" warning Reword the "Delete and rewrite" warning to make it clear that replies are not deleted. * Update the French translation Update the French translation to reflect the changes made to the "Delete and rewrite" warning.
2018-08-24Upgrade Doorkeeper to 5.0.0 (#8409)Eugen Rochko
See doorkeeper-gem/doorkeeper#1137
2018-08-24Support UNIX domain socket for streaming service without using PORT (#8217)MIYAGI Hikaru
* Support UNIX domain socket for streaming service without using PORT The use of UNIX domain socket for streaming service was not officially supported, but it was made unofficial to use by setting a path to PORT. From now on, SOCKET will be used just like setting for puma. * Hundle relative path
2018-08-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
2018-08-24Add admin custom CSS setting (#8399)Eugen Rochko
Fix #3894
2018-08-23Bump version to 2.5.0rc1 (#8356)Eugen Rochko
2018-08-23Allow mods to disable login, improve message when login disabled (#8329)Eugen Rochko
* Allow moderators to disable/enable login * Instead of rejecting login, show forbidden error when login disabled Avoid confusion because when login is rejected, the message is that the account is not activated, which is wrong. * Fix tests
2018-08-23Only apply CSP in production modeThibaut Girka
2018-08-23Tighten CSP while allowing CDN hostsThibaut Girka
2018-08-23Update poylfills (fixes #662)Thibaut Girka
2018-08-23[Glitch] Update state when opened dropdown is unmountedThibaut Girka
Port dcd3544d153dd2a3961bd0d2214ed01a902a66da to glitch-soc
2018-08-23Fix regression when suspending not from report (#8400)Eugen Rochko
Regression from #8353
2018-08-23Only display web push notifications after API call (fixes #7902) (#8396)ThibG
* Only display web push notifications after API call (fixes #7902) * Decode then truncate instead of truncating then decoding in webpush serializer
2018-08-23Preserve hashtag casing in web UI hashtag history (#8394)Eugen Rochko
Fix #8241
2018-08-23Give focused status a sensible aria-label for screen readers (#8387)Eugen Rochko
* Give focused status a sensible aria-label for screen readers Fix #8192 * Use content warning in aria-label unless expanded
2018-08-23Update state when opened dropdown is unmounted (fixes #8397) (#8398)ThibG
2018-08-23Update light theme (#8392)Eugen Rochko
Fix #8209 Fix #7566
2018-08-23When registrations closed, link "Sign up" to joinmastodon.org (#8395)Eugen Rochko
Fix #8393
2018-08-23Fix off-by-one error in aria-posinset (#8388)Eugen Rochko
Fix #8191
2018-08-23Add aria-label to column regions (#8390)Eugen Rochko
Fix #4485
2018-08-23Do not check for file existence when serializing ActivityPub actor (#8386)ThibG
When serializing an ActivityPub actor, Mastodon checks for the existence of the avatar/header files. This is not necessary, only check if avatar/header is set. https://github.com/thoughtbot/paperclip/blob/fd8bf49d3895de2904b43f95d11af0736fbd0f5b/README.md#checking-a-file-exists
generated by cgit-pink (git 2.37.1) at 2024-11-24 23:26:18 +0000