about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-01-16Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-...Eugen Rochko
2017-01-16Move follow requests link above logout link in getting started columnEugen Rochko
2017-01-15Show visibility toggle on media gallery for sensitive imagesblackle
2017-01-15Merge pull request #478 from blackle/backflipEugen
2017-01-15Change boost sprite to look like fa-retweetblackle
2017-01-15Fix typo introduced in #470 which made unlisted toggle only fade in/out and n...Eugen Rochko
2017-01-15Fix #427 - don't suggest hashtag if the search value contains a spaceEugen Rochko
2017-01-15Fix #449 - don't do relationships fetch for empty array of IDsEugen Rochko
2017-01-15Fix #466 - when logged in, make "get started" link to the frontpage instead o...Eugen Rochko
2017-01-15Merge pull request #476 from ineffyble/fix-paperclip-s3-aclEugen
2017-01-15Merge branch 'ineffyble-feature/toot-app-source'Eugen Rochko
2017-01-15Fix tests, add applications to eager loading/cache for statuses, fixEugen Rochko
2017-01-15Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastod...Eugen Rochko
2017-01-15Merge pull request #464 from blackle/backflipEugen
2017-01-15Change default S3 ACL string used by Paperclip from 'public' (which is invali...Effy Elden
2017-01-15Merge pull request #474 from ineffyble/add-back-link-to-settingsEugen
2017-01-15Add a textual 'Back to Mastodon' link in footer of settings pagesEffy Elden
2017-01-15Add nice error page for CSRF errors/cookie issue, and fix error page handling...Effy Elden
2017-01-15Add nice error page for CSRF errors/cookie issue, and fix error page handling...Effy Elden
2017-01-14Make boost button arrows spin aroundblackle
2017-01-15Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into ...Effy Elden
2017-01-15Test for presence of Application in haml before trying to render details, to ...Effy Elden
2017-01-15Fix typo in relEffy Elden
2017-01-15Add tracking of OAuth app that posted a status, extend OAuth apps to have opt...Effy Elden
2017-01-14Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-fo...Eugen
2017-01-15Hide 'Do not display on public timeline' for reply toots. Fixes #412.Effy Elden
2017-01-14Fix too late returnEugen
2017-01-13Improve extended about page layoutEugen Rochko
2017-01-13Adding about/more page with extended information that can be set up by an adminEugen Rochko
2017-01-13Add extended about page stubEugen Rochko
2017-01-13Extend rails-settings-cached to merge db-saved hash values with defaultsEugen Rochko
2017-01-12Add settings for contact informationEugen Rochko
2017-01-12Migrate from ledermann/rails-settings to rails-settings-cached which allows g...Eugen Rochko
2017-01-12Merge pull request #461 from vjackson725/masterEugen
2017-01-12fix Vagrantfile so that the correct ruby is installedvjackson725
2017-01-12Add rake task for clearing out media from silenced accountsEugen Rochko
2017-01-12Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to...Eugen Rochko
2017-01-11Add ruby version to Gemfile, move devDependencies in package.json to dependen...Eugen Rochko
2017-01-11Merge pull request #456 from ineffyble/fix-repo-urlEugen
2017-01-11Better animationsEugen Rochko
2017-01-11Update the Mastodon repository URL from Gargron/ to tootsuite/ in various placesEffy Elden
2017-01-10Fix env variable nameEugen
2017-01-10Fix issue when settings are not defined for column typeEugen Rochko
2017-01-10Home column filtersEugen Rochko
2017-01-10Add "not found" component to UIEugen Rochko
2017-01-10Add link to list of appsEugen
2017-01-10Merge pull request #450 from blackle/masterEugen
2017-01-09simplify emojification on public pages with .emojify classblackle
2017-01-09Fix sandboxed iOS login againEugen Rochko
2017-01-09Merge branch 'blackle-master'Eugen Rochko