780df33037
Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive
8 years ago
972fb80de6
Move follow requests link above logout link in getting started column
8 years ago
9ac182d831
Show visibility toggle on media gallery for sensitive images
8 years ago
b1075ccb86
Merge pull request #478 from blackle/backflip
...
Change boost sprite to look like fa-retweet
8 years ago
5c3c7c545c
Change boost sprite to look like fa-retweet
8 years ago
7e46083338
Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse
8 years ago
73e217d9d7
Fix #427 - don't suggest hashtag if the search value contains a space
8 years ago
58b0fe2f28
Fix #449 - don't do relationships fetch for empty array of IDs
8 years ago
11117f5aec
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
8 years ago
3471b9acb1
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
...
Fix S3 default settings
8 years ago
cd8e2f8ac8
Merge branch 'ineffyble-feature/toot-app-source'
8 years ago
5d88ef90c9
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
3a957e127a
Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
8 years ago
91edf829ec
Merge pull request #464 from blackle/backflip
...
Make boost button spin around
8 years ago
db40fd4641
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
8 years ago
195d976d1a
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
21c888fefd
Add a textual 'Back to Mastodon' link in footer of settings pages
8 years ago
77e78ed6aa
Make boost button arrows spin around
8 years ago
6d333d9fc6
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
8 years ago
2c042fe57f
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
8 years ago
e751dd669a
Fix typo in rel
8 years ago
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
cbcd9b3503
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
49ff508743
Hide 'Do not display on public timeline' for reply toots. Fixes #412 .
8 years ago
4b384d6914
Fix too late return
8 years ago
8442a176c5
Improve extended about page layout
8 years ago
f2667139ad
Adding about/more page with extended information that can be set up by an admin
8 years ago
533448be42
Add extended about page stub
8 years ago
6d98465db2
Extend rails-settings-cached to merge db-saved hash values with defaults
8 years ago
1a30737ff5
Add settings for contact information
8 years ago
7e7c2bbb0f
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
f622f4e137
Merge pull request #461 from vjackson725/master
...
fix Vagrantfile so that the correct ruby is installed
8 years ago
1403f5b31b
fix Vagrantfile so that the correct ruby is installed
...
Prior to this commit, the vagrantfile installs ruby 2.3.3. Due to commit mastodon@992c8d2, 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
ac95c2dbfe
Add rake task for clearing out media from silenced accounts
8 years ago
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
992c8d2c41
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
...
fix bug in process feed service
8 years ago
9eb3f68499
Merge pull request #456 from ineffyble/fix-repo-url
...
Fix repo URL
8 years ago
efd8ce920f
Better animations
8 years ago
ad61a21752
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
8 years ago
001a73c6fc
Fix env variable name
8 years ago
bc17613e70
Fix issue when settings are not defined for column type
8 years ago
c8bcd413e2
Home column filters
8 years ago
15b183117c
Add "not found" component to UI
8 years ago
14a0bec2d8
Add link to list of apps
8 years ago
efd4565389
Merge pull request #450 from blackle/master
...
simplify emojification on public pages with .emojify class
8 years ago
57e496e1bc
simplify emojification on public pages with .emojify class
8 years ago
0c0d4b7c92
Fix sandboxed iOS login again
8 years ago
ee6b885468
Merge branch 'blackle-master'
8 years ago
394f185e91
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
8 years ago
609748016f
Merge branch 'blackle-dropdown'
8 years ago
Eugen Rochko
blackle
Effy Elden
Effy Elden
vjackson725