a78148f763
Merge branch 'blackle-sensitive'
8 years ago
2ae0fb4419
Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive
8 years ago
0439c7d58b
Move follow requests link above logout link in getting started column
8 years ago
144402ec7e
Show visibility toggle on media gallery for sensitive images
8 years ago
3778355454
Merge pull request #478 from blackle/backflip
...
Change boost sprite to look like fa-retweet
8 years ago
383114add3
Change boost sprite to look like fa-retweet
8 years ago
926459fc0a
Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse
8 years ago
7d7a11250c
Fix #427 - don't suggest hashtag if the search value contains a space
8 years ago
1d5cbfa356
Fix #449 - don't do relationships fetch for empty array of IDs
8 years ago
cc1eccc8bc
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
8 years ago
16f9490d33
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
...
Fix S3 default settings
8 years ago
bfec9aaee0
Merge branch 'ineffyble-feature/toot-app-source'
8 years ago
e9737c2235
Fix tests, add applications to eager loading/cache for statuses, fix
...
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
8 years ago
ab165547fd
Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
8 years ago
1f7c0ad8d3
Merge pull request #464 from blackle/backflip
...
Make boost button spin around
8 years ago
a097dd489b
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
8 years ago
777f527d86
Merge pull request #474 from ineffyble/add-back-link-to-settings
...
Add a 'Back to Mastodon' link to footer of settings pages
8 years ago
e45fed58cb
Add a textual 'Back to Mastodon' link in footer of settings pages
8 years ago
a67ffcbf56
Make boost button arrows spin around
8 years ago
f81dc7a33a
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
8 years ago
6c002cf615
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
8 years ago
65122798b2
Fix typo in rel
8 years ago
d6bc0e8db4
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
88801f7554
Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
...
Hide 'Do not display on public timeline' for reply toots
8 years ago
32d756fb22
Hide 'Do not display on public timeline' for reply toots. Fixes #412 .
8 years ago
f63f0c4625
Fix too late return
8 years ago
7cde08e30b
Improve extended about page layout
8 years ago
c01dd089ff
Adding about/more page with extended information that can be set up by an admin
8 years ago
e25170f960
Add extended about page stub
8 years ago
2939e9898b
Extend rails-settings-cached to merge db-saved hash values with defaults
8 years ago
ca50ceeaf0
Add settings for contact information
8 years ago
b11fdc3ae3
Migrate from ledermann/rails-settings to rails-settings-cached which allows 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
8 years ago
babc6a1528
Merge pull request #461 from vjackson725/master
...
fix Vagrantfile so that the correct ruby is installed
8 years ago
91dc21c469
fix Vagrantfile so that the correct ruby is installed
...
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.
8 years ago
8f54a8851a
Add rake task for clearing out media from silenced accounts
8 years ago
4a2ee43e80
Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
8 years ago
7951e7ffd5
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
...
fix bug in process feed service
8 years ago
10739df458
Merge pull request #456 from ineffyble/fix-repo-url
...
Fix repo URL
8 years ago
3ad0496ccb
Better animations
8 years ago
f876a8681d
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
8 years ago
4292cf60ae
Fix env variable name
8 years ago
18b11100e7
Fix issue when settings are not defined for column type
8 years ago
312c51b5c8
Home column filters
8 years ago
1e9d2c4b1e
Add "not found" component to UI
8 years ago
a1db2a191b
Add link to list of apps
8 years ago
67a31454ad
Merge pull request #450 from blackle/master
...
simplify emojification on public pages with .emojify class
8 years ago
917cf0bf5d
simplify emojification on public pages with .emojify class
8 years ago
205ba00017
Fix sandboxed iOS login again
8 years ago
5d558c14b4
Merge branch 'blackle-master'
8 years ago
def1f8c5b3
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
Eugen Rochko