]> cat aescling's git repositories - mastodon.git/log
mastodon.git
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'

9 years agoImprove error page layouting. 500 page has to stay static because it's
Eugen Rochko [Sat, 21 Jan 2017 21:30:47 +0000 (22:30 +0100)]
Improve error page layouting. 500 page has to stay static because it's
used from nginx when Rails fails.

9 years agoMerge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffybl...
Eugen Rochko [Sat, 21 Jan 2017 21:20:01 +0000 (22:20 +0100)]
Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages

9 years agoMerge branch 'ineffyble-master'
Eugen Rochko [Sat, 21 Jan 2017 21:19:27 +0000 (22:19 +0100)]
Merge branch 'ineffyble-master'

9 years agoFix code style
Eugen Rochko [Sat, 21 Jan 2017 21:19:13 +0000 (22:19 +0100)]
Fix code style

9 years agoMerge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
Eugen Rochko [Sat, 21 Jan 2017 21:15:22 +0000 (22:15 +0100)]
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master

9 years agoMethod to fetch a single notification
Eugen Rochko [Sat, 21 Jan 2017 21:14:13 +0000 (22:14 +0100)]
Method to fetch a single notification

9 years agoMerge pull request #506 from ineffyble/fix/issue-492-add-missing-header-image
Eugen [Sat, 21 Jan 2017 19:56:11 +0000 (20:56 +0100)]
Merge pull request #506 from ineffyble/fix/issue-492-add-missing-header-image

Add a default missing.png header image - fixes #492

9 years agoChange missing.png header to 1x1 transparent PNG
Effy Elden [Sat, 21 Jan 2017 19:42:42 +0000 (06:42 +1100)]
Change missing.png header to 1x1 transparent PNG

9 years agoAdd a default missing.png header image - fixes #492
Effy Elden [Sat, 21 Jan 2017 18:19:31 +0000 (05:19 +1100)]
Add a default missing.png header image - fixes #492

9 years agoMerge pull request #505 from ineffyble/fix/issue-503
Eugen [Sat, 21 Jan 2017 11:37:51 +0000 (12:37 +0100)]
Merge pull request #505 from ineffyble/fix/issue-503

Call uniq on the string version of mb_chars tags - fixes #503

9 years agoCall uniq on the string version of mb_chars tags
Effy Elden [Sat, 21 Jan 2017 10:02:42 +0000 (21:02 +1100)]
Call uniq on the string version of mb_chars tags

9 years agoSet remote dev environments to use letter_opener_web, add default .env.vagrant variables
Effy Elden [Sat, 21 Jan 2017 09:22:49 +0000 (20:22 +1100)]
Set remote dev environments to use letter_opener_web, add default .env.vagrant variables

9 years agoFix #475 - add space after autocomplete
Eugen Rochko [Fri, 20 Jan 2017 20:39:41 +0000 (21:39 +0100)]
Fix #475 - add space after autocomplete

9 years agoInstead of refusing to create accounts, domain blocks auto-suspend new accounts from...
Eugen Rochko [Fri, 20 Jan 2017 19:14:02 +0000 (20:14 +0100)]
Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain

9 years agoFix preview cards layout, do preview card crawling for remote statuses
Eugen Rochko [Fri, 20 Jan 2017 17:31:49 +0000 (18:31 +0100)]
Fix preview cards layout, do preview card crawling for remote statuses

9 years agoMerge pull request #502 from blackle/vistoggle
Eugen [Fri, 20 Jan 2017 12:27:20 +0000 (13:27 +0100)]
Merge pull request #502 from blackle/vistoggle

Show visibility toggle on videos, show regardless of sensitivity

9 years agoShow visibility toggle on videos, show regardless of sensitivity
blackle [Fri, 20 Jan 2017 02:24:30 +0000 (21:24 -0500)]
Show visibility toggle on videos, show regardless of sensitivity

