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

9 years agoMerge pull request #464 from blackle/backflip
Eugen [Sun, 15 Jan 2017 12:19:15 +0000 (13:19 +0100)]
Merge pull request #464 from blackle/backflip

Make boost button spin around

9 years agoChange default S3 ACL string used by Paperclip from 'public' (which is invalid) to...
Effy Elden [Sun, 15 Jan 2017 09:58:46 +0000 (20:58 +1100)]
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'

9 years agoMerge pull request #474 from ineffyble/add-back-link-to-settings
Eugen [Sun, 15 Jan 2017 01:15:37 +0000 (02:15 +0100)]
Merge pull request #474 from ineffyble/add-back-link-to-settings

Add a 'Back to Mastodon' link to footer of settings pages

9 years agoAdd a textual 'Back to Mastodon' link in footer of settings pages
Effy Elden [Sun, 15 Jan 2017 00:03:35 +0000 (11:03 +1100)]
Add a textual 'Back to Mastodon' link in footer of settings pages

9 years agoMake boost button arrows spin around
blackle [Sat, 14 Jan 2017 04:32:27 +0000 (23:32 -0500)]
Make boost button arrows spin around

9 years agoMerge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature...
Effy Elden [Sat, 14 Jan 2017 22:12:11 +0000 (09:12 +1100)]
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source

9 years agoTest for presence of Application in haml before trying to render details, to fix...
Effy Elden [Sat, 14 Jan 2017 22:10:44 +0000 (09:10 +1100)]
Test for presence of Application in haml before trying to render details, to fix errors identified by CI

9 years agoFix typo in rel
Effy Elden [Sat, 14 Jan 2017 22:04:14 +0000 (09:04 +1100)]
Fix typo in rel

9 years agoAdd tracking of OAuth app that posted a status, extend OAuth apps to have optional...
Effy Elden [Sat, 14 Jan 2017 21:58:50 +0000 (08:58 +1100)]
Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11

9 years agoMerge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
Eugen [Sat, 14 Jan 2017 19:33:10 +0000 (20:33 +0100)]
Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies

Hide 'Do not display on public timeline' for reply toots

9 years agoHide 'Do not display on public timeline' for reply toots. Fixes #412.
Effy Elden [Sat, 14 Jan 2017 19:10:23 +0000 (06:10 +1100)]
Hide 'Do not display on public timeline' for reply toots. Fixes #412.

9 years agoFix too late return
Eugen [Sat, 14 Jan 2017 01:22:16 +0000 (02:22 +0100)]
Fix too late return

9 years agoImprove extended about page layout
Eugen Rochko [Fri, 13 Jan 2017 19:27:02 +0000 (20:27 +0100)]
Improve extended about page layout

9 years agoAdding about/more page with extended information that can be set up by an admin
Eugen Rochko [Fri, 13 Jan 2017 19:14:21 +0000 (20:14 +0100)]
Adding about/more page with extended information that can be set up by an admin

9 years agoAdd extended about page stub
Eugen Rochko [Fri, 13 Jan 2017 02:24:41 +0000 (03:24 +0100)]
Add extended about page stub

9 years agoExtend rails-settings-cached to merge db-saved hash values with defaults
Eugen Rochko [Fri, 13 Jan 2017 01:42:22 +0000 (02:42 +0100)]
Extend rails-settings-cached to merge db-saved hash values with defaults

9 years agoAdd settings for contact information
Eugen Rochko [Thu, 12 Jan 2017 19:54:14 +0000 (20:54 +0100)]
Add settings for contact information

9 years agoMigrate from ledermann/rails-settings to rails-settings-cached which allows global...
Eugen Rochko [Thu, 12 Jan 2017 19:46:24 +0000 (20:46 +0100)]
Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage

9 years agoMerge pull request #461 from vjackson725/master
Eugen [Thu, 12 Jan 2017 12:50:17 +0000 (13:50 +0100)]
Merge pull request #461 from vjackson725/master

fix Vagrantfile so that the correct ruby is installed

9 years agofix Vagrantfile so that the correct ruby is installed
vjackson725 [Thu, 12 Jan 2017 12:20:55 +0000 (23:20 +1100)]
fix Vagrantfile so that the correct ruby is installed

Prior to this commit, the vagrantfile installs ruby 2.3.3. Due to commit mastodon@7951e7f, this no longer works.

Change the provision scrip so that 2.3.1 is installed via rbenv. Note this drastically increases provision time.

9 years agoAdd rake task for clearing out media from silenced accounts
Eugen Rochko [Thu, 12 Jan 2017 03:19:04 +0000 (04:19 +0100)]
Add rake task for clearing out media from silenced accounts

9 years agoFix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss...
Eugen Rochko [Thu, 12 Jan 2017 02:54:50 +0000 (03:54 +0100)]
Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)

9 years agoAdd ruby version to Gemfile, move devDependencies in package.json to dependencies,
Eugen Rochko [Wed, 11 Jan 2017 14:39:31 +0000 (15:39 +0100)]
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
fix bug in process feed service

9 years agoMerge pull request #456 from ineffyble/fix-repo-url
Eugen [Wed, 11 Jan 2017 13:19:19 +0000 (14:19 +0100)]
Merge pull request #456 from ineffyble/fix-repo-url

Fix repo URL

9 years agoBetter animations
Eugen Rochko [Wed, 11 Jan 2017 03:21:49 +0000 (04:21 +0100)]
Better animations

9 years agoUpdate the Mastodon repository URL from Gargron/ to tootsuite/ in various places
Effy Elden [Wed, 11 Jan 2017 02:24:14 +0000 (13:24 +1100)]
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places

9 years agoFix env variable name
Eugen [Tue, 10 Jan 2017 21:01:13 +0000 (22:01 +0100)]
Fix env variable name

