1006 Commits (c10a41e89eaae06577247ac4cb7f069cc09b8cf0)
 

Author SHA1 Message Date
Effy Elden c10a41e89e Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
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
Eugen Rochko f29df16eea Fix Paperclip timeout setting. Fix bug introduced in #437
8 years ago
Eugen 9f3e2737e9 Merge pull request #443 from blackle/master
8 years ago
Eugen 2ee3e2f4a4 Merge pull request #446 from blackle/dropdown2
8 years ago
blackle 9d66dfecf6 Expand dropdown leftways on status view
8 years ago
blackle 1adfe59c14 Add call-to developers on getting started page
8 years ago
Eugen 72843ea705 Merge pull request #437 from krainboltgreene/patch-1
8 years ago
Eugen c65508da26 Merge pull request #436 from krainboltgreene/patch-2
8 years ago
Eugen 5bbd50e180 Update badges
8 years ago
Kurtis Rainbolt-Greene 5cecff7f2a Simplifying followers mappings
8 years ago
Kurtis Rainbolt-Greene ff835f3377 Less complicated determination
8 years ago
Eugen e715e3e009 Merge pull request #434 from vjackson725/fix_vagrantfile
8 years ago
Eugen e7132be958 Merge pull request #435 from krainboltgreene/patch-1
8 years ago
Kurtis Rainbolt-Greene 82b0eb2ae4 Using "rails style" order arguments
8 years ago
vjackson725 4f9cc841b2 Fix Vagrantfile to include yarn
8 years ago
Eugen 3f639be601 Merge pull request #432 from blackle/volume-icon
8 years ago
blackle 85cc2dd826 Show correct volume icons on video player
8 years ago