about summary refs log tree commit diff
AgeCommit message (Expand)Author
2017-01-25Merge pull request #524 from blackle/masterEugen
2017-01-24fix up spoilersblackle
2017-01-25Fix #522 - prevent blocked users from rebloggingEugen Rochko
2017-01-25Merge branch 'blackle-master'Eugen Rochko
2017-01-25Instead of using spoiler boolean and spoiler_text, simply check for non-blank...Eugen Rochko
2017-01-24Merge branch 'master' into masterEugen
2017-01-24Make blocks create entries and unfollows instantly, but do the clean upEugen Rochko
2017-01-24Merge pull request #521 from mistydemeo/fix_invisible_cssEugen
2017-01-24Fix `invisible` CSS classMisty De Meo
2017-01-24Fix links in toots opening the toot at firstEugen Rochko
2017-01-24Fix #204, fix #515 - URL truncating is now a style so copypasting is notEugen Rochko
2017-01-24Merge branch 'blackle-boostspin'Eugen Rochko
2017-01-24Merge branch 'master' into boostspinEugen
2017-01-24Make boost animation an SVG that uses SCSS coloursblackle
2017-01-24Set isLoading false on timelines when request failsEugen Rochko
2017-01-24API now respects ?limit param as long as it's within 2x default limitEugen Rochko
2017-01-24Smarter infinite scrollEugen Rochko
2017-01-23Implement a click-to-view spoiler systemblackle
2017-01-23Fix mistakeEugen Rochko
2017-01-23Domains with reject_media? set to true won't download avatars eitherEugen Rochko
2017-01-23Less re-renderingEugen Rochko
2017-01-23Optional domain block attribute that prevents media attachments from being do...Eugen Rochko
2017-01-23Move merging/unmerging of timelines into background. Move blocking intoEugen Rochko
2017-01-23Add /api/v1/notifications/clear, non-existing link cards for statuses willEugen Rochko
2017-01-23Remove unneeded block checkEugen Rochko
2017-01-23Domain blocks now have varying severity - auto-suspend vs auto-silenceEugen Rochko
2017-01-23Forgot to commitEugen Rochko
2017-01-23Move all hex colors in SASS to variables and all variations to darken/lightenEugen Rochko
2017-01-23Fix #365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hash...Eugen Rochko
2017-01-23Fix a couple unhandled exceptionsEugen Rochko
2017-01-23Potentially fix notifications issueEugen Rochko
2017-01-23Fix oembed controller testEugen Rochko
2017-01-23Merge pull request #513 from mistydemeo/fix_textarea_selection_clickingEugen
2017-01-22Textarea: fix clicking on name suggestionsMisty De Meo
2017-01-22Fix inflectionEugen
2017-01-22Fix errorEugen
2017-01-22Mitigate inconsistent notificationsEugen
2017-01-22Override Rack::Request to use the same trusted proxy settings as RailsEugen Rochko
2017-01-22Allow to specify trusted proxies through envEugen Rochko
2017-01-22Merge pull request #509 from ineffyble/docs/developer-docs-additionsEugen
2017-01-23Update README.md to match new documentation (missed from previous commit)Effy Elden
2017-01-22Merge pull request #508 from ineffyble/docs/developer-docs-additionsEugen
2017-01-22Add separate sections for Heroku and Vagrant deployments. Add guide for insta...Effy Elden
2017-01-21Rename main docs page so it renders in githubEugen Rochko
2017-01-21Improve API docs formattingEugen Rochko
2017-01-21Add wiki contents to docs/ insteadEugen Rochko
2017-01-21Merge branch 'ineffyble-fix/error-pages'Eugen Rochko
2017-01-21Improve error page layouting. 500 page has to stay static because it'sEugen Rochko
2017-01-21Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ...Eugen Rochko
2017-01-21Merge branch 'ineffyble-master'Eugen Rochko