12292 Commits (6ca08a018f20f234e9ad6759b355f0026e351ec0)
 

Author SHA1 Message Date
Eugen Rochko 0022b0cb2e Fix forgotten change of settings
8 years ago
Eugen Rochko 40a5094434 Fix boops?
8 years ago
Eugen Rochko a6bf7b4777 Fix #487
8 years ago
Eugen Rochko 7865ce28e5 Add sounds for notifications. Boop by @jk@mastodon.social
8 years ago
Eugen 7970f1dd38 Merge pull request #489 from ineffyble/master
8 years ago
Effy Elden a898072d76 Add Heroku deployment support
8 years ago
Eugen Rochko 3f30e91462 Improve how the list entry Account component looks when target is blocked/follow is requested
8 years ago
Eugen 0e71cb2916 Merge pull request #486 from blackle/replytimeline
8 years ago
blackle 94cedabbe3 Show 'do not display in public timeline' when replying to self
8 years ago
Eugen Rochko 89740d69ec Fix upload file input being re-rendered needlessly
8 years ago
Eugen Rochko f4d7f4c687 Fix #238 - Add "favourites" column
8 years ago
Eugen Rochko 81db795253 Fix #414 - Improve lightbox, add loading indicator
8 years ago
Eugen Rochko 1ed33af06c Merge branch 'blackle-sensitive'
8 years ago
Eugen Rochko 780df33037 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive
8 years ago
Eugen Rochko 972fb80de6 Move follow requests link above logout link in getting started column
8 years ago
blackle 9ac182d831 Show visibility toggle on media gallery for sensitive images
8 years ago
Eugen b1075ccb86 Merge pull request #478 from blackle/backflip
8 years ago
blackle 5c3c7c545c Change boost sprite to look like fa-retweet
8 years ago
Eugen Rochko 7e46083338 Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse
8 years ago
Eugen Rochko 73e217d9d7 Fix #427 - don't suggest hashtag if the search value contains a space
8 years ago
Eugen Rochko 58b0fe2f28 Fix #449 - don't do relationships fetch for empty array of IDs
8 years ago
Eugen Rochko 11117f5aec Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
8 years ago
Eugen 3471b9acb1 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
8 years ago
Eugen Rochko cd8e2f8ac8 Merge branch 'ineffyble-feature/toot-app-source'
8 years ago
Eugen Rochko 5d88ef90c9 Fix tests, add applications to eager loading/cache for statuses, fix
8 years ago
Eugen Rochko 3a957e127a Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
8 years ago
Eugen 91edf829ec Merge pull request #464 from blackle/backflip
8 years ago
Effy Elden db40fd4641 Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
8 years ago
Eugen 195d976d1a Merge pull request #474 from ineffyble/add-back-link-to-settings
8 years ago
Effy Elden 21c888fefd Add a textual 'Back to Mastodon' link in footer of settings pages
8 years ago
Effy Elden 80f186cdf0 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
8 years ago
Effy Elden c10a41e89e Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
8 years ago
blackle 77e78ed6aa Make boost button arrows spin around
8 years ago
Effy Elden 6d333d9fc6 Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
8 years ago
Effy Elden 2c042fe57f Test for presence of Application in haml before trying to render details, to fix errors identified by CI
8 years ago
Effy Elden e751dd669a Fix typo in rel
8 years ago
Effy Elden 8e0c1914fb 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
8 years ago
Eugen cbcd9b3503 Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
8 years ago
Effy Elden 49ff508743 Hide 'Do not display on public timeline' for reply toots. Fixes #412.
8 years ago
Eugen 4b384d6914 Fix too late return
8 years ago
Eugen Rochko 8442a176c5 Improve extended about page layout
8 years ago
Eugen Rochko f2667139ad Adding about/more page with extended information that can be set up by an admin
8 years ago
Eugen Rochko 533448be42 Add extended about page stub
8 years ago
Eugen Rochko 6d98465db2 Extend rails-settings-cached to merge db-saved hash values with defaults
8 years ago
Eugen Rochko 1a30737ff5 Add settings for contact information
8 years ago
Eugen Rochko 7e7c2bbb0f Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
8 years ago
Eugen f622f4e137 Merge pull request #461 from vjackson725/master
8 years ago
vjackson725 1403f5b31b fix Vagrantfile so that the correct ruby is installed
8 years ago
Eugen Rochko ac95c2dbfe Add rake task for clearing out media from silenced accounts
8 years ago
Eugen Rochko 1a77ccb668 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
8 years ago