1122 Commits (30106ce53d6d7ec3c3bdcb3b176a814d0876720f)
 

Author SHA1 Message Date
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
Eugen Rochko 992c8d2c41 Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
8 years ago
Eugen 9eb3f68499 Merge pull request #456 from ineffyble/fix-repo-url
8 years ago
Eugen Rochko efd8ce920f Better animations
8 years ago
Effy Elden ad61a21752 Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
8 years ago
Eugen 001a73c6fc Fix env variable name
8 years ago
Eugen Rochko bc17613e70 Fix issue when settings are not defined for column type
8 years ago
Eugen Rochko c8bcd413e2 Home column filters
8 years ago
Eugen Rochko 15b183117c Add "not found" component to UI
8 years ago
Eugen 14a0bec2d8 Add link to list of apps
8 years ago
Eugen efd4565389 Merge pull request #450 from blackle/master
8 years ago
blackle 57e496e1bc simplify emojification on public pages with .emojify class
8 years ago
Eugen Rochko 0c0d4b7c92 Fix sandboxed iOS login again
8 years ago
Eugen Rochko ee6b885468 Merge branch 'blackle-master'
8 years ago
Eugen Rochko 394f185e91 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
Eugen Rochko 609748016f Merge branch 'blackle-dropdown'
8 years ago
Eugen Rochko a1783b80b2 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
8 years ago
Eugen Rochko 4293e132d1 Persist UI settings, add missing localizations for German
8 years ago
Eugen Rochko c1c814e6a1 Improve initialState loading
8 years ago
blackle 62167338b8 Generate key for each input so we can upload the same file even after deleting
8 years ago
blackle a697b5473a Switch to compose view when tapping 'mention' in dropdown on mobile
8 years ago