8622 Commits (e8ae6b050bcca11040968b0352487da70a26a4f4)

 

All Branches   

Search

Author	SHA1	Message	Date
ysksn	41afd670c9	Add specs for FollowLimitValidator (#9655)	6 years ago
ysksn	5eb6d7e3e0	Add specs for BlackListedEmailValidator (#9651) ... * Add specs for BlackListedEmailValidator * Use instance variable	6 years ago
ashleyhull-versent	9d9b81ff42	Replace Ruby 2.3 with 2.6 in CircleCI (#9652) ... * Update config.yml * Update Gemfile * dropping ruby 2.3 2.3 EOL date: scheduled for 2019-03-31 * Updating docker containers * Update Gemfile	6 years ago
ysksn	a3b4684435	Add specs for DisallowedHashtagsValidator (#9653) ... In order to implement tests easier, `#select_tags` created.	6 years ago
Eugen Rochko	4e3131f02f	Add handler for Move activity (#9629)	6 years ago
Ben Lubar	02a84db787	Add healthcheck commands to docker-compose.yml (#9143) ... This will allow Docker to be automatically check the health of services. Docker won't do anything other than showing the state in the output of "docker-compose ps" by default, but some management tools may watch for container health events. Here's what my local instance looks like right now: Name Command State Ports ------------------------------------------------------------------------------------------------------------- mastodon_db_1 docker-entrypoint.sh postgres Up (healthy) mastodon_es_1 /usr/local/bin/docker-entr ... Up (healthy) mastodon_redis_1 docker-entrypoint.sh redis ... Up (healthy) mastodon_redis_cache_1 docker-entrypoint.sh redis ... Up (healthy) mastodon_sidekiq_1 /sbin/tini -- bundle exec ... Up 3000/tcp, 4000/tcp mastodon_streaming_1 /sbin/tini -- yarn start Up (healthy) 3000/tcp, 127.0.0.1:4000->4000/tcp mastodon_web_1 /sbin/tini -- bash -c rm - ... Up (healthy) 127.0.0.1:3000->3000/tcp, 4000/tcp	6 years ago
Thibaut Girka	41676bb021	Rename hide_followers_count helper to hide_followers_count?	6 years ago
Thibaut Girka	6b0ee17046	Do not leak followers count on public pages ... Fixes #873	6 years ago
ysksn	44c1647ea1	Add specs for StatusPinValidator (#9648)	6 years ago
ysksn	c4559969b4	Add pending specs for StatusLengthValidator (#9647) ... * Add pending specs of StatusLengthValidator * Use instance variable	6 years ago
mayaeh	6429b2f94f	Change the icon to "reply-all" when reply to other accounts (#9378)	6 years ago
Eugen Rochko	8958e58bd4	Improve admin UI for account view (#9643)	6 years ago
Aditoo17	08a7712dd3	I18n: Update Czech translation (#9644) ... * I18n: Update Czech translation * I18n: Update Czech translation	6 years ago
chr v1.x	b659f51c43	Add local followers page to admin account UI (#9610) ... * Add local followers page to admin account UI For moderation, I often find myself wondering who, locally, is following a remote user. Currently, to see this, I have to go back to the web UI, paste in their full handle, click their profile, and go to the "Followers" tab (plus, this information is incidental, and if mastodon ever decides to resolve all of the follower information, there will be no place local followers are shown). This PR adds a new page which is accessible via the "following" count on the admin's account view page, which shows the local followers. (It has filter parameters for account location to indicate that only local followers are shown, and leave room for expansion if mastodon ever decides to store the entire remote follow list). * Normalize en.yml	6 years ago
Renato "Lond" Cerqueira	a234fde3a4	Weblate translations (2018-12-27) (#9642) ... * Translated using Weblate (Occitan) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Greek) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Czech) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (French) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (715 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (717 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Arabic) Currently translated at 97.5% (699 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Greek) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Corsican) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Arabic) Currently translated at 98.6% (349 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 78.2% (277 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/ * Translated using Weblate (Basque) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Dutch) Currently translated at 93,8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 92,9% (329 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Greek) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Galician) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100,0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Corsican) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Korean) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Tamil) Currently translated at 14.4% (51 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ta/ * Translated using Weblate (Russian) Currently translated at 85.6% (303 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/ * Translated using Weblate (Italian) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Occitan) Currently translated at 93.8% (332 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Spanish) Currently translated at 88.1% (312 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (German) Currently translated at 93.5% (331 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Hungarian) Currently translated at 63.0% (223 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Portuguese) Currently translated at 65.0% (230 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Hebrew) Currently translated at 61.9% (219 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 92.9% (329 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Dutch) Currently translated at 94.9% (336 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Corsican) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Dutch) Currently translated at 100,0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 97.4% (698 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (German) Currently translated at 100,0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Added translation using Weblate (Hindi) * Translated using Weblate (Corsican) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (French) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (German) Currently translated at 99.9% (716 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (354 of 354 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 98.3% (705 of 717 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (French) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Polish) Currently translated at 90.3% (84 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Normalize translations * Add missing plurals, remove unused translations	6 years ago
dependabot[bot]	4e09ccd500	Bump webmock from 3.4.2 to 3.5.1 (#9641) ... Bumps [webmock](https://github.com/bblimke/webmock) from 3.4.2 to 3.5.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
Eugen Rochko	d70d8321d3	Add exclude_reblogs option to account statuses API (#9640) ... Fix #9606	6 years ago
Eugen Rochko	7c2340443e	Redirect to reports overview instead of report after account action (#9639)	6 years ago
Quentí	217b42a992	[i18n] OC/CAT/FR «crop» => «change preview» (#9636) ... * Rename "crop" to "change preview" (tootsuite#9616) * Rename "crop" to "change preview" (tootsuite#9616) * Rename "crop" to "change preview" (tootsuite#9616)	6 years ago
ThibG	d75e32caa3	Fix account unsilencing and unsuspension (#9637) ... Fix regression from 2e0d617b8b	6 years ago
Eugen Rochko	ab9308b7f7	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	6 years ago
Eugen Rochko	e5ebd4df78	Fix signature verification stoplight triggering on non-timeout errors (#9617)	6 years ago
Thibaut Girka	9bc763840f	Fix account unsilencing and unsuspension ... Fix regression from 2e0d617b8b	6 years ago
dependabot[bot]	5b350e4f93	Bump cld3 from 3.2.2 to 3.2.3 (#9632) ... Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	6 years ago
ysksn	09b6bf49ee	Fix scope latest of ReportNote (#9630)	6 years ago
ysksn	75e3538da4	Create DomainNormalizable#normalize_domain (#9631)	6 years ago
Takeshi Umeda	9f74c2b877	Add error message with invalid email confirmation (#9625)	6 years ago
ysksn	6de2c32991	Remove Form::StatusBatch::ACTION_TYPE unused (#9623)	6 years ago
Aboobacker MK	7eab6acc42	Add support for Malayalam in language filter (#9624)	6 years ago
Eugen Rochko	bbf9f4f93b	Add REST API for creating an account (#9572) ... * Add REST API for creating an account The method is available to apps with a token obtained via the client credentials grant. It creates a user and account records, as well as an access token for the app that initiated the request. The user is unconfirmed, and an e-mail is sent as usual. The method returns the access token, which the app should save for later. The REST API is not available to users with unconfirmed accounts, so the app must be smart to wait for the user to click a link in their e-mail inbox. The method is rate-limited by IP to 5 requests per 30 minutes. * Redirect users back to app from confirmation if they were created with an app * Add tests * Return 403 on the method if registrations are not open * Require agreement param to be true in the API when creating an account	6 years ago
Eugen Rochko	ca8e8d5fae	Rename "crop" to "change preview" (#9616)	6 years ago
Eugen Rochko	36a5585cac	Update emoji codepoint mappings to v11.0 (#9618)	6 years ago
ThibG	a2492a89fb	Limit maximum visibility of local silenced users to unlisted (#9583) ... Fixes #9580	6 years ago
ThibG	f532d5e93d	Merge pull request #871 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Thibaut Girka	9e2ceac0ba	[Glitch] Add moderation warnings ... Port SCSS changes from 2e0d617b8b to glitch-soc	6 years ago
Thibaut Girka	56d4c731f1	Change instance_presenter_spec to point to glitch-soc instead of tootsuite	6 years ago
Thibaut Girka	df5e49696f	[Glitch] Remove links to bridge.joinmastodon.org (non-functional) ... Port eb2994d454 to glitch-soc	6 years ago
Thibaut Girka	89e7274a7f	Remove file added by error	6 years ago
Thibaut Girka	e5a25656e8	[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached ... Port 240d41b3ca to glitch flavour	6 years ago
Thibaut Girka	48e6b2360d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.	6 years ago
ThibG	4bf67e9cd0	Sanitize and sandbox toot embeds (#9552)	6 years ago
Eugen Rochko	eb2994d454	Remove links to bridge.joinmastodon.org (non-functional) (#9608) ... Add link to profile directory	6 years ago
Eugen Rochko	5fdfe0c4cf	Show 40 profiles per directory page instead of 30 (#9609) ... To better align with the list of hashtags	6 years ago
Eugen Rochko	2e0d617b8b	Add moderation warnings (#9519) ... * Add moderation warnings Replace individual routes for disabling, silencing, and suspending a user, as well as the report update route, with a unified account action controller that allows you to select an action (none, disable, silence, suspend) as well as whether it should generate an e-mail notification with optional custom text. That notification, with the optional custom text, is saved as a warning. Additionally, there are warning presets you can configure to save time when performing the above. * Use Account#local_username_and_domain	6 years ago
Quentí	fb34dafd3c	[i18n] Occitan update (#9607) ... * Update for new On Board messages * Update oc.json	6 years ago
ysksn	c2efe52de7	Remove MailerHelper does nothing (#9604)	6 years ago
Thibaut Girka	d9a6c27f3b	Fix composer not getting focus after reply confirmation dialog ... The modal-handling code gives back focus to the element focused when the modal opened. However, in the case of reply confirmation, it would do so *after* the composer code itself requested focus.	6 years ago
Thibaut Girka	e8845f0cb2	Fix incorrect and duplicate onConfirm callback	6 years ago
Thibaut Girka	89db203110	[Glitch] Fix that translation is not applied to "joining hashtags" ... Port 88e40d03d9 to glitch-soc	6 years ago
Thibaut Girka	0cac543474	[Glitch] Deep compare tags for hashtag column reload ... Port 98c9ad366b to glitch-soc	6 years ago