]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years agoAdd specs for FollowLimitValidator (#9655)
ysksn [Sat, 29 Dec 2018 07:24:52 +0000 (16:24 +0900)]
Add specs for FollowLimitValidator (#9655)

7 years agoAdd specs for BlackListedEmailValidator (#9651)
ysksn [Sat, 29 Dec 2018 06:23:44 +0000 (15:23 +0900)]
Add specs for BlackListedEmailValidator (#9651)

* Add specs for BlackListedEmailValidator

* Use instance variable

7 years agoReplace Ruby 2.3 with 2.6 in CircleCI (#9652)
ashleyhull-versent [Sat, 29 Dec 2018 06:23:07 +0000 (17:23 +1100)]
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

7 years agoAdd specs for DisallowedHashtagsValidator (#9653)
ysksn [Sat, 29 Dec 2018 06:22:51 +0000 (15:22 +0900)]
Add specs for DisallowedHashtagsValidator (#9653)

In order to implement tests easier, `#select_tags` created.

7 years agoAdd handler for Move activity (#9629)
Eugen Rochko [Sat, 29 Dec 2018 01:24:36 +0000 (02:24 +0100)]
Add handler for Move activity (#9629)

7 years agoAdd healthcheck commands to docker-compose.yml (#9143)
Ben Lubar [Fri, 28 Dec 2018 23:43:41 +0000 (17:43 -0600)]
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

7 years agoRename hide_followers_count helper to hide_followers_count?
Thibaut Girka [Fri, 28 Dec 2018 17:39:24 +0000 (18:39 +0100)]
Rename hide_followers_count helper to hide_followers_count?

7 years agoDo not leak followers count on public pages
Thibaut Girka [Fri, 28 Dec 2018 17:20:58 +0000 (18:20 +0100)]
Do not leak followers count on public pages

Fixes #873

7 years agoAdd specs for StatusPinValidator (#9648)
ysksn [Fri, 28 Dec 2018 09:09:32 +0000 (18:09 +0900)]
Add specs for StatusPinValidator (#9648)

7 years agoAdd pending specs for StatusLengthValidator (#9647)
ysksn [Fri, 28 Dec 2018 07:18:47 +0000 (16:18 +0900)]
Add pending specs for StatusLengthValidator (#9647)

* Add pending specs of StatusLengthValidator

* Use instance variable

7 years agoChange the icon to "reply-all" when reply to other accounts (#9378)
mayaeh [Fri, 28 Dec 2018 02:51:32 +0000 (11:51 +0900)]
Change the icon to "reply-all" when reply to other accounts (#9378)

7 years agoImprove admin UI for account view (#9643)
Eugen Rochko [Fri, 28 Dec 2018 02:38:41 +0000 (03:38 +0100)]
Improve admin UI for account view (#9643)

7 years agoI18n: Update Czech translation (#9644)
Aditoo17 [Fri, 28 Dec 2018 00:01:15 +0000 (01:01 +0100)]
I18n: Update Czech translation (#9644)

* I18n: Update Czech translation

* I18n: Update Czech translation

7 years agoAdd local followers page to admin account UI (#9610)
chr v1.x [Thu, 27 Dec 2018 12:15:39 +0000 (04:15 -0800)]
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

7 years agoWeblate translations (2018-12-27) (#9642)
Renato "Lond" Cerqueira [Thu, 27 Dec 2018 11:25:30 +0000 (12:25 +0100)]
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

7 years agoBump webmock from 3.4.2 to 3.5.1 (#9641)
dependabot[bot] [Thu, 27 Dec 2018 11:23:27 +0000 (12:23 +0100)]
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>
7 years agoAdd exclude_reblogs option to account statuses API (#9640)
Eugen Rochko [Thu, 27 Dec 2018 02:42:35 +0000 (03:42 +0100)]
Add exclude_reblogs option to account statuses API (#9640)

Fix #9606

7 years agoRedirect to reports overview instead of report after account action (#9639)
Eugen Rochko [Thu, 27 Dec 2018 02:42:29 +0000 (03:42 +0100)]
Redirect to reports overview instead of report after account action (#9639)

7 years ago[i18n] OC/CAT/FR «crop» => «change preview» (#9636)
Quentí [Wed, 26 Dec 2018 18:16:40 +0000 (19:16 +0100)]
[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)

7 years agoFix account unsilencing and unsuspension (#9637)
ThibG [Wed, 26 Dec 2018 18:16:15 +0000 (19:16 +0100)]
Fix account unsilencing and unsuspension (#9637)

Fix regression from 3c033c4352f8b156887cd7157b4a89c23a545838

7 years agoFix ThreadResolveWorker getting queued with invalid URLs (#9628)
Eugen Rochko [Wed, 26 Dec 2018 18:15:53 +0000 (19:15 +0100)]
Fix ThreadResolveWorker getting queued with invalid URLs (#9628)

7 years agoFix signature verification stoplight triggering on non-timeout errors (#9617)
Eugen Rochko [Wed, 26 Dec 2018 18:15:43 +0000 (19:15 +0100)]
Fix signature verification stoplight triggering on non-timeout errors (#9617)

7 years agoFix account unsilencing and unsuspension
Thibaut Girka [Wed, 26 Dec 2018 16:40:56 +0000 (17:40 +0100)]
Fix account unsilencing and unsuspension

Fix regression from 3c033c4352f8b156887cd7157b4a89c23a545838

7 years agoBump cld3 from 3.2.2 to 3.2.3 (#9632)
dependabot[bot] [Wed, 26 Dec 2018 05:39:17 +0000 (06:39 +0100)]
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>
7 years agoFix scope latest of ReportNote (#9630)
ysksn [Wed, 26 Dec 2018 05:38:59 +0000 (14:38 +0900)]
Fix scope latest of ReportNote (#9630)

7 years agoCreate DomainNormalizable#normalize_domain (#9631)
ysksn [Wed, 26 Dec 2018 05:38:42 +0000 (14:38 +0900)]
Create DomainNormalizable#normalize_domain (#9631)

7 years agoAdd error message with invalid email confirmation (#9625)
Takeshi Umeda [Tue, 25 Dec 2018 18:35:26 +0000 (03:35 +0900)]
Add error message with invalid email confirmation (#9625)

7 years agoRemove Form::StatusBatch::ACTION_TYPE unused (#9623)
ysksn [Tue, 25 Dec 2018 17:29:51 +0000 (02:29 +0900)]
Remove Form::StatusBatch::ACTION_TYPE unused (#9623)

7 years agoAdd support for Malayalam in language filter (#9624)
Aboobacker MK [Tue, 25 Dec 2018 17:29:30 +0000 (22:59 +0530)]
Add support for Malayalam in language filter (#9624)

7 years agoAdd REST API for creating an account (#9572)
Eugen Rochko [Mon, 24 Dec 2018 18:12:38 +0000 (19:12 +0100)]
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

7 years agoRename "crop" to "change preview" (#9616)
Eugen Rochko [Mon, 24 Dec 2018 18:12:18 +0000 (19:12 +0100)]
Rename "crop" to "change preview" (#9616)

7 years agoUpdate emoji codepoint mappings to v11.0 (#9618)
Eugen Rochko [Mon, 24 Dec 2018 18:12:00 +0000 (19:12 +0100)]
Update emoji codepoint mappings to v11.0 (#9618)

7 years agoLimit maximum visibility of local silenced users to unlisted (#9583)
ThibG [Mon, 24 Dec 2018 18:06:14 +0000 (19:06 +0100)]
Limit maximum visibility of local silenced users to unlisted (#9583)

Fixes #9580

7 years agoMerge pull request #871 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 23 Dec 2018 14:23:12 +0000 (15:23 +0100)]
Merge pull request #871 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years ago[Glitch] Add moderation warnings
Thibaut Girka [Sun, 23 Dec 2018 11:54:09 +0000 (12:54 +0100)]
[Glitch] Add moderation warnings

Port SCSS changes from 3c033c4352f8b156887cd7157b4a89c23a545838 to glitch-soc

7 years agoChange instance_presenter_spec to point to glitch-soc instead of tootsuite
Thibaut Girka [Sun, 23 Dec 2018 10:45:26 +0000 (11:45 +0100)]
Change instance_presenter_spec to point to glitch-soc instead of tootsuite

7 years ago[Glitch] Remove links to bridge.joinmastodon.org (non-functional)
Thibaut Girka [Sun, 23 Dec 2018 10:43:47 +0000 (11:43 +0100)]
[Glitch] Remove links to bridge.joinmastodon.org (non-functional)

Port bb62827c16dbf35c70da2dc801f602df3c76fcca to glitch-soc

7 years agoRemove file added by error
Thibaut Girka [Sun, 23 Dec 2018 10:43:25 +0000 (11:43 +0100)]
Remove file added by error

7 years ago[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached
Thibaut Girka [Sun, 23 Dec 2018 10:40:52 +0000 (11:40 +0100)]
[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached

Port 8389b496ba9f8b5fa04a34ccc14c8e4195e03ea3 to glitch flavour

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 23 Dec 2018 10:28:28 +0000 (11:28 +0100)]
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.

7 years agoSanitize and sandbox toot embeds (#9552)
ThibG [Sun, 23 Dec 2018 01:16:35 +0000 (02:16 +0100)]
Sanitize and sandbox toot embeds (#9552)

7 years agoRemove links to bridge.joinmastodon.org (non-functional) (#9608)
Eugen Rochko [Sat, 22 Dec 2018 22:32:00 +0000 (23:32 +0100)]
Remove links to bridge.joinmastodon.org (non-functional) (#9608)

Add link to profile directory

7 years agoShow 40 profiles per directory page instead of 30 (#9609)
Eugen Rochko [Sat, 22 Dec 2018 22:31:23 +0000 (23:31 +0100)]
Show 40 profiles per directory page instead of 30 (#9609)

To better align with the list of hashtags

7 years agoAdd moderation warnings (#9519)
Eugen Rochko [Sat, 22 Dec 2018 19:02:09 +0000 (20:02 +0100)]
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

7 years ago[i18n] Occitan update (#9607)
Quentí [Sat, 22 Dec 2018 17:27:03 +0000 (18:27 +0100)]
[i18n] Occitan update (#9607)

* Update for new On Board messages

* Update oc.json

7 years agoRemove MailerHelper does nothing (#9604)
ysksn [Sat, 22 Dec 2018 01:35:55 +0000 (10:35 +0900)]
Remove MailerHelper does nothing (#9604)

7 years agoFix composer not getting focus after reply confirmation dialog
Thibaut Girka [Fri, 21 Dec 2018 17:40:50 +0000 (18:40 +0100)]
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.

7 years agoFix incorrect and duplicate onConfirm callback
Thibaut Girka [Fri, 21 Dec 2018 16:54:47 +0000 (17:54 +0100)]
Fix incorrect and duplicate onConfirm callback

7 years ago[Glitch] Fix that translation is not applied to "joining hashtags"
Thibaut Girka [Tue, 18 Dec 2018 17:06:55 +0000 (18:06 +0100)]
[Glitch] Fix that translation is not applied to "joining hashtags"

Port bfec030a4e3be37e4986d7ec5cb1bda968ba549a to glitch-soc

7 years ago[Glitch] Deep compare tags for hashtag column reload
Thibaut Girka [Tue, 18 Dec 2018 17:05:29 +0000 (18:05 +0100)]
[Glitch] Deep compare tags for hashtag column reload

Port 4fdefffb9906ffc3e5fde7af652674bebffd6e15 to glitch-soc

7 years ago[Glitch] Allow joining several hashtags in a single column
Thibaut Girka [Tue, 18 Dec 2018 16:56:08 +0000 (17:56 +0100)]
[Glitch] Allow joining several hashtags in a single column

Port 4c03e05a4e1a237f8a414a0861c03abe3269dbc8 to glitch-soc

This introduces new requirements in the API:

  `/api/v1/timelines/tag/:tag` now accepts new params: `any`, `all` and `none`
  It now returns status matching tag :tag or any of the :any, provided that
  they also include all tags in `all` and none of `none`.

7 years agoi18n: Update Polish translation (#9594)
Marcin Mikołajczak [Fri, 21 Dec 2018 17:56:24 +0000 (18:56 +0100)]
i18n: Update Polish translation (#9594)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoAdd specs for CustomEmojiFilter (#9599)
ysksn [Fri, 21 Dec 2018 17:52:57 +0000 (02:52 +0900)]
Add specs for CustomEmojiFilter (#9599)

7 years agoFix composer not getting focus after reply confirmation dialog (#9602)
ThibG [Fri, 21 Dec 2018 17:52:41 +0000 (18:52 +0100)]
Fix composer not getting focus after reply confirmation dialog (#9602)

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.

7 years agoAdd specs for AdminMailer (#9597)
ysksn [Fri, 21 Dec 2018 08:34:34 +0000 (17:34 +0900)]
Add specs for AdminMailer (#9597)

7 years agoAdd specs for InstancePresenter (#9596)
ysksn [Fri, 21 Dec 2018 07:59:56 +0000 (16:59 +0900)]
Add specs for InstancePresenter (#9596)

7 years agoSkip mailer job retries when a record no longer exists (#9590)
Eugen Rochko [Fri, 21 Dec 2018 05:16:17 +0000 (06:16 +0100)]
Skip mailer job retries when a record no longer exists (#9590)

Fix #8666

7 years ago[Glitch] Display customized mascot in web UI
Thibaut Girka [Wed, 19 Dec 2018 19:23:16 +0000 (20:23 +0100)]
[Glitch] Display customized mascot in web UI

Port relevant parts of 9d4541c612b506889675c4c19ced5cd17ad3710f to glitch-soc

7 years agoMake drawer markup and styling closer to upstream
Thibaut Girka [Wed, 19 Dec 2018 18:09:04 +0000 (19:09 +0100)]
Make drawer markup and styling closer to upstream

WARNING: This may break some custom skins!

  `.drawer > .contents` has been moved to
  `.drawer > .drawer__pager > .drawer__iner`, and the waves have been moved
  from `.drawer > .contents` to `.drawer__inner__mastodon`!

7 years agoAdd specs for ReportNotePolicy (#9592)
ysksn [Thu, 20 Dec 2018 16:52:18 +0000 (01:52 +0900)]
Add specs for ReportNotePolicy (#9592)

7 years agoAdd specs for policies (#9591)
ysksn [Thu, 20 Dec 2018 16:52:07 +0000 (01:52 +0900)]
Add specs for policies (#9591)

* Add spec for RelayPolicy

* Add specs for SubscriptionPolicy

* Add specs for SettingsPolicy

* Add specs for TagPolicy

* Add specs for ReportPolicy

7 years agoAdd specs for UserPolicy (#9593)
ysksn [Thu, 20 Dec 2018 16:51:55 +0000 (01:51 +0900)]
Add specs for UserPolicy (#9593)

7 years ago[Glitch] Back to the getting-started when pins the timeline
Thibaut Girka [Wed, 19 Dec 2018 12:13:24 +0000 (13:13 +0100)]
[Glitch] Back to the getting-started when pins the timeline

Port 5bf100f87be571e86305f3ab244183fc46f1ede2 to glitch-soc

7 years agoMove hide_followers_count logic to an helper
Thibaut Girka [Tue, 18 Dec 2018 13:26:21 +0000 (14:26 +0100)]
Move hide_followers_count logic to an helper

7 years agoAdd a per-user setting to hide followers count
Thibaut Girka [Tue, 18 Dec 2018 10:24:44 +0000 (11:24 +0100)]
Add a per-user setting to hide followers count

This is only available if the instance-wide setting isn't set and allows
people to hide their own followers count. This does not hide others' to
them.

7 years agoPer-user followers count display in profile directory
Thibaut Girka [Tue, 18 Dec 2018 11:02:54 +0000 (12:02 +0100)]
Per-user followers count display in profile directory

7 years agoHide negative follower counts from glitch flavour
Thibaut Girka [Mon, 17 Dec 2018 20:23:44 +0000 (21:23 +0100)]
Hide negative follower counts from glitch flavour

7 years agoAdd admin setting to disable followers count
Thibaut Girka [Mon, 17 Dec 2018 19:36:30 +0000 (20:36 +0100)]
Add admin setting to disable followers count

7 years agoRefactor followers_accounts_controller
Thibaut Girka [Mon, 17 Dec 2018 19:25:47 +0000 (20:25 +0100)]
Refactor followers_accounts_controller

7 years agoAdd specs for InvitePolicy (#9589)
ysksn [Thu, 20 Dec 2018 03:23:09 +0000 (12:23 +0900)]
Add specs for InvitePolicy (#9589)

7 years agoAdd specs for EmailDomainBlockPolicy (#9586)
ysksn [Thu, 20 Dec 2018 02:51:41 +0000 (11:51 +0900)]
Add specs for EmailDomainBlockPolicy (#9586)

7 years agoAdd specs for InstancePolicy (#9587)
ysksn [Thu, 20 Dec 2018 02:51:31 +0000 (11:51 +0900)]
Add specs for InstancePolicy (#9587)

7 years agoAdd specs for DomainBlockPolicy (#9585)
ysksn [Thu, 20 Dec 2018 02:47:51 +0000 (11:47 +0900)]
Add specs for DomainBlockPolicy (#9585)

7 years agoAdd specs for CustomEmojiPolicy (#9584)
ysksn [Thu, 20 Dec 2018 02:24:28 +0000 (11:24 +0900)]
Add specs for CustomEmojiPolicy (#9584)

7 years agoAllow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573)
Eugen Rochko [Thu, 20 Dec 2018 00:30:43 +0000 (01:30 +0100)]
Allow unauthenticated REST API access to GET /api/v1/accounts/:id/statuses (#9573)

Fix #7087

The same data is available over the ActivityPub outbox, RSS, and Atom, so
there is little benefit to keeping it limited in this method.

7 years agoFix unnecessary loadMore calls when the end of a timeline has been reached (#9581)
ThibG [Wed, 19 Dec 2018 21:23:16 +0000 (22:23 +0100)]
Fix unnecessary loadMore calls when the end of a timeline has been reached (#9581)

Fixes #9568

7 years agoOverride current_user when generating static pages
Thibaut Girka [Tue, 18 Dec 2018 22:31:34 +0000 (23:31 +0100)]
Override current_user when generating static pages

7 years agoRestore oops.gif animation for user who have auto_play_gif set
Thibaut Girka [Tue, 18 Dec 2018 22:15:30 +0000 (23:15 +0100)]
Restore oops.gif animation for user who have auto_play_gif set

7 years agoReplace animated oops.gif by a non-animated image
Thibaut Girka [Mon, 17 Dec 2018 13:47:00 +0000 (14:47 +0100)]
Replace animated oops.gif by a non-animated image

Fixes #6060

7 years agoAdd specs for BackupPolicy (#9576)
ysksn [Wed, 19 Dec 2018 17:24:15 +0000 (02:24 +0900)]
Add specs for BackupPolicy (#9576)

7 years agoMerge pull request #865 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 19 Dec 2018 15:19:00 +0000 (16:19 +0100)]
Merge pull request #865 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoWeblate translations (2018-12-19) (#9578)
Renato "Lond" Cerqueira [Wed, 19 Dec 2018 12:07:05 +0000 (13:07 +0100)]
Weblate translations (2018-12-19) (#9578)

* 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 (Japanese)

Currently translated at 97.5% (699 of 717 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* 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 (Dutch)

Currently translated at 99.7% (715 of 717 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* 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 (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 (Korean)

Currently translated at 100.0% (350 of 350 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/

* Translated using Weblate (Korean)

Currently translated at 100.0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 98.9% (709 of 717 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 97.8% (91 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/

* 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 99.9% (716 of 717 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* 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 (Arabic)

Currently translated at 96.8% (90 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 96.8% (694 of 717 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* 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 (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 (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 (Czech)

Currently translated at 100.0% (350 of 350 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* 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 (Italian)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/

* 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 (Catalan)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/

* Translated using Weblate (Catalan)

Currently translated at 100,0% (717 of 717 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* 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 (Occitan)

Currently translated at 100,0% (350 of 350 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* 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 (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 (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 (Greek)

Currently translated at 100.0% (350 of 350 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* 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 (German)

Currently translated at 100,0% (93 of 93 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

* 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 (Japanese)

Currently translated at 97,5% (699 of 717 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Korean)

Currently translated at 100,0% (350 of 350 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/

* Translated using Weblate (Czech)

Currently translated at 100.0% (350 of 350 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Normalize translations

* Normalize translations, remove unused, add missing plurals

7 years ago[Glitch] Improved appearance of notification filter on safari
Thibaut Girka [Wed, 19 Dec 2018 12:00:08 +0000 (13:00 +0100)]
[Glitch] Improved appearance of notification filter on safari

Port 2e1b5edfea1b03f64c69266f979caee228fa90b7 to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 19 Dec 2018 11:58:49 +0000 (12:58 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoAdd specs for AccountPolicy (#9575)
ysksn [Wed, 19 Dec 2018 07:56:59 +0000 (16:56 +0900)]
Add specs for AccountPolicy (#9575)

7 years agoUpdate Japanese translations. (#9574)
mayaeh [Wed, 19 Dec 2018 07:51:02 +0000 (16:51 +0900)]
Update Japanese translations. (#9574)

7 years agoAdd specs for AccountModerationNotePolicy (#9571)
ysksn [Wed, 19 Dec 2018 06:24:03 +0000 (15:24 +0900)]
Add specs for AccountModerationNotePolicy (#9571)

7 years agoAdd specs for StatusPolicy (#9569)
ysksn [Wed, 19 Dec 2018 04:19:20 +0000 (13:19 +0900)]
Add specs for StatusPolicy (#9569)

7 years agoimproved appearance of notification filter on safari (#9564)
Hinaloe [Tue, 18 Dec 2018 21:28:09 +0000 (06:28 +0900)]
improved appearance of notification filter on safari (#9564)

7 years agoClean up dead code in public timeline code (#9565)
ThibG [Tue, 18 Dec 2018 21:00:18 +0000 (22:00 +0100)]
Clean up dead code in public timeline code (#9565)

7 years agoReword confirm_before_clearing_draft description
Thibaut Girka [Tue, 27 Nov 2018 17:54:47 +0000 (18:54 +0100)]
Reword confirm_before_clearing_draft description

7 years agoAllow disabling the reply confirmation dialog
Thibaut Girka [Tue, 27 Nov 2018 17:25:51 +0000 (18:25 +0100)]
Allow disabling the reply confirmation dialog

7 years agoAllow disabling media confirmation from the confirmation dialog itself
Thibaut Girka [Tue, 27 Nov 2018 16:31:50 +0000 (17:31 +0100)]
Allow disabling media confirmation from the confirmation dialog itself

7 years agoRemove dead code
Thibaut Girka [Tue, 18 Dec 2018 18:06:58 +0000 (19:06 +0100)]
Remove dead code

7 years ago[Glitch] Put "Media Only" option in column settings instead of content area headline
Thibaut Girka [Tue, 18 Dec 2018 17:52:37 +0000 (18:52 +0100)]
[Glitch] Put "Media Only" option in column settings instead of content area headline

Port 4f42238c294f92dbd87db3d83f9514344fcd1f8a to glitch-soc

7 years ago[Glitch] Always display tab navigation on local/federated timeline even when empty
Thibaut Girka [Tue, 29 May 2018 14:40:04 +0000 (16:40 +0200)]
[Glitch] Always display tab navigation on local/federated timeline even when empty

Port 90b64c006998ec3bae365007781c61e8a79eeeef to glitch-soc

7 years agoDo not replace history state
Thibaut Girka [Sun, 27 May 2018 19:33:04 +0000 (21:33 +0200)]
Do not replace history state

This is both for consistency with account timelines and to not mess with
the logic used to decide whether going back in the browser's history is
going to make us leave the WebUI.

7 years ago[Glitch] Enable media timeline
Thibaut Girka [Sun, 27 May 2018 19:31:08 +0000 (21:31 +0200)]
[Glitch] Enable media timeline

Port 8182b615183b83fb6651fb23912abda3cc4ccf03 to glitch-soc

7 years ago[Glitch] Hide section headline for timelines in production
Thibaut Girka [Sun, 27 May 2018 19:28:24 +0000 (21:28 +0200)]
[Glitch] Hide section headline for timelines in production

Port 4eeda6772796bcd08b8c63ec2e1f3e68a95cbca4 to glitch-soc

7 years ago[Glitch] Change column params on pinned timeline
Thibaut Girka [Sun, 27 May 2018 19:26:33 +0000 (21:26 +0200)]
[Glitch] Change column params on pinned timeline

Port 06252ec71ed67cb84e6730fe7148552dc6481c7a to glitch-soc