9 years agoNo loading bars for cards, no failure if it 404s (that's expected)
Eugen Rochko [Fri, 20 Jan 2017 00:07:53 +0000 (01:07 +0100)]
No loading bars for cards, no failure if it 404s (that's expected)

9 years agoFix #463 - Fetch and display previews of URLs using OpenGraph tags
Eugen Rochko [Fri, 20 Jan 2017 00:00:14 +0000 (01:00 +0100)]
Fix #463 - Fetch and display previews of URLs using OpenGraph tags

9 years agoHide more non-essential loading bars
Eugen Rochko [Thu, 19 Jan 2017 10:23:24 +0000 (11:23 +0100)]
Hide more non-essential loading bars

9 years agoDon't show loading bar when re-loading already loaded status. Don't even try to fetch...
Eugen Rochko [Thu, 19 Jan 2017 10:06:06 +0000 (11:06 +0100)]
Don't show loading bar when re-loading already loaded status. Don't even try to fetch ancestors from DB when in_reply_to_id is nil

9 years agoDon't show loading bar when checking account timeline for newer stuff
Eugen Rochko [Thu, 19 Jan 2017 10:01:01 +0000 (11:01 +0100)]
Don't show loading bar when checking account timeline for newer stuff

9 years agoFix #222 - Update followers count when following/unfollowing
Eugen Rochko [Thu, 19 Jan 2017 09:54:18 +0000 (10:54 +0100)]
Fix #222 - Update followers count when following/unfollowing

Also, since the root component connects to the stream that updates home/notification columns,
there is pretty much no case for refreshing those columns beyond initial load. So, move the
loading of those columns into the root component, to prevent unneccessary reloads when switching tabs
on mobile or resizing desktop window between mobile/desktop layouts

9 years agoFix statsd null backend not being initialized properly
Eugen Rochko [Thu, 19 Jan 2017 08:37:07 +0000 (09:37 +0100)]
Fix statsd null backend not being initialized properly

9 years agoTry to avoid any potential loops
Eugen [Thu, 19 Jan 2017 01:14:57 +0000 (02:14 +0100)]
Try to avoid any potential loops

9 years agoAdd optional StatsD performance tracking
Eugen Rochko [Wed, 18 Jan 2017 22:44:29 +0000 (23:44 +0100)]
Add optional StatsD performance tracking

9 years agoFix forgotten change of settings
Eugen Rochko [Tue, 17 Jan 2017 19:37:54 +0000 (20:37 +0100)]
Fix forgotten change of settings

9 years agoFix boops?
Eugen Rochko [Tue, 17 Jan 2017 19:28:32 +0000 (20:28 +0100)]
Fix boops?

9 years agoFix #487
Eugen Rochko [Tue, 17 Jan 2017 19:11:16 +0000 (20:11 +0100)]
Fix #487

9 years agoAdd sounds for notifications. Boop by @jk@mastodon.social
Eugen Rochko [Tue, 17 Jan 2017 19:09:03 +0000 (20:09 +0100)]
Add sounds for notifications. Boop by @jk@mastodon.social

9 years agoMerge pull request #489 from ineffyble/master
Eugen [Tue, 17 Jan 2017 17:46:53 +0000 (18:46 +0100)]
Merge pull request #489 from ineffyble/master

Add Heroku deployment support

9 years agoAdd Heroku deployment support
Effy Elden [Tue, 17 Jan 2017 11:00:03 +0000 (22:00 +1100)]
Add Heroku deployment support

9 years agoImprove how the list entry Account component looks when target is blocked/follow...
Eugen Rochko [Mon, 16 Jan 2017 18:36:32 +0000 (19:36 +0100)]
Improve how the list entry Account component looks when target is blocked/follow is requested

9 years agoMerge pull request #486 from blackle/replytimeline
Eugen [Mon, 16 Jan 2017 15:38:08 +0000 (16:38 +0100)]
Merge pull request #486 from blackle/replytimeline

Show 'do not display in public timeline' when replying to self

9 years agoShow 'do not display in public timeline' when replying to self
blackle [Mon, 16 Jan 2017 15:23:45 +0000 (10:23 -0500)]
Show 'do not display in public timeline' when replying to self

9 years agoFix upload file input being re-rendered needlessly
Eugen Rochko [Mon, 16 Jan 2017 13:21:55 +0000 (14:21 +0100)]
Fix upload file input being re-rendered needlessly

9 years agoFix #238 - Add "favourites" column
Eugen Rochko [Mon, 16 Jan 2017 12:27:58 +0000 (13:27 +0100)]
Fix #238 - Add "favourites" column

9 years agoFix #414 - Improve lightbox, add loading indicator
Eugen Rochko [Mon, 16 Jan 2017 11:04:02 +0000 (12:04 +0100)]
Fix #414 - Improve lightbox, add loading indicator

9 years agoMerge branch 'blackle-sensitive'
Eugen Rochko [Mon, 16 Jan 2017 10:37:35 +0000 (11:37 +0100)]
Merge branch 'blackle-sensitive'

9 years agoMerge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive
Eugen Rochko [Mon, 16 Jan 2017 10:36:02 +0000 (11:36 +0100)]
Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive

9 years agoMove follow requests link above logout link in getting started column
Eugen Rochko [Mon, 16 Jan 2017 10:35:32 +0000 (11:35 +0100)]
Move follow requests link above logout link in getting started column

9 years agoShow visibility toggle on media gallery for sensitive images
blackle [Mon, 16 Jan 2017 01:26:03 +0000 (20:26 -0500)]
Show visibility toggle on media gallery for sensitive images

9 years agoMerge pull request #478 from blackle/backflip
Eugen [Sun, 15 Jan 2017 17:45:53 +0000 (18:45 +0100)]
Merge pull request #478 from blackle/backflip

Change boost sprite to look like fa-retweet

9 years agoChange boost sprite to look like fa-retweet
blackle [Sun, 15 Jan 2017 15:55:31 +0000 (10:55 -0500)]
Change boost sprite to look like fa-retweet

9 years agoFix typo introduced in #470 which made unlisted toggle only fade in/out and not also...
Eugen Rochko [Sun, 15 Jan 2017 13:59:25 +0000 (14:59 +0100)]
Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse

9 years agoFix #427 - don't suggest hashtag if the search value contains a space
Eugen Rochko [Sun, 15 Jan 2017 13:45:43 +0000 (14:45 +0100)]
Fix #427 - don't suggest hashtag if the search value contains a space

9 years agoFix #449 - don't do relationships fetch for empty array of IDs
Eugen Rochko [Sun, 15 Jan 2017 13:41:49 +0000 (14:41 +0100)]
Fix #449 - don't do relationships fetch for empty array of IDs

9 years agoFix #466 - when logged in, make "get started" link to the frontpage instead of sign up
Eugen Rochko [Sun, 15 Jan 2017 13:38:59 +0000 (14:38 +0100)]
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up

9 years agoMerge pull request #476 from ineffyble/fix-paperclip-s3-acl
Eugen [Sun, 15 Jan 2017 13:29:47 +0000 (14:29 +0100)]
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl

Fix S3 default settings

9 years agoMerge branch 'ineffyble-feature/toot-app-source'
Eugen Rochko [Sun, 15 Jan 2017 13:04:56 +0000 (14:04 +0100)]
Merge branch 'ineffyble-feature/toot-app-source'

9 years agoFix tests, add applications to eager loading/cache for statuses, fix
Eugen Rochko [Sun, 15 Jan 2017 13:01:33 +0000 (14:01 +0100)]
Fix tests, add applications to eager loading/cache for statuses, fix
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464 until it's consistent with non-animated version

9 years agoMerge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into...
Eugen Rochko [Sun, 15 Jan 2017 12:23:47 +0000 (13:23 +0100)]
Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source