9 years agoFix issue when settings are not defined for column type
Eugen Rochko [Tue, 10 Jan 2017 16:33:32 +0000 (17:33 +0100)]
Fix issue when settings are not defined for column type

9 years agoHome column filters
Eugen Rochko [Tue, 10 Jan 2017 16:25:10 +0000 (17:25 +0100)]
Home column filters

9 years agoAdd "not found" component to UI
Eugen Rochko [Tue, 10 Jan 2017 12:50:40 +0000 (13:50 +0100)]
Add "not found" component to UI

9 years agoAdd link to list of apps
Eugen [Tue, 10 Jan 2017 11:23:30 +0000 (12:23 +0100)]
Add link to list of apps

9 years agoMerge pull request #450 from blackle/master
Eugen [Tue, 10 Jan 2017 11:21:06 +0000 (12:21 +0100)]
Merge pull request #450 from blackle/master

simplify emojification on public pages with .emojify class

9 years agosimplify emojification on public pages with .emojify class
blackle [Tue, 10 Jan 2017 03:40:45 +0000 (22:40 -0500)]
simplify emojification on public pages with .emojify class

9 years agoFix sandboxed iOS login again
Eugen Rochko [Mon, 9 Jan 2017 18:43:53 +0000 (19:43 +0100)]
Fix sandboxed iOS login again

9 years agoMerge branch 'blackle-master'
Eugen Rochko [Mon, 9 Jan 2017 13:13:46 +0000 (14:13 +0100)]
Merge branch 'blackle-master'

9 years agoMerge branch 'master' of https://github.com/blackle/mastodon into blackle-master
Eugen Rochko [Mon, 9 Jan 2017 13:12:40 +0000 (14:12 +0100)]
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

9 years agoMerge branch 'blackle-dropdown'
Eugen Rochko [Mon, 9 Jan 2017 13:12:00 +0000 (14:12 +0100)]
Merge branch 'blackle-dropdown'

9 years agoMerge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
Eugen Rochko [Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)]
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown

9 years agoPersist UI settings, add missing localizations for German
Eugen Rochko [Mon, 9 Jan 2017 13:00:55 +0000 (14:00 +0100)]
Persist UI settings, add missing localizations for German

9 years agoImprove initialState loading
Eugen Rochko [Mon, 9 Jan 2017 11:37:15 +0000 (12:37 +0100)]
Improve initialState loading

9 years agoGenerate key for each input so we can upload the same file even after deleting
blackle [Mon, 9 Jan 2017 02:00:13 +0000 (21:00 -0500)]
Generate key for each input so we can upload the same file even after deleting

9 years agoSwitch to compose view when tapping 'mention' in dropdown on mobile
blackle [Sun, 8 Jan 2017 10:04:01 +0000 (05:04 -0500)]
Switch to compose view when tapping 'mention' in dropdown on mobile

9 years agoFix Paperclip timeout setting. Fix bug introduced in #437
Eugen Rochko [Sun, 8 Jan 2017 18:12:54 +0000 (19:12 +0100)]
Fix Paperclip timeout setting. Fix bug introduced in #437

9 years agoMerge pull request #443 from blackle/master
Eugen [Sun, 8 Jan 2017 12:36:02 +0000 (13:36 +0100)]
Merge pull request #443 from blackle/master

Add call-to developers on getting started page

9 years agoMerge pull request #446 from blackle/dropdown2
Eugen [Sun, 8 Jan 2017 12:34:27 +0000 (13:34 +0100)]
Merge pull request #446 from blackle/dropdown2

Expand dropdown leftways on status view

9 years agoExpand dropdown leftways on status view
blackle [Sun, 8 Jan 2017 11:32:37 +0000 (06:32 -0500)]
Expand dropdown leftways on status view

9 years agoAdd call-to developers on getting started page
blackle [Sun, 8 Jan 2017 05:23:22 +0000 (00:23 -0500)]
Add call-to developers on getting started page

9 years agoMerge pull request #437 from krainboltgreene/patch-1
Eugen [Sun, 8 Jan 2017 03:14:54 +0000 (04:14 +0100)]
Merge pull request #437 from krainboltgreene/patch-1

Simplifying followers mappings

9 years agoMerge pull request #436 from krainboltgreene/patch-2
Eugen [Sun, 8 Jan 2017 03:00:22 +0000 (04:00 +0100)]
Merge pull request #436 from krainboltgreene/patch-2

Less complicated determination of subscription

9 years agoUpdate badges
Eugen [Sun, 8 Jan 2017 02:47:33 +0000 (03:47 +0100)]
Update badges

9 years agoSimplifying followers mappings
Kurtis Rainbolt-Greene [Sun, 8 Jan 2017 02:09:00 +0000 (18:09 -0800)]
Simplifying followers mappings

Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.

9 years agoLess complicated determination
Kurtis Rainbolt-Greene [Sun, 8 Jan 2017 01:59:51 +0000 (17:59 -0800)]
Less complicated determination

9 years agoMerge pull request #434 from vjackson725/fix_vagrantfile
Eugen [Sun, 8 Jan 2017 01:58:43 +0000 (02:58 +0100)]
Merge pull request #434 from vjackson725/fix_vagrantfile

Fix Vagrantfile to include yarn

9 years agoMerge pull request #435 from krainboltgreene/patch-1
Eugen [Sun, 8 Jan 2017 01:58:19 +0000 (02:58 +0100)]
Merge pull request #435 from krainboltgreene/patch-1

Using "rails style" order arguments

9 years agoUsing "rails style" order arguments
Kurtis Rainbolt-Greene [Sun, 8 Jan 2017 01:55:40 +0000 (17:55 -0800)]
Using "rails style" order arguments