6f9ac2d85e
Fix CircleCI
6 years ago
44f2224606
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
6 years ago
6936271536
Improve e-mail digest ( #9689 )
...
- Reduce time-to-digest from 20 to 7 days
- Fetch mentions starting from +1 day since last login
- Fix case when last login is more recent than last e-mail
- Do not render all mentions, only 40, but show number in subject
- Do not send digest to moved accounts
- Do send digest to silenced accounts
6 years ago
735940a1bf
Upgrade ESLint to v5.x ( #9694 )
6 years ago
ffcaa4719a
Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order ( #9687 )
...
* Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order
* Add specs for Block causing unfollow and for out-of-order Block + Undo
6 years ago
ebe56fbca1
Upgrade default Ruby version to 2.6.0 ( #9688 )
6 years ago
611a9ff3fe
Add tootctl accounts follow ACCT ( #9414 )
...
Fix #9369
6 years ago
fe1c04eed4
Fix icon alignment in onboarding interaction screen ( #9686 )
6 years ago
9244a06846
Add CSV export for lists and domain blocks ( #9677 )
...
Fix #6893
Fix #9268
6 years ago
e29480083a
Restore ReplyDistributionWorker to allow existing jobs to be processed ( #9676 )
6 years ago
6eae9c5601
Installing libxml2 and libxslt on Docker ( #9680 )
6 years ago
5fee09d35f
Remove visible timestamps for notifications ( #9675 )
...
Revert #9423 . Issues with line breaks / clutter.
6 years ago
101a46ac24
Update dependencies for Node.js (2018-12-31) ( #9669 )
...
* Update react-* to v16.7.0
* Upgrade react-hotkeys to v1.1.4
* Update react-intl to v2.7.2
* Update react-select to v2.2.0
* Update react-swipeable-views to v0.13.0
* Upgrade react-textarea-autosize to v7.1.0
* Upgrade redux to v4.0.1
* Upgrade reselect to v4.0.0
* Update raf to v3.4.1
* Update enzyme to v3.8.0
* Update rails-ujs to v5.2.2
* Update axios to v0.18.0
* Update http-link-header to v1.0.2
* Update rellax to v1.7.1
* Update intersection-observer to v0.5.1
* Update stringz to v1.0.0
* Upgrade babel-eslint to v10.0.1
* Update @babel/* to v7.2.x
* Update babel-plugin-react-intl to v3.0.1
* Update babel-plugin-transform-react-remove-prop-types to v0.4.21
* Upgrade dotenv to v6.2.0
* Update express to v4.16.4
* Update webpack to v4.28.3
* Upgrade autoprefixer to v9.4.3
* Update babel-loader to v8.0.4
* Upgrade css-loader to v2.1.0
* Upgrade file-loader to v3.0.1
* Update marky to v1.2.1
* Update mini-css-extract-plugin to v0.5.0
* Update offline-plugin to v5.0.6
* Update style-loader to v0.23.1
* Update eslint-plugin-jsx-a11y to v6.1.2
* yarn upgrade
* fix
* Replace webpack-manifest-plugin to webpack-assets-manifest
* Replace node-zopfli to @gfz/zopfli
* Remove monkey-patch for http-link-header
6 years ago
9648c59d6f
Fix links not being verified ( #9673 )
...
Fix #9365
6 years ago
99272005f0
Install both rvm gpg keys in vagrant ( #9670 )
6 years ago
c176b4ec80
Skip full text search if failed ( #9654 )
...
* Skip full text search if failed
* Move rescue block to "perform_statuses_search!"
6 years ago
0244534700
Avoid duplicate work by merging ReplyDistributionWorker into DistributionWorker ( #9660 )
6 years ago
9bc77287d2
Do not ignore federated reports targetting already-reported accounts ( #9534 )
6 years ago
88b8ddfd9c
Immediately go back in browser history upon successfully sending toot ( #9663 )
...
Avoids possible misleading delay before redirection during which the
composer would be cleared and redrawn.
6 years ago
c3a406ec62
If it is disabled, remove the link of the profile directory ( #9665 )
6 years ago
cd5a929037
Fix crash when clearing uninitialized timeline ( #9662 )
6 years ago
c1b47fe774
Fix crash when clearing uninitialized timeline
...
Fixes #875
6 years ago
57791a2044
Immediately go back in browser history upon successfully sending toot
6 years ago
bdc44c3558
Reduce usage of LD signatures ( #9659 )
...
* Do not LDS-sign Follow, Accept, Reject, Undo, Block
* Do not use LDS for Create activities of private toots
* Minor cleanup
* Ignore unsigned activities instead of misattributing them
* Use status.distributable? instead of querying visibility directly
6 years ago
41afd670c9
Add specs for FollowLimitValidator ( #9655 )
6 years ago
5eb6d7e3e0
Add specs for BlackListedEmailValidator ( #9651 )
...
* Add specs for BlackListedEmailValidator
* Use instance variable
6 years ago
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
a3b4684435
Add specs for DisallowedHashtagsValidator ( #9653 )
...
In order to implement tests easier, `#select_tags` created.
6 years ago
4e3131f02f
Add handler for Move activity ( #9629 )
6 years ago
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
41676bb021
Rename hide_followers_count helper to hide_followers_count?
6 years ago
6b0ee17046
Do not leak followers count on public pages
...
Fixes #873
6 years ago
44c1647ea1
Add specs for StatusPinValidator ( #9648 )
6 years ago
c4559969b4
Add pending specs for StatusLengthValidator ( #9647 )
...
* Add pending specs of StatusLengthValidator
* Use instance variable
6 years ago
6429b2f94f
Change the icon to "reply-all" when reply to other accounts ( #9378 )
6 years ago
8958e58bd4
Improve admin UI for account view ( #9643 )
6 years ago
08a7712dd3
I18n: Update Czech translation ( #9644 )
...
* I18n: Update Czech translation
* I18n: Update Czech translation
6 years ago
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
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
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
d70d8321d3
Add exclude_reblogs option to account statuses API ( #9640 )
...
Fix #9606
6 years ago
7c2340443e
Redirect to reports overview instead of report after account action ( #9639 )
6 years ago
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
d75e32caa3
Fix account unsilencing and unsuspension ( #9637 )
...
Fix regression from 2e0d617b8b
6 years ago
ab9308b7f7
Fix ThreadResolveWorker getting queued with invalid URLs ( #9628 )
6 years ago
e5ebd4df78
Fix signature verification stoplight triggering on non-timeout errors ( #9617 )
6 years ago
9bc763840f
Fix account unsilencing and unsuspension
...
Fix regression from 2e0d617b8b
6 years ago
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
09b6bf49ee
Fix scope latest of ReportNote ( #9630 )
6 years ago
75e3538da4
Create DomainNormalizable#normalize_domain ( #9631 )
6 years ago
Thibaut Girka
Eugen Rochko
Yamagishi Kazutoshi
kodai
Fred Wenzel
Jeong Arm
Takeshi Umeda
ysksn
ashleyhull-versent
Ben Lubar
mayaeh
Aditoo17
chr v1.x
Renato "Lond" Cerqueira
dependabot[bot]
Quentí