05edec6917
Add specs for BlackListedEmailValidator ( #9651 )
...
* Add specs for BlackListedEmailValidator
* Use instance variable
2018-12-29 07:23:44 +01:00
29484f6555
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
2018-12-29 07:23:07 +01:00
4725aeec9f
Add specs for DisallowedHashtagsValidator ( #9653 )
...
In order to implement tests easier, `#select_tags` created.
2018-12-29 07:22:51 +01:00
0f938ff29c
Add handler for Move activity ( #9629 )
2018-12-29 02:24:36 +01:00
9b475a4838
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
2018-12-29 00:43:41 +01:00
115b1abb6e
Rename hide_followers_count helper to hide_followers_count?
2018-12-28 20:05:47 +01:00
374bae0abe
Do not leak followers count on public pages
...
Fixes #873
2018-12-28 20:05:47 +01:00
d01c840e14
Add specs for StatusPinValidator ( #9648 )
2018-12-28 18:09:32 +09:00
ccb9c1b952
Add pending specs for StatusLengthValidator ( #9647 )
...
* Add pending specs of StatusLengthValidator
* Use instance variable
2018-12-28 08:18:47 +01:00
c1693827ae
Change the icon to "reply-all" when reply to other accounts ( #9378 )
2018-12-28 03:51:32 +01:00
6e49907ecf
Improve admin UI for account view ( #9643 )
2018-12-28 03:38:41 +01:00
8c5116fa2c
I18n: Update Czech translation ( #9644 )
...
* I18n: Update Czech translation
* I18n: Update Czech translation
2018-12-28 09:01:15 +09:00
c3465f699e
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
2018-12-27 13:15:39 +01:00
b41f715180
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
2018-12-27 12:25:30 +01:00
17cd443b37
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>
2018-12-27 12:23:27 +01:00
ee1ba59692
Add exclude_reblogs option to account statuses API ( #9640 )
...
Fix #9606
2018-12-27 03:42:35 +01:00
9b8c7a9aad
Redirect to reports overview instead of report after account action ( #9639 )
2018-12-27 03:42:29 +01:00
f63a0134d7
[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)
2018-12-26 19:16:40 +01:00
4423999609
Fix account unsilencing and unsuspension ( #9637 )
...
Fix regression from 3c033c4352
2018-12-26 19:16:15 +01:00
aa9a20cde0
Fix ThreadResolveWorker getting queued with invalid URLs ( #9628 )
2018-12-26 19:15:53 +01:00
17cd91c777
Fix signature verification stoplight triggering on non-timeout errors ( #9617 )
2018-12-26 19:15:43 +01:00
f349fe2159
Fix account unsilencing and unsuspension
...
Fix regression from 3c033c4352
2018-12-26 19:13:54 +01:00
8be0843467
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>
2018-12-26 06:39:17 +01:00
a8ba291beb
Fix scope latest of ReportNote ( #9630 )
2018-12-26 06:38:59 +01:00
0c1e4bb969
Create DomainNormalizable#normalize_domain ( #9631 )
2018-12-26 06:38:42 +01:00
bf70e5cfda
Add error message with invalid email confirmation ( #9625 )
2018-12-25 19:35:26 +01:00
6641a1cac9
Remove Form::StatusBatch::ACTION_TYPE unused ( #9623 )
2018-12-25 18:29:51 +01:00
fd16502ae4
Add support for Malayalam in language filter ( #9624 )
2018-12-25 18:29:30 +01:00
5d2fc6de32
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
2018-12-24 19:12:38 +01:00
acf9358c52
Rename "crop" to "change preview" ( #9616 )
2018-12-24 19:12:18 +01:00
2ee779dcd3
Update emoji codepoint mappings to v11.0 ( #9618 )
2018-12-24 19:12:00 +01:00
5f387995d9
Limit maximum visibility of local silenced users to unlisted ( #9583 )
...
Fixes #9580
2018-12-24 19:06:14 +01:00
8a3e4a4883
Merge pull request #871 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-23 15:23:12 +01:00
cb98e7dbd3
[Glitch] Add moderation warnings
...
Port SCSS changes from 3c033c4352
2018-12-23 12:54:09 +01:00
71d683b410
Change instance_presenter_spec to point to glitch-soc instead of tootsuite
2018-12-23 11:45:26 +01:00
82088f0d7d
[Glitch] Remove links to bridge.joinmastodon.org (non-functional)
...
Port bb62827c16
2018-12-23 11:43:47 +01:00
c5c4450fdd
Remove file added by error
2018-12-23 11:43:25 +01:00
22dedb676b
[Glitch] Fix unnecessary loadMore calls when the end of a timeline has been reached
...
Port 8389b496ba
2018-12-23 11:40:52 +01:00
3e686beaea
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.
2018-12-23 11:28:28 +01:00
e25947db4a
Sanitize and sandbox toot embeds ( #9552 )
2018-12-23 02:16:35 +01:00
bb62827c16
Remove links to bridge.joinmastodon.org (non-functional) ( #9608 )
...
Add link to profile directory
2018-12-22 23:32:00 +01:00
59e333385b
Show 40 profiles per directory page instead of 30 ( #9609 )
...
To better align with the list of hashtags
2018-12-22 23:31:23 +01:00
3c033c4352
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
2018-12-22 20:02:09 +01:00
00862dcaff
[i18n] Occitan update ( #9607 )
...
* Update for new On Board messages
* Update oc.json
2018-12-22 18:27:03 +01:00
bd4ee732c2
Remove MailerHelper does nothing ( #9604 )
2018-12-22 02:35:55 +01:00
1a3088364f
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.
2018-12-21 20:00:49 +01:00
0605c004a5
Fix incorrect and duplicate onConfirm callback
2018-12-21 20:00:49 +01:00
6166751f9e
[Glitch] Fix that translation is not applied to "joining hashtags"
...
Port bfec030a4e
2018-12-21 19:54:54 +01:00
3611ea02e2
[Glitch] Deep compare tags for hashtag column reload
...
Port 4fdefffb99
2018-12-21 19:54:54 +01:00
4be7313298
[Glitch] Allow joining several hashtags in a single column
...
Port 4c03e05a4e
2018-12-21 19:54:54 +01:00
ysksn