Eugen Rochko
ddd30f331c
Improve support for aspects/circles ( #8950 )
* Add silent column to mentions
* Save silent mentions in ActivityPub Create handler and optimize it
Move networking calls out of the database transaction
* Add "limited" visibility level masked as "private" in the API
Unlike DMs, limited statuses are pushed into home feeds. The access
control rules between direct and limited statuses is almost the same,
except for counter and conversation logic
* Ensure silent column is non-null, add spec
* Ensure filters don't check silent mentions for blocks/mutes
As those are "this person is also allowed to see" rather than "this
person is involved", therefore does not warrant filtering
* Clean up code
* Use Status#active_mentions to limit returned mentions
* Fix code style issues
* Use Status#active_mentions in Notification
And remove stream_entry eager-loading from Notification
6 years ago
dependabot[bot]
00387be289
Bump oj from 3.6.11 to 3.6.12 ( #8996 )
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.11 to 3.6.12.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.6.11...v3.6.12 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ThibG
adb06baef6
Handle global hotkeys even when no element has focus ( #8998 )
This fixes hotkeys not working when pressing the column
“back” button, for instance.
6 years ago
Gomasy
7085b21f70
Add destroy_custom_emoji translation ( #8997 )
Includes Japanese and English
6 years ago
Quint Guvernator
926451152e
Fix some bad localization strings ( #8994 )
* fix finnish locale variable issue
* fix broken welsh localized string
6 years ago
Quint Guvernator
f5e2e96e95
always allow DMs from staff ( #8993 )
6 years ago
Julian
fe9815a462
one user i18n ( #8992 )
In german one female user is "Benutzerin" not "Benutzerinnen"
6 years ago
Eugen Rochko
35b576dbec
Improve form for selecting media display preference ( #8965 )
Regression from #8569
6 years ago
dependabot[bot]
8b0a980e28
Bump strong_migrations from 0.2.3 to 0.3.0 ( #8991 )
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.2.3 to 0.3.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.2.3...v0.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Eugen Rochko
85334d1362
Fix feature request issue template
6 years ago
Eugen Rochko
528ba4861d
Update issue templates ( #8989 )
* Update issue templates
* Update bug_report.md
* Update feature_request.md
* Update support.md
* Update feature_request.md
6 years ago
Thibaut Girka
38b11e0b58
Fix deleting individual notifications from glitch-soc's web interface
Fixes #783
6 years ago
Masoud Abkenar
d35801aaa2
Fixes 8987 broken alignment at "Remote interaction dialog" ( #8988 )
6 years ago
Masoud Abkenar
efd09e2ebb
undo part of PR 8202 to fix RTL ( #8979 )
6 years ago
jooops
57063bd17d
fix invites in italian language ( #8982 )
* fix invites in italian language
* fix invites in italian language
6 years ago
Thibaut Girka
b0527a4ce7
Handle alt+enter in the spoiler input as shortcut for secondary post
Fixes #780
6 years ago
mayaeh
47bca33945
Fix description about custom mascot. ( #8974 )
6 years ago
Eugen Rochko
b972478812
Improve style of notice/alert messages ( #8973 )
6 years ago
Eugen Rochko
7d182442a7
Weblate translations (2018-10-12) ( #8972 )
* Translated using Weblate (Welsh)
Currently translated at 64.4% (448 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Arabic)
Currently translated at 98.0% (682 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Arabic)
Currently translated at 94.3% (82 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Welsh)
Currently translated at 88.7% (297 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (French)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100,0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Czech)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Persian)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Arabic)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Czech)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Galician)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (696 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Greek)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 98.8% (331 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.7% (694 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Persian)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* 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 (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Corsican)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (German)
Currently translated at 99.6% (693 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* 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 (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* i18n-tasks normalize
* yarn manage:translations
6 years ago
Thibaut Girka
70d346ea95
Fix auto-unfold CWs when no regexp is set
Fixes #778
6 years ago
dependabot[bot]
734d55c3cf
Bump pundit from 1.1.0 to 2.0.0 ( #8873 )
Bumps [pundit](https://github.com/varvet/pundit ) from 1.1.0 to 2.0.0.
- [Release notes](https://github.com/varvet/pundit/releases )
- [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md )
- [Commits](https://github.com/varvet/pundit/compare/v1.1.0...v2.0.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ThibG
8ab081ec32
Add manifest_src to CSP, add blob to connect_src ( #8967 )
6 years ago
Thibaut Girka
3d5d899094
Allow selecting both default flavour and theme
Fixes #672
6 years ago
Eugen Rochko
fac529975b
Improve signature verification safeguards ( #8959 )
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit a00ce8c92c
.
* Restore time window checking, change it to 12 hours
By checking the Date header, we can prevent replaying old vulnerable
signatures. The focus is to prevent replaying old vulnerable requests
from software that has been fixed in the meantime, so a somewhat long
window should be fine and accounts for timezone misconfiguration.
* Escape users' URLs when formatting them
Fixes possible HTML injection
* Escape all string interpolations in Formatter class
Slightly improve performance by reducing class allocations
from repeated Formatter#encode calls
* Fix code style issues
6 years ago
Eugen Rochko
9d4541c612
Display customized mascot in web UI and fix admin form for it ( #8964 )
Follow-up to #8766
6 years ago
Eugen Rochko
22de24b8ca
Fix missing protocol in dns-prefetch, improve code style ( #8963 )
Regression from #8942
6 years ago
Eugen Rochko
5cbbd2c3b5
Fix microformats on statuses according to updated spec ( #8958 )
6 years ago
Eugen Rochko
edc7f895be
Fix CSP headers blocking media and development environment ( #8962 )
Regression from #8957
6 years ago
Eugen Rochko
8fd2cc54c1
Fix type of conversation ID in conversations API ( #8961 )
6 years ago
Eugen Rochko
ef43f1d2ca
Bump version to 2.5.2 ( #8960 )
6 years ago
Eugen Rochko
21ad21cb50
Improve signature verification safeguards ( #8959 )
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit a00ce8c92c
.
* Restore time window checking, change it to 12 hours
By checking the Date header, we can prevent replaying old vulnerable
signatures. The focus is to prevent replaying old vulnerable requests
from software that has been fixed in the meantime, so a somewhat long
window should be fine and accounts for timezone misconfiguration.
* Escape users' URLs when formatting them
Fixes possible HTML injection
* Escape all string interpolations in Formatter class
Slightly improve performance by reducing class allocations
from repeated Formatter#encode calls
* Fix code style issues
6 years ago
ThibG
0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
6 years ago
ThibG
2d27c11061
Set Content-Security-Policy rules through RoR's config ( #8957 )
* Set CSP rules in RoR's configuration
* Override CSP setting in the embed controller to allow frames
6 years ago
dependabot[bot]
9ece873d62
Bump doorkeeper from 5.0.0 to 5.0.1 ( #8954 )
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper ) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases )
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md )
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.0...v5.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Eugen Rochko
18e7ef6eda
Add check for missing tag param in streaming API ( #8955 )
* Add check for missing tag param in streaming API
Fixes error:
```
TypeError: Cannot read property 'toLowerCase' of undefined
at app.get (.../streaming/index.js:493:50)
```
* Fix code style issues
6 years ago
Thibaut Girka
8f720be9f3
Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
e6c01171de
Bump version to 2.5.1 ( #8953 )
6 years ago
Eugen Rochko
61d44dd11f
Fix typo in ActivityPub Create handler ( #8952 )
Regression from #8951
6 years ago
Eugen Rochko
87fdd139b8
Do not push DMs into the home feed ( #8940 )
* Do not push DMs into the home feed
* Show DMs column after sending a DM, if DMs column is not already shown
6 years ago
Eugen Rochko
790d3bc637
Move network calls out of transaction in ActivityPub handler ( #8951 )
Mention and emoji code may perform network calls, but does not need
to do that inside the database transaction. This may improve availability
of database connections when using pgBouncer in transaction mode.
6 years ago
dependabot[bot]
ac7df62a04
Bump better_errors from 2.4.0 to 2.5.0 ( #8946 )
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Thibaut Girka
bb1103d974
Really fix HotKeys
6 years ago
dependabot[bot]
070f817177
Bump bullet from 5.7.5 to 5.7.6 ( #8947 )
Bumps [bullet](https://github.com/flyerhzm/bullet ) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases )
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
47d7381d60
Bump scss_lint from 0.57.0 to 0.57.1 ( #8948 )
Bumps [scss_lint](https://github.com/brigade/scss-lint ) from 0.57.0 to 0.57.1.
- [Release notes](https://github.com/brigade/scss-lint/releases )
- [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
Eugen Rochko
2459da29c2
Add description meta tag additionally to og:description ( #8941 )
Fix #8685
6 years ago
Eugen Rochko
da7705b274
Add dns-prefetch if using different host for assets or uploads ( #8942 )
6 years ago
Thibaut Girka
a02244f17c
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
6 years ago
dependabot[bot]
46e4a759bb
Bump capistrano-rails from 1.3.1 to 1.4.0 ( #8936 )
Bumps [capistrano-rails](https://github.com/capistrano/rails ) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases )
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
076ceffa84
Bump dotenv-rails from 2.2.2 to 2.5.0 ( #8934 )
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv ) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases )
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md )
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
mayaeh
e50cb5f4bd
Fix that the copy button of verify link did not work. ( #8938 )
6 years ago