about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-01-16Merge pull request #486 from blackle/replytimelineEugen
Show 'do not display in public timeline' when replying to self
2017-01-16Show 'do not display in public timeline' when replying to selfblackle
2017-01-16Fix upload file input being re-rendered needlesslyEugen Rochko
2017-01-16Fix #238 - Add "favourites" columnEugen Rochko
2017-01-16Fix #414 - Improve lightbox, add loading indicatorEugen Rochko
2017-01-16Merge branch 'blackle-sensitive'Eugen Rochko
2017-01-16Merge branch 'sensitive' of https://github.com/blackle/mastodon into ↵Eugen Rochko
blackle-sensitive
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
Change boost sprite to look like fa-retweet
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 ↵Eugen Rochko
not also collapse
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 ↵Eugen Rochko
of sign up
2017-01-15Merge pull request #476 from ineffyble/fix-paperclip-s3-aclEugen
Fix S3 default settings
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
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
2017-01-15Merge branch 'feature/toot-app-source' of ↵Eugen Rochko
https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
2017-01-15Merge pull request #464 from blackle/backflipEugen
Make boost button spin around
2017-01-15Change default S3 ACL string used by Paperclip from 'public' (which is ↵Effy Elden
invalid) to 'public-read'
2017-01-15Merge pull request #474 from ineffyble/add-back-link-to-settingsEugen
Add a 'Back to Mastodon' link to footer of settings pages
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 ↵Effy Elden
handling altogether
2017-01-15Add nice error page for CSRF errors/cookie issue, and fix error page ↵Effy Elden
handling altogether
2017-01-14Make boost button arrows spin aroundblackle
2017-01-15Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into ↵Effy Elden
feature/toot-app-source
2017-01-15Test for presence of Application in haml before trying to render details, to ↵Effy Elden
fix errors identified by CI
2017-01-15Fix typo in relEffy Elden
2017-01-15Add tracking of OAuth app that posted a status, extend OAuth apps to have ↵Effy Elden
optional website field, add application details to API, show application name and website on detailed status views. Resolves #11
2017-01-14Merge pull request #470 from ↵Eugen
ineffyble/fix/412-hide-public-timeline-option-for-replies Hide 'Do not display on public timeline' for reply toots
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 ↵Eugen Rochko
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
2017-01-12Merge pull request #461 from vjackson725/masterEugen
fix Vagrantfile so that the correct ruby is installed
2017-01-12fix Vagrantfile so that the correct ruby is installedvjackson725
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.
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 ↵Eugen Rochko
to xss themselves rather than anyone else)
2017-01-11Add ruby version to Gemfile, move devDependencies in package.json to ↵Eugen Rochko
dependencies, fix bug in process feed service
2017-01-11Merge pull request #456 from ineffyble/fix-repo-urlEugen
Fix repo URL
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
generated by cgit-pink (git 2.37.1) at 2024-11-30 04:15:36 +0000