Maciek Baron
1e65cdf821
Add comment, test to unescapeHTML ( #7949 )
7 years ago
Maciek Baron
cdfe51e325
Fix #6395 - overlapping profile name and domain ( #7927 )
7 years ago
Marek Lach
7da74e3157
Fix dark background error on user-mention autosuggest ( #7937 )
7 years ago
Maciek Baron
f2d9a3c239
Refactor privacyPrefence() to use priority list ( #7945 )
7 years ago
Maciek Baron
0bfa0f2374
Add white outline to black emojis ( fix #5083 ) ( #7936 )
7 years ago
Maciek Baron
f3af1a96a8
Check if router is injected in media modal ( #7941 )
7 years ago
Maciek Baron
9dc413b025
Respect noindex rule in remote follow view ( fix #7869 ) ( #7939 )
7 years ago
Eugen Rochko
8ff0d64d05
What is on your mind -> What's on your mind ( #7938 )
7 years ago
Eugen Rochko
5b6db8a62a
Disable service worker media cache and IndexedDB storage ( #7932 )
...
Fix #7893
Fix #7615
7 years ago
Renato "Lond" Cerqueira
4045b50bd6
Restore support to ruby 2.3, add ruby 2.3 to circle ci ( #7935 )
...
This replace calls of String#match? with rails Regex#match?
This follows the same idea used to keep Rails 5.2 compatible with Ruby
2.2.2 in https://github.com/rails/rails/pull/32973
7 years ago
Maciek Baron
bbbe3ed6ba
Allow the media modal to be closed by pressing back ( #7934 )
7 years ago
Satsuki Yanagi
6d45f768a6
Fix Unknown addon provider in scalingo.json ( #7928 )
7 years ago
Eugen Rochko
b0968623fa
Fix check for PotentialFriendshipTracker when replying ( #7933 )
7 years ago
Eugen Rochko
23e1f143de
Fix M hotkey inserting @undefined when in detailed status ( #7931 )
...
Fix #7903
7 years ago
Eugen Rochko
30b377cc15
Fix style of attachment list on /about ( #7930 )
7 years ago
Eugen Rochko
da8fe8079e
Re-add follow recommendations API ( #7918 )
...
* Re-add follow recommendations API
GET /api/v1/suggestions
Removed in 8efa081f21
due to Neo4J
dependency. The algorithm uses triadic closures, takes into account
suspensions, blocks, mutes, domain blocks, excludes locked and moved
accounts, and prefers more recently updated accounts.
* Track interactions with people you don't follow
Replying to, favouriting and reblogging someone you're not following
will make them show up in follow recommendations. The interactions
have different weights:
- Replying is 1
- Favouriting is 10 (decidedly positive interaction, but private)
- Reblogging is 20
Following them, muting or blocking will remove them from the list,
obviously.
* Remove triadic closures, ensure potential friendships are trimmed
7 years ago
Shaun Gillies
ac82c9380f
Display full username in tooltip on search and autosuggest #7478 ( #7920 )
7 years ago
Eugen Rochko
2092d5c0ad
Improve embeds ( #7919 )
...
* Make embeds cacheable by reverse proxy
* Make follow button on embeds open remote follow modal
Instead of web+mastodon://, also, turn the button blue, and add a
sign up prompt to the remote follow modal
7 years ago
Marty McGuire
8fea9cc311
Typo in signature verification failure logging ( #7916 )
...
`@signature_verification_failure_reason` is used in most places but`@signed_verification_failure_reason` appears in two places. Likely those errors are not returned.
7 years ago
Marcin Mikołajczak
dfd9cd463d
i18n: Update Polish translation ( #7915 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
MIYAGI Hikaru
ddd0bb69e1
Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` ( #7901 )
...
If Mastodon accesses to the hidden service via transparent proxy, it's needed to avoid checking whether it's a private address, since `.onion` is resolved to a private address.
I was previously using the `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` to provide that function. However, I realized that using `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` is redundant, since this specification is always used with `ALLOW_ACCESS_TO_HIDDEN_SERVICE`. Therefore, I decided to integrate the setting of `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into` ALLOW_ACCESS_TO_HIDDEN_SERVICE`.
7 years ago
Eugen Rochko
cdb101340a
Keyword/phrase filtering ( #7905 )
...
* Add keyword filtering
GET|POST /api/v1/filters
GET|PUT|DELETE /api/v1/filters/:id
- Irreversible filters can drop toots from home or notifications
- Other filters can hide toots through the client app
- Filters use a phrase valid in particular contexts, expiration
* Make sure expired filters don't get applied client-side
* Add missing API methods
* Remove "regex filter" from column settings
* Add tests
* Add test for FeedManager
* Add CustomFilter test
* Add UI for managing filters
* Add streaming API event to allow syncing filters
* Fix tests
7 years ago
Quentí
fbee9b5ac8
Missing translations ( #7896 )
7 years ago
ふぁぼ原
20bb90ced6
On the mobile UI, move the search column to the right ( #7877 )
7 years ago
J Yeary
905bd24788
TOR federation ( #7875 )
7 years ago
Yamagishi Kazutoshi
523d8f20e3
Add symbolic link for yarnpkg ( #7894 )
7 years ago
Yamagishi Kazutoshi
995f8b389a
Add .bundle to .dockerignore ( #7895 )
7 years ago
Yamagishi Kazutoshi
349d0196b2
Weblate translations (2018-06-25) ( #7890 )
...
* Translated using Weblate (Basque)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Galician)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (German)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (Persian)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Basque)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (German)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 99.6% (621 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Telugu)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Slovak)
Currently translated at 96.6% (602 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Catalan)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.1% (618 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/
* Translated using Weblate (Malay)
Currently translated at 0.4% (3 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/
* Translated using Weblate (Occitan)
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
Work in Progress
* Translated using Weblate (French)
Currently translated at 94.3% (67 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (French)
Currently translated at 94.3% (67 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Slovak)
Currently translated at 97.1% (605 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 36.2% (226 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 94.0% (586 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 99.3% (305 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 96.9% (604 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 97.5% (608 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/
* Translated using Weblate (Italian)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Italian)
Currently translated at 84.4% (526 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.1% (605 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.2% (606 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused
7 years ago
Yamagishi Kazutoshi
097fd44978
Add /mastodon/bin to $PATH ( #7889 )
7 years ago
SerCom_KC
11a7f725da
i18n: (zh-CN) #7823 , #7828 ( #7887 )
7 years ago
Eugen Rochko
45b5e60909
Fix Chrome issue with sizes="0px" ( #7886 )
...
"Do not dumb here. Not dumb area here."
7 years ago
ThibG
c18d55e8c2
Merge pull request #553 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
7 years ago
Thibaut Girka
f364a27922
Increase padding of toots
7 years ago
Thibaut Girka
ccbaf32bca
Fix margins of toot text
7 years ago
Thibaut Girka
4b0f27ba78
Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
ThibG
50a2854f92
Fix jpeg files sometimes being returned with a .jpe extension ( #7881 )
...
While this isn't exactly *wrong*, files uploaded with a “.jpe” extension will
keep that extension, which will often cause them to be served with an
incorrect mimetype.
7 years ago
Shuhei Kitagawa
23955d956e
Add tests for remote_unfollows_controller ( #7879 )
7 years ago
ThibG
03cfe366fd
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
7 years ago
Thibaut Girka
0c3a337e04
Fix confirmations_controller
7 years ago
takayamaki
245fa1446a
fix : Disable reverted index changes ( #7871 )
7 years ago
Mélanie Chauvel (ariasuni)
f0f8b242c4
Fix CW field still having animation in when reduce motion is enabled ( #7872 )
7 years ago
Thibaut Girka
f0161702d8
[Glitch] Submit report using meta key
...
Port 64d7a63f18
to glitch-soc
7 years ago
Thibaut Girka
d0faac9027
Fix clicking on collapsed toots with a background ( fixes #547 )
7 years ago
Thibaut Girka
ab5f450700
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
7 years ago
Shuhei Kitagawa
7f59206944
Replace bypass option with bypass_sign_in ( #7867 )
7 years ago
Shuhei Kitagawa
459394a020
Add missing tests for confirmations controller ( #7866 )
7 years ago
Hinaloe
c3b40a6950
Return collect response when fail put cache to storage ( #7863 )
...
* return collect response when fail put cache to storage
* cleanup callback
7 years ago
Daigo 3 Dango
cd1b90d223
Update sprockets gem ( #7858 )
...
https://blog.heroku.com/rails-asset-pipeline-vulnerability
7 years ago
kedama
926bfce465
Fix broken single column getting-started menu ( Fix #7854 ) ( #7862 )
...
* Fix lack of height of the getting-started menu. (Fix #7854 )
Include the height of navigation bar at the height of getting-started menu.
* Remove item "Security" on the getting-started menu.
7 years ago
Isao Sugimoto
80bda9719d
fix filter languages label on settings (ja) ( #7848 )
...
ref: #7823
7 years ago