abcang
1e2695198a
Skip link-back check if body is nil ( #9107 )
6 years ago
Eugen Rochko
161aeadbb4
Remove character counter from edit profile ( #9100 )
...
* Remove display name and bio counter hint, simply limit input
* Remove now redundant translations
* Fix code style issue
6 years ago
Eugen Rochko
768b0f132d
Fix direct messages column not loading more items on scroll ( #9102 )
...
Fix #9097
6 years ago
Eugen Rochko
a2e3401e48
Fix conversations not being marked read on click ( #9103 )
...
Fix #9096
6 years ago
ThibG
7fee968e9f
Do not fetch preview card for mentioned users ( #6934 )
6 years ago
Eugen Rochko
d4cf963749
Allow inbox owner to view implicitly targeted ActivityPub payload ( #9093 )
...
Fix #9091
6 years ago
Eugen Rochko
4ea718ef18
Migrate all old direct messages to new conversations schema ( #9085 )
6 years ago
Yamagishi Kazutoshi
e8ffecbd36
Set @body_classes to admin layout ( #9081 )
6 years ago
Eugen Rochko
d723f2a0a8
Fix RTL layout of status display names ( #9075 )
...
Fix #2350
6 years ago
Eugen Rochko
288e435fe5
Show upload options on click as well as hover ( #9074 )
...
Fix #8918
6 years ago
Eugen Rochko
01c169e796
Fix JS error when posting from page without router context ( #9073 )
...
Fix #9057
6 years ago
Thibaut Girka
ed8d06212f
Keep back own DMs in Home timeline
...
Follow-up to e45a6edd65
, fixes inconsistencies
in glitch-soc behavior.
6 years ago
Thibaut Girka
8f3096b846
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
39abec4d25
Fix public timelines not instantly updating on compose ( #9050 )
...
Fix #9034
6 years ago
Eugen Rochko
ad510db3a1
Show suggested follows on search screen in mobile layout ( #9010 )
...
Reminder: Suggestions were added in #7918 and are based on who you
interact with who you do not follow. E.g. if you boost someone a lot
from seeing other people's boosts of that person, it makes sense you
might be interested in following the original source; or if you reply
to someone a lot, maybe you'd want to follow them
Each suggestion can be dismissed
6 years ago
Eugen Rochko
81017eaea7
Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )
...
This reverts commit c7e9f9ff1e
.
6 years ago
Thibaut Girka
0c7f710be1
[Glitch] Surround mid-text display names with bdi tags
...
Port 7861c5f108
to glitch-soc
6 years ago
Thibaut Girka
323ae1403a
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port bebe8ec887
to glitch-soc
6 years ago
Thibaut Girka
1bb23d0407
[Glitch] RTL: fix cardbar margins and alignment
...
Port c73864c137
to glitch-soc
6 years ago
Thibaut Girka
c9b19e05e2
[Glitch] RTL: fix admin account avatar margin in about page
...
Port 3a157210c8
to glitch-soc
6 years ago
Thibaut Girka
c14be538a6
[Glitch] RTL: fix column settings toggle label
...
Port bf58461d36
to glitch-soc
6 years ago
Thibaut Girka
a1f512f18b
[Glitch] Fix domain label position and color
...
Port 25f9ead041
to glitch-soc
6 years ago
Thibaut Girka
9950db2e1c
[Glitch] RTL: fix preferences layout
...
Port 029943d59b
to glitch-soc
6 years ago
Thibaut Girka
076f0a0eb6
[Glitch] Fix admin account avatar margin
...
Port 065b39e7a4
to glitch-soc
6 years ago
Thibaut Girka
aa277ab5fb
[Glitch] RTL: fix user stats in about page
...
Port 301cbcc980
to glitch-soc
6 years ago
Thibaut Girka
ef9c11e050
[Glitch] RTL: fix domain append at signup form
...
Port 65b3804a6c
to glitch-soc
6 years ago
Thibaut Girka
e18724363d
[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
...
Port d35801aaa2
to glitch-soc
6 years ago
Thibaut Girka
1139b758c5
[Glitch] RTL: fix admin account margins in about page
...
Port f8c1b32541
to glitch-soc
6 years ago
Thibaut Girka
bf9c4b6d98
[Glitch] undo part of PR 8202 to fix RTL
...
Port efd09e2ebb
to glitch-soc
6 years ago
Thibaut Girka
9f1c9b6135
[Glitch] Improve style of notice/alert messages
...
Port b972478812
to glitch-soc
6 years ago
Thibaut Girka
e45a6edd65
Keep new DMs in home feeds and in the old DM timeline
...
Revert server-side part of 87fdd139b8
6 years ago
Thibaut Girka
dcded13a99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
6 years ago
Masoud Abkenar
c7e9f9ff1e
RTL: remove blank character inside bdi ( #9038 )
...
* RTL: remove blank character inside bdi
* Update app/javascript/mastodon/components/display_name.js
Co-Authored-By: mabkenar <ampbox@gmail.com>
6 years ago
ThibG
84cf78da8a
Fix og:url on toots' public view ( #9047 )
...
Fixes #9045
6 years ago
Masoud Abkenar
c73864c137
RTL: fix cardbar margins and alignment ( #9044 )
6 years ago
Masoud Abkenar
3a157210c8
RTL: fix admin account avatar margin in about page ( #9039 )
...
* RTL: fix admin account avatar margin in about page
* fix code style
6 years ago
Thibaut Girka
4739e0f090
Put a video camera emoji or a picture frame emoji instead of “.”
...
This uses the same logic as the status icons in the glitch flavor.
6 years ago
Thibaut Girka
8729f5e466
Do not move CWs to toot body when toot body is empty
...
Fixes #395
Instead of leaving the toot body blank, it replaces it with a single “.” in
order for the fold/unfold CW behavior to not look *too* weird on upstream
Mastodon. Note that this does not fix upstream's CW-dropping behavior, as
that is decided at the time the toot is posted, not received.
6 years ago
Thibaut Girka
04bedd237b
Attempt at fixing inline video player
6 years ago
Thibaut Girka
dfa5b0576f
Update mediaGallery component's width when opening CWs
6 years ago
Masoud Abkenar
bf58461d36
RTL: fix column settings toggle label ( #9037 )
6 years ago
kedama
25f9ead041
Fix domain label position and color ( #9033 )
...
* Fix position of the domain label
* Fix position of the domain label for RTL
- Fix color mismatch of linear gradient which assigned to "::after" pseudo class
6 years ago
Thibaut Girka
e4c3ea1809
Force sensitive content flag when posting a toot with a CW
...
Indeed, when the “Always enable the Content Warning field” setting is enabled,
sending a content-less toot with a CW would move the CW to the toot's content
and leave the toot not marked as sensitive.
6 years ago
Thibaut Girka
13c3fa8d36
Focus the UI when pressing Escape in the CW field
6 years ago
Eugen Rochko
fd5285658f
Add option to block reports from domain ( #8830 )
6 years ago
Eugen Rochko
9486f0ca77
Add "disable" button to report screen ( #9024 )
...
* Add "disable" button to report screen
* i18n-tasks remove-unused
6 years ago
Eugen Rochko
eb1b9903a6
Redesign direct messages column ( #9022 )
6 years ago
Masoud Abkenar
029943d59b
RTL: fix preferences layout ( #9021 )
6 years ago
bsky
065b39e7a4
Fix admin account avatar margin ( #9020 )
6 years ago
Masoud Abkenar
301cbcc980
RTL: fix user stats in about page ( #9018 )
6 years ago
Eugen Rochko
a38a452481
Add unread indicator to conversations ( #9009 )
6 years ago
takayamaki
bebe8ec887
fix: initial state of PrivacyDropdown is should not be null ( #9008 )
6 years ago
Masoud Abkenar
65b3804a6c
RTL: fix domain append at signup form ( #9007 )
6 years ago
ThibG
007f7690fa
Fix fav/boosts hotkeys not working on detailed statuses ( #9006 )
6 years ago
Thibaut Girka
b13c34de3a
Fix fav/boosts hotkeys not working on detailed statuses
6 years ago
Masoud Abkenar
f8c1b32541
RTL: fix admin account margins in about page ( #9005 )
6 years ago
Eugen Rochko
72d7d3003b
Do not show "limited" visibility in default visibility preference ( #8999 )
...
* Do not show "limited" visibility in default visibility preference
Fix regression from #8950
* Fix code style issue
6 years ago
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
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
Quint Guvernator
f5e2e96e95
always allow DMs from staff ( #8993 )
6 years ago
Eugen Rochko
35b576dbec
Improve form for selecting media display preference ( #8965 )
...
Regression from #8569
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
Thibaut Girka
b0527a4ce7
Handle alt+enter in the spoiler input as shortcut for secondary post
...
Fixes #780
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
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
8fd2cc54c1
Fix type of conversation ID in conversations API ( #8961 )
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
Thibaut Girka
8f720be9f3
Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
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
Thibaut Girka
bb1103d974
Really fix HotKeys
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
mayaeh
e50cb5f4bd
Fix that the copy button of verify link did not work. ( #8938 )
6 years ago
Eugen Rochko
7f9dd92a27
Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )
6 years ago
Thibaut Girka
269edc0e48
Fix CW icon color in local-settings modal
6 years ago
Thibaut Girka
721aec40cd
Define some local-settings hints
6 years ago
Thibaut Girka
26409f3e8e
Add support for hints (or extended descriptions) in local-settings pages
6 years ago
Thibaut Girka
5f308a7f05
When screen width is too narrow, hide local-settings page text, keep only icons
6 years ago
Thibaut Girka
6cd793f0ac
Change “preferences” icon to match settings page icon
6 years ago
Thibaut Girka
edb9ec8543
Add icons for each of the local-setting pages
6 years ago
Thibaut Girka
122ac9cd1d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
d0b1369a85
Fix app-wide hotkeys randomly failing to work
6 years ago
mayaeh
87abbb07f3
Add Japanese translations. ( #8927 )
6 years ago
Thibaut Girka
b368d3c15d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh
770e337497
Fixed error occurrence when pinning the DM column. ( #8922 )
6 years ago
Thibaut Girka
d17844e6d1
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
96c3d26870
Move “Show action buttons in collapsed toots” option
6 years ago