Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes #1158

Merged
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
23aeef5
Remove Salmon and PubSubHubbub (#11205)
Gargron Jul 6, 2019
5827671
Fix support for HTTP proxies (#11245)
ClearlyClaire Jul 7, 2019
406b463
Fix URLs appearing twice in errors of ActivityPub::DeliveryWorker (#1…
Gargron Jul 7, 2019
b851456
Remove Atom feeds and old URLs in the form of `GET /:username/updates…
Gargron Jul 7, 2019
3ece6e2
Update fuubar dependency to 2.4.1 (#11248)
nilsding Jul 7, 2019
87c1ad4
Fix BackupService crashing when an attachment is missing (#11241)
ClearlyClaire Jul 8, 2019
239befc
Bump react-redux from 6.0.1 to 7.1.0 (#11256)
dependabot-preview[bot] Jul 8, 2019
6a313f8
Bump intl-relativeformat from 2.2.0 to 6.4.2 (#11255)
dependabot-preview[bot] Jul 8, 2019
1a8bbcd
Bump compression-webpack-plugin from 2.0.0 to 3.0.0 (#11224)
dependabot-preview[bot] Jul 8, 2019
76d5fd1
Bump @babel/plugin-proposal-class-properties from 7.4.4 to 7.5.0 (#11…
dependabot-preview[bot] Jul 8, 2019
d0b40ae
Bump eslint-plugin-react from 7.12.1 to 7.14.2 (#11253)
dependabot-preview[bot] Jul 8, 2019
f935004
Bump tzinfo-data from 1.2019.1 to 1.2019.2 (#11258)
dependabot-preview[bot] Jul 8, 2019
01ee35f
Bump aws-sdk-s3 from 1.43.0 to 1.45.0 (#11262)
dependabot-preview[bot] Jul 8, 2019
d76ca89
Bump simplecov from 0.16.1 to 0.17.0 (#11260)
dependabot-preview[bot] Jul 8, 2019
f147764
Bump faker from 1.9.3 to 1.9.6 (#11259)
dependabot-preview[bot] Jul 8, 2019
63c7fe8
Refactor controllers for statuses, accounts, and more (#11249)
Gargron Jul 8, 2019
ef15246
Remove unused remote unfollow controller (#11250)
Gargron Jul 8, 2019
1e7187f
Fix Status.remote scope matching *all* statuses (#11265)
ClearlyClaire Jul 8, 2019
4e92183
Refactor domain block checks (#11268)
Gargron Jul 9, 2019
6172263
Fix activity being rendered within activity due to caching (#11271)
Gargron Jul 9, 2019
27ad4c1
Fix old migration script depending on the StreamEntry model (#11278)
ClearlyClaire Jul 10, 2019
85eb418
Fix handling of webfinger redirects in ResolveAccountService (#11279)
ClearlyClaire Jul 10, 2019
d04c584
Drop magic-public-key from webfinger replies as it's only used for OS…
ClearlyClaire Jul 10, 2019
5d3feed
Refactor fetching of remote resources (#11251)
Gargron Jul 10, 2019
a6dc6a2
[Security] Bump lodash from 4.17.11 to 4.17.13 (#11287)
dependabot-preview[bot] Jul 11, 2019
4e8dcc5
Add HTTP signatures to all outgoing ActivityPub GET requests (#11284)
Gargron Jul 11, 2019
4e1260f
Fix BlockService trying to reject incorrect follow request (#11288)
ClearlyClaire Jul 11, 2019
5bf67ca
Add ActivityPub secure mode (#11269)
Gargron Jul 11, 2019
4023027
Change the retry limit in error of web push notification (#11292)
highemerly Jul 12, 2019
6ff67be
Add a spam check (#11217)
Gargron Jul 13, 2019
6af0c95
Bump rubocop-rails from 2.0.1 to 2.2.0 (#11257)
dependabot-preview[bot] Jul 13, 2019
2ea4dbb
Bump handlebars from 4.1.0 to 4.1.2 (#11293)
PatOnTheBack Jul 14, 2019
3595ce6
Fix leaking private statuses the admin account follows (#11300)
ClearlyClaire Jul 15, 2019
2f813b7
Disable LDSigning when AUTHORIZED_FETCH is set to true (#11295)
ClearlyClaire Jul 15, 2019
e7353c4
Change default interface of web and streaming from 0.0.0.0 to 127.0.0…
Gargron Jul 15, 2019
cecd0c3
New Crowdin translations (#11153)
Gargron Jul 15, 2019
b3f44aa
Add periodic removal of older thumbnails for preview cards (#11304)
Gargron Jul 15, 2019
5b4a934
Fix consistent interpolations (#11317)
ykzts Jul 15, 2019
851ad99
Bump eslint-plugin-import from 2.17.3 to 2.18.0 (#11310)
dependabot-preview[bot] Jul 15, 2019
23b29f7
Bump @babel/runtime from 7.4.5 to 7.5.4 (#11315)
dependabot-preview[bot] Jul 15, 2019
7840d56
Bump lodash from 4.17.13 to 4.17.14 (#11312)
dependabot-preview[bot] Jul 15, 2019
ae16820
Bump webpack from 4.34.0 to 4.35.3 (#11309)
dependabot-preview[bot] Jul 15, 2019
4562c3c
Bump eslint-plugin-jsx-a11y from 6.2.1 to 6.2.3 (#11314)
dependabot-preview[bot] Jul 15, 2019
9b1d3e4
Add option to disable real-time updates in web UI (#9984)
Gargron Jul 16, 2019
b4c9a86
Make puma bind address configurable with BIND env var (#11326)
zunda Jul 16, 2019
91544a6
Remove unused Account#magic_key (#11327)
ClearlyClaire Jul 16, 2019
15ddabf
Fix caching headers in ActivityPub endpoints (#11331)
ClearlyClaire Jul 16, 2019
5599cae
Extend AUTHORIZED_FETCH mode to user blocks as well (#11332)
ClearlyClaire Jul 16, 2019
873828a
Fix custom CSS controller (#11336)
ClearlyClaire Jul 17, 2019
fccd25c
Change terms and privacy policy pages to always be accessible (#11334)
Gargron Jul 17, 2019
7e2b6da
Add setting to disable the anti-spam (#11296)
ClearlyClaire Jul 17, 2019
87f4aea
Fix typo in StatusPolicy (#11344)
ClearlyClaire Jul 17, 2019
7cc98eb
Bump puma from 3.12.1 to 4.0.1 (#11306)
dependabot-preview[bot] Jul 17, 2019
cbd7748
Bump rubocop-rails from 2.2.0 to 2.2.1 (#11308)
dependabot-preview[bot] Jul 17, 2019
3a6fe65
Bump rack-attack from 6.0.0 to 6.1.0 (#11313)
dependabot-preview[bot] Jul 17, 2019
5bfe1e1
Change language detection to include hashtags as words (#11341)
Gargron Jul 18, 2019
4906cab
Add aac, m4a, 3gp to allowed audio formats (#11342)
Gargron Jul 18, 2019
84e9884
Fix only one middle dot being recognized in hashtags (#11345)
Gargron Jul 18, 2019
15c7478
Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#…
Gargron Jul 18, 2019
730c405
Add ActivityPub actor representing the entire server (#11321)
ClearlyClaire Jul 18, 2019
fda437a
Fix sanitizing lists contents (#11354)
ClearlyClaire Jul 18, 2019
8df0022
Added logout to dropdown menu (#11353)
koyuawsmbrtn Jul 19, 2019
4fa6472
Fix avatar animation on hover when not logged in (#11349)
ClearlyClaire Jul 19, 2019
aa22b38
Change single-column mode to scroll the whole page (#11359)
Gargron Jul 19, 2019
6867a0b
Bump strong_migrations from 0.4.0 to 0.4.1 (#11307)
dependabot-preview[bot] Jul 19, 2019
249991c
Merge branch 'master' into glitch-soc/merge-upstream
ClearlyClaire Jul 19, 2019
bf3ab44
Remove Atom feeds and old URLs in the form of `GET /:username/updates…
Gargron Jul 7, 2019
490cf3a
[Glitch] Add ActivityPub actor representing the entire server
ClearlyClaire Jul 18, 2019
3407ae8
Fix sanitizer text case for glitch-soc, which preserves lists
ClearlyClaire Jul 19, 2019
86d4461
Fix HTML entities being encoded as hashtag links…
ClearlyClaire Jul 19, 2019
650459f
Fix some flash notices/alerts staying on unrelated pages (#11364)
ClearlyClaire Jul 19, 2019
c37c1da
Disallow numeric-only hashtags (#11363)
ClearlyClaire Jul 19, 2019
055450b
Merge branch 'master' into glitch-soc/merge-upstream
ClearlyClaire Jul 19, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix avatar animation on hover when not logged in (mastodon#11349)
ClearlyClaire authored and Gargron committed Jul 19, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 4fa6472523d47e56f2458950af8d7ad9b5817a82
2 changes: 1 addition & 1 deletion app/javascript/packs/public.js
Original file line number Diff line number Diff line change
@@ -178,7 +178,7 @@ function main() {
return ({ target }) => {
const swapSrc = target.getAttribute(swapTo);
//only change the img source if autoplay is off and the image src is actually different
if(target.getAttribute('data-autoplay') === 'false' && target.src !== swapSrc) {
if(target.getAttribute('data-autoplay') !== 'true' && target.src !== swapSrc) {
target.src = swapSrc;
}
};