]> cat aescling's git repositories - mastodon.git/log
mastodon.git
9 years agoAdd pixel background to modal images
Eugen Rochko [Sat, 28 Jan 2017 03:04:09 +0000 (04:04 +0100)]
Add pixel background to modal images

9 years agoUpdate settings to re-use admin layout, one big navigation tree, improve settings...
Eugen Rochko [Sat, 28 Jan 2017 02:56:10 +0000 (03:56 +0100)]
Update settings to re-use admin layout, one big navigation tree, improve settings forms

9 years agoClean up
Eugen Rochko [Fri, 27 Jan 2017 19:38:35 +0000 (20:38 +0100)]
Clean up

9 years agoDo not automatically login after password reset, as it would circumvent two-factor...
Eugen Rochko [Fri, 27 Jan 2017 19:34:22 +0000 (20:34 +0100)]
Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled)
Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit

9 years agoAdded optional two-factor authentication
Eugen Rochko [Fri, 27 Jan 2017 19:28:46 +0000 (20:28 +0100)]
Added optional two-factor authentication

9 years agoLess ambiguous sensitive content toggle label (#556)
Zachary Spector [Fri, 27 Jan 2017 18:31:14 +0000 (13:31 -0500)]
Less ambiguous sensitive content toggle label (#556)

9 years agoMerge pull request #557 from hoodiek/master
Eugen [Fri, 27 Jan 2017 17:41:05 +0000 (18:41 +0100)]
Merge pull request #557 from hoodiek/master

fix button outline showing on clicks for prettiness

9 years agofix button outline showing on clicks for prettiness
hoodie [Fri, 27 Jan 2017 17:39:36 +0000 (12:39 -0500)]
fix button outline showing on clicks for prettiness

remove button outlines on-click for retweet, boost, favourite, and reply
buttons

9 years agoUpdate broken links, add new sponsor
Eugen Rochko [Fri, 27 Jan 2017 16:01:21 +0000 (17:01 +0100)]
Update broken links, add new sponsor

9 years agoDo not run FetchLinkCardService on local URLs, increase file size limit to 8MB,
Eugen Rochko [Fri, 27 Jan 2017 15:55:06 +0000 (16:55 +0100)]
Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB,
fix ProcessFeedService pushing status into distribution if called a second time
while the first is still running (i.e. when a PuSH comes after a Salmon slap),
fix not running escape on spoiler text before emojify

9 years agoUpdated translation doc to get working links
nicolas [Fri, 27 Jan 2017 12:17:33 +0000 (13:17 +0100)]
Updated translation doc to get working links

9 years agoFix font weight
Eugen Rochko [Thu, 26 Jan 2017 22:34:40 +0000 (23:34 +0100)]
Fix font weight

9 years agoMerge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation
Eugen [Thu, 26 Jan 2017 22:03:41 +0000 (23:03 +0100)]
Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation

Add default account details to developer documentation.

9 years agoMerge pull request #548 from PurpleBooth/make-fonts-local
Eugen [Thu, 26 Jan 2017 22:02:48 +0000 (23:02 +0100)]
Merge pull request #548 from PurpleBooth/make-fonts-local

Move the fonts from Google Fonts to local assets

9 years agoMove the fonts from Google Fonts to local assets
Billie Thompson [Thu, 26 Jan 2017 14:06:40 +0000 (14:06 +0000)]
Move the fonts from Google Fonts to local assets

Currently we have two problems that are resolved by this change.

The first is that we have a dependency on Google Fonts, which means
that should it ever go down, or it have issues we would also have
issues. This will resolve this by moving the dependencies we load from
there to the local server.

The second issue is that Google Fonts is currently returning the
`local()` css font source. This causes a problem where the users browser
fails to fallback to a missing glyph, resulting in many unusual
characters displaying the failure glyph. This will resolve this by
creating a font-family definition that does not use the `local()`
source.

I did not update the error pages with local fonts, they still use the
remote google fonts api, so they're a self contained page that does not
use the asset pipeline.

This resolves tootsuite/mastodon#531 and tootsuite/mastodon#12

9 years agoMerge pull request #550 from wchristian/oauth_docs2
Eugen [Thu, 26 Jan 2017 19:41:53 +0000 (20:41 +0100)]
Merge pull request #550 from wchristian/oauth_docs2

document that /oauth/token does not always return json

9 years agoFix key names in statsd
Eugen Rochko [Thu, 26 Jan 2017 18:46:52 +0000 (19:46 +0100)]
Fix key names in statsd

9 years agoImprove StatsD instrumentation
Eugen Rochko [Thu, 26 Jan 2017 18:08:05 +0000 (19:08 +0100)]
Improve StatsD instrumentation

9 years agoFix up timeout, improve contrast on "show more", add responsive style
Eugen Rochko [Thu, 26 Jan 2017 17:48:56 +0000 (18:48 +0100)]
Fix up timeout, improve contrast on "show more", add responsive style
for extremely wide monitors

9 years agodocument that /oauth/token does not always return json
Christian Walde [Thu, 26 Jan 2017 15:27:16 +0000 (16:27 +0100)]
document that /oauth/token does not always return json

9 years agoAdd default account details to developer documentation.
Effy Elden [Thu, 26 Jan 2017 15:03:13 +0000 (02:03 +1100)]
Add default account details to developer documentation.

9 years agoRemoved accidental n+1 query from notifications, updated some deps,
Eugen Rochko [Thu, 26 Jan 2017 13:52:07 +0000 (14:52 +0100)]
Removed accidental n+1 query from notifications, updated some deps,
improved how "show more" link looks

9 years agoMerge pull request #526 from wchristian/oauth_docs
Eugen [Thu, 26 Jan 2017 11:23:47 +0000 (12:23 +0100)]
Merge pull request #526 from wchristian/oauth_docs

clarify the intended use of the oauth api call

9 years agoMerge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-enviro...
Eugen [Thu, 26 Jan 2017 11:22:32 +0000 (12:22 +0100)]
Merge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-environments

Seed a default, confirmed, admin account on development environments

9 years agoMerge pull request #541 from TrevInc/master
Eugen [Thu, 26 Jan 2017 10:07:42 +0000 (11:07 +0100)]
Merge pull request #541 from TrevInc/master

Add brackets to visually distinguish show more / show less text

9 years agoRemoved line break before spoiler link, changed color of bg for spoiler link
Anthony Bellew [Thu, 26 Jan 2017 10:07:02 +0000 (03:07 -0700)]
Removed line break before spoiler link, changed color of bg for spoiler link

9 years agoAdd Padding to inline styles for spoiler
Anthony Bellew [Thu, 26 Jan 2017 10:03:26 +0000 (03:03 -0700)]
Add Padding to inline styles for spoiler

9 years agoAdded inline spoiler button styles
Anthony Bellew [Thu, 26 Jan 2017 10:02:42 +0000 (03:02 -0700)]
Added inline spoiler button styles

9 years agoMerge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings
Eugen [Thu, 26 Jan 2017 09:44:20 +0000 (10:44 +0100)]
Merge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings

Add redirect for /admin => /admin/settings

9 years agoMerge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant...
Eugen [Thu, 26 Jan 2017 09:43:54 +0000 (10:43 +0100)]
Merge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant-environments

Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant

9 years agoAdd a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant
Effy Elden [Thu, 26 Jan 2017 08:22:59 +0000 (19:22 +1100)]
Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant

9 years agoSeed a default, confirmed, admin account on development environments
Effy Elden [Thu, 26 Jan 2017 08:22:00 +0000 (19:22 +1100)]
Seed a default, confirmed, admin account on development environments

9 years agoAdd redirect for /admin => /admin/settings
Effy Elden [Thu, 26 Jan 2017 07:59:35 +0000 (18:59 +1100)]
Add redirect for /admin => /admin/settings

9 years agoMoved brackets outside of localized strings at Gargron's suggestion
Anthony Bellew [Thu, 26 Jan 2017 07:24:52 +0000 (00:24 -0700)]
Moved brackets outside of localized strings at Gargron's suggestion

9 years agoAdd brackets to visually distinguish show more / show less text
Anthony Bellew [Thu, 26 Jan 2017 03:56:33 +0000 (20:56 -0700)]
Add brackets to visually distinguish show more / show less text

9 years agoMerge pull request #3 from tootsuite/master
Anthony Bellew [Thu, 26 Jan 2017 03:53:57 +0000 (20:53 -0700)]
Merge pull request #3 from tootsuite/master

Updating to current

9 years agoImprove infinite scroll on notifications
Eugen Rochko [Thu, 26 Jan 2017 03:30:40 +0000 (04:30 +0100)]
Improve infinite scroll on notifications

9 years agoFollow request authorizations faster
Eugen Rochko [Thu, 26 Jan 2017 02:56:26 +0000 (03:56 +0100)]
Follow request authorizations faster

9 years agoFix #537 - opengraph description should display spoiler text when present
Eugen Rochko [Thu, 26 Jan 2017 02:45:14 +0000 (03:45 +0100)]
Fix #537 - opengraph description should display spoiler text when present

9 years agoFix #538 - Darken buttons to increase contrast
Eugen Rochko [Thu, 26 Jan 2017 02:32:00 +0000 (03:32 +0100)]
Fix #538 - Darken buttons to increase contrast

9 years agoFix CSS mistake
Eugen Rochko [Thu, 26 Jan 2017 02:17:48 +0000 (03:17 +0100)]
Fix CSS mistake

9 years agoMerge pull request #534 from yiskah/patch-2
Eugen [Thu, 26 Jan 2017 01:51:27 +0000 (02:51 +0100)]
Merge pull request #534 from yiskah/patch-2

Increase color contrast on getting started text

9 years agoMerge pull request #536 from blackle/leftclick
Eugen [Thu, 26 Jan 2017 01:50:55 +0000 (02:50 +0100)]
Merge pull request #536 from blackle/leftclick

Only open status on left mouse press

9 years agoOnly open status on left mouse press
blackle [Thu, 26 Jan 2017 01:43:41 +0000 (20:43 -0500)]
Only open status on left mouse press

9 years agoIncrease color contrast on getting started text
shel [Thu, 26 Jan 2017 01:19:37 +0000 (20:19 -0500)]
Increase color contrast on getting started text

Currently, the getting started text fails WCAG standards for color contrast by a lot. Especially on the part overlapping with the elephant graphic which is nearly unreadable even for users with 20|20 vision. This change doesn't fix the elephant overlap but at least makes the text meet AAA WCAG Small Text color contrast standards, making it easier to read.

9 years agoclarify the intended use of the oauth api call as per this issue:
Christian Walde [Wed, 25 Jan 2017 17:31:15 +0000 (18:31 +0100)]
clarify the intended use of the oauth api call as per this issue:

https://github.com/alin-rautoiu/mastodroid/issues/23

9 years agoFix loading of avatars before drawing them to canvas
Eugen Rochko [Wed, 25 Jan 2017 16:23:17 +0000 (17:23 +0100)]
Fix loading of avatars before drawing them to canvas

9 years agoFix #187, address #441 - <Avatar> component now plays gifs only while hovered
Eugen Rochko [Wed, 25 Jan 2017 16:07:57 +0000 (17:07 +0100)]
Fix #187, address #441 - <Avatar> component now plays gifs only while hovered

9 years agoUse <summary> to encode content warnings instead
Eugen Rochko [Wed, 25 Jan 2017 15:53:30 +0000 (16:53 +0100)]
Use <summary> to encode content warnings instead

9 years agoFix spoiler_text not having "not null" constraint
Eugen Rochko [Wed, 25 Jan 2017 14:24:19 +0000 (15:24 +0100)]
Fix spoiler_text not having "not null" constraint

9 years agoFix order of migrations
Eugen Rochko [Wed, 25 Jan 2017 14:01:00 +0000 (15:01 +0100)]
Fix order of migrations

9 years agoAdd content warning example to docs
Eugen Rochko [Wed, 25 Jan 2017 01:54:28 +0000 (02:54 +0100)]
Add content warning example to docs

9 years agoAdd description of Mastodon's current protocol extensions
Eugen Rochko [Wed, 25 Jan 2017 01:46:16 +0000 (02:46 +0100)]
Add description of Mastodon's current protocol extensions

9 years agoMerge pull request #524 from blackle/master
Eugen [Wed, 25 Jan 2017 01:16:36 +0000 (02:16 +0100)]
Merge pull request #524 from blackle/master

fix up spoilers

9 years agofix up spoilers
blackle [Wed, 25 Jan 2017 01:14:20 +0000 (20:14 -0500)]
fix up spoilers

9 years agoFix #522 - prevent blocked users from reblogging
Eugen Rochko [Wed, 25 Jan 2017 00:48:46 +0000 (01:48 +0100)]
Fix #522 - prevent blocked users from reblogging

9 years agoMerge branch 'blackle-master'
Eugen Rochko [Wed, 25 Jan 2017 00:29:40 +0000 (01:29 +0100)]
Merge branch 'blackle-master'

9 years agoInstead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler...
Eugen Rochko [Tue, 24 Jan 2017 23:49:08 +0000 (00:49 +0100)]
Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text
Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations

9 years agoMerge branch 'master' into master
Eugen [Tue, 24 Jan 2017 20:56:06 +0000 (21:56 +0100)]
Merge branch 'master' into master

9 years agoMake blocks create entries and unfollows instantly, but do the clean up
Eugen Rochko [Tue, 24 Jan 2017 20:40:41 +0000 (21:40 +0100)]
Make blocks create entries and unfollows instantly, but do the clean up
in the background instead. Should fix delay where blocked person
can interact with blocker for a short time before background job
gets processed

9 years agoMerge pull request #521 from mistydemeo/fix_invisible_css
Eugen [Tue, 24 Jan 2017 20:26:18 +0000 (21:26 +0100)]
Merge pull request #521 from mistydemeo/fix_invisible_css

Fix `invisible` CSS class

9 years agoFix `invisible` CSS class
Misty De Meo [Tue, 24 Jan 2017 19:07:46 +0000 (11:07 -0800)]
Fix `invisible` CSS class

9 years agoFix links in toots opening the toot at first
Eugen Rochko [Tue, 24 Jan 2017 17:51:09 +0000 (18:51 +0100)]
Fix links in toots opening the toot at first

9 years agoFix #204, fix #515 - URL truncating is now a style so copypasting is not
Eugen Rochko [Tue, 24 Jan 2017 16:05:44 +0000 (17:05 +0100)]
Fix #204, fix #515 - URL truncating is now a style so copypasting is not
affected, replaced onClick handler with onMouseUp/Down to detect text
selection not trigger onClick handler then

9 years agoMerge branch 'blackle-boostspin'
Eugen Rochko [Tue, 24 Jan 2017 13:28:54 +0000 (14:28 +0100)]
Merge branch 'blackle-boostspin'

9 years agoMerge branch 'master' into boostspin
Eugen [Tue, 24 Jan 2017 13:27:13 +0000 (14:27 +0100)]
Merge branch 'master' into boostspin

9 years agoMake boost animation an SVG that uses SCSS colours
blackle [Tue, 24 Jan 2017 02:02:13 +0000 (21:02 -0500)]
Make boost animation an SVG that uses SCSS colours

9 years agoSet isLoading false on timelines when request fails
Eugen Rochko [Tue, 24 Jan 2017 12:04:12 +0000 (13:04 +0100)]
Set isLoading false on timelines when request fails

9 years agoAPI now respects ?limit param as long as it's within 2x default limit
Eugen Rochko [Tue, 24 Jan 2017 03:22:10 +0000 (04:22 +0100)]
API now respects ?limit param as long as it's within 2x default limit

9 years agoSmarter infinite scroll
Eugen Rochko [Tue, 24 Jan 2017 03:12:10 +0000 (04:12 +0100)]
Smarter infinite scroll

9 years agoImplement a click-to-view spoiler system
blackle [Fri, 13 Jan 2017 04:54:26 +0000 (23:54 -0500)]
Implement a click-to-view spoiler system

9 years agoFix mistake
Eugen Rochko [Mon, 23 Jan 2017 21:18:08 +0000 (22:18 +0100)]
Fix mistake

9 years agoDomains with reject_media? set to true won't download avatars either
Eugen Rochko [Mon, 23 Jan 2017 20:55:29 +0000 (21:55 +0100)]
Domains with reject_media? set to true won't download avatars either

9 years agoLess re-rendering
Eugen Rochko [Mon, 23 Jan 2017 20:40:48 +0000 (21:40 +0100)]
Less re-rendering

9 years agoOptional domain block attribute that prevents media attachments from being downloaded
Eugen Rochko [Mon, 23 Jan 2017 20:36:08 +0000 (21:36 +0100)]
Optional domain block attribute that prevents media attachments from being downloaded

9 years agoMove merging/unmerging of timelines into background. Move blocking into
Eugen Rochko [Mon, 23 Jan 2017 20:29:34 +0000 (21:29 +0100)]
Move merging/unmerging of timelines into background. Move blocking into
background as well since it's a computationally expensive

9 years agoAdd /api/v1/notifications/clear, non-existing link cards for statuses will
Eugen Rochko [Mon, 23 Jan 2017 20:09:27 +0000 (21:09 +0100)]
Add /api/v1/notifications/clear, non-existing link cards for statuses will
now return empty hash instead of throwing a 404 error. When following,
merge into timeline will filter statuses

9 years agoRemove unneeded block check
Eugen Rochko [Mon, 23 Jan 2017 16:40:23 +0000 (17:40 +0100)]
Remove unneeded block check

9 years agoDomain blocks now have varying severity - auto-suspend vs auto-silence
Eugen Rochko [Mon, 23 Jan 2017 16:38:38 +0000 (17:38 +0100)]
Domain blocks now have varying severity - auto-suspend vs auto-silence

9 years agoForgot to commit
Eugen Rochko [Mon, 23 Jan 2017 16:18:41 +0000 (17:18 +0100)]
Forgot to commit

9 years agoMove all hex colors in SASS to variables and all variations to darken/lighten
Eugen Rochko [Mon, 23 Jan 2017 15:01:46 +0000 (16:01 +0100)]
Move all hex colors in SASS to variables and all variations to darken/lighten

9 years agoFix #365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags...
Eugen Rochko [Mon, 23 Jan 2017 13:45:09 +0000 (14:45 +0100)]
Fix #365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format

9 years agoFix a couple unhandled exceptions
Eugen Rochko [Mon, 23 Jan 2017 12:56:57 +0000 (13:56 +0100)]
Fix a couple unhandled exceptions

9 years agoPotentially fix notifications issue
Eugen Rochko [Mon, 23 Jan 2017 12:43:14 +0000 (13:43 +0100)]
Potentially fix notifications issue

9 years agoFix oembed controller test
Eugen Rochko [Mon, 23 Jan 2017 12:36:17 +0000 (13:36 +0100)]
Fix oembed controller test

9 years agoMerge pull request #513 from mistydemeo/fix_textarea_selection_clicking
Eugen [Mon, 23 Jan 2017 10:34:36 +0000 (11:34 +0100)]
Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking

Textarea: fix clicking on name suggestions

9 years agoTextarea: fix clicking on name suggestions
Misty De Meo [Mon, 23 Jan 2017 06:57:58 +0000 (22:57 -0800)]
Textarea: fix clicking on name suggestions

This was broken in c3e9ba6a, which added an onBlur to hide the
suggestions when the textarea loses focus. Unfortunately, this fired
even when the textarea lost focus to its own suggestions box, and that
meant that onSuggestionClick is never called.

Setting a short window in which onSuggestionClick can still happen
before hiding the suggestion area ensures that clicking still works,
while still hiding the suggestions if the user clicks on something else.

9 years agoFix inflection
Eugen [Sun, 22 Jan 2017 22:08:51 +0000 (23:08 +0100)]
Fix inflection

9 years agoFix error
Eugen [Sun, 22 Jan 2017 22:07:31 +0000 (23:07 +0100)]
Fix error

9 years agoMitigate inconsistent notifications
Eugen [Sun, 22 Jan 2017 20:50:17 +0000 (21:50 +0100)]
Mitigate inconsistent notifications

9 years agoOverride Rack::Request to use the same trusted proxy settings as Rails
Eugen Rochko [Sun, 22 Jan 2017 20:01:28 +0000 (21:01 +0100)]
Override Rack::Request to use the same trusted proxy settings as Rails

9 years agoAllow to specify trusted proxies through env
Eugen Rochko [Sun, 22 Jan 2017 19:35:49 +0000 (20:35 +0100)]
Allow to specify trusted proxies through env

9 years agoMerge pull request #509 from ineffyble/docs/developer-docs-additions
Eugen [Sun, 22 Jan 2017 16:07:39 +0000 (17:07 +0100)]
Merge pull request #509 from ineffyble/docs/developer-docs-additions

Update README.md to match new documentation (missed from previous commit)

9 years agoUpdate README.md to match new documentation (missed from previous commit)
Effy Elden [Sun, 22 Jan 2017 13:11:09 +0000 (00:11 +1100)]
Update README.md to match new documentation (missed from previous commit)

9 years agoMerge pull request #508 from ineffyble/docs/developer-docs-additions
Eugen [Sun, 22 Jan 2017 10:43:07 +0000 (11:43 +0100)]
Merge pull request #508 from ineffyble/docs/developer-docs-additions

Documentation tweaks

9 years agoAdd separate sections for Heroku and Vagrant deployments. Add guide for instance...
Effy Elden [Sun, 22 Jan 2017 08:50:40 +0000 (19:50 +1100)]
Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'.

9 years agoRename main docs page so it renders in github
Eugen Rochko [Sat, 21 Jan 2017 21:54:49 +0000 (22:54 +0100)]
Rename main docs page so it renders in github

9 years agoImprove API docs formatting
Eugen Rochko [Sat, 21 Jan 2017 21:53:02 +0000 (22:53 +0100)]
Improve API docs formatting

9 years agoAdd wiki contents to docs/ instead
Eugen Rochko [Sat, 21 Jan 2017 21:49:08 +0000 (22:49 +0100)]
Add wiki contents to docs/ instead

9 years agoMerge branch 'ineffyble-fix/error-pages'
Eugen Rochko [Sat, 21 Jan 2017 21:31:19 +0000 (22:31 +0100)]
Merge branch 'ineffyble-fix/error-pages'