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
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
d6a456dc71
Merge branch 'blackle-dropdown'
8 years ago
3bddd647e0
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
8 years ago
75f80bef10
Persist UI settings, add missing localizations for German
8 years ago
23ebf60b95
Improve initialState loading
8 years ago
131bae89fd
Generate key for each input so we can upload the same file even after deleting
8 years ago
d64c454cfe
Switch to compose view when tapping 'mention' in dropdown on mobile
8 years ago
2e71bb031b
Fix Paperclip timeout setting. Fix bug introduced in #437
8 years ago
38bc85e695
Merge pull request #443 from blackle/master
...
Add call-to developers on getting started page
8 years ago
a8e30060ae
Merge pull request #446 from blackle/dropdown2
...
Expand dropdown leftways on status view
8 years ago
05e964688d
Expand dropdown leftways on status view
8 years ago
b4f09bae1d
Add call-to developers on getting started page
8 years ago
69643338f6
Merge pull request #437 from krainboltgreene/patch-1
...
Simplifying followers mappings
8 years ago
e8d6f6c8c1
Merge pull request #436 from krainboltgreene/patch-2
...
Less complicated determination of subscription
8 years ago
db8a088502
Update badges
8 years ago
abe3ae1cc2
Simplifying followers mappings
...
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
8 years ago
4a7e3e5082
Less complicated determination
8 years ago
6d097d559b
Merge pull request #434 from vjackson725/fix_vagrantfile
...
Fix Vagrantfile to include yarn
8 years ago
4447c4c7c8
Merge pull request #435 from krainboltgreene/patch-1
...
Using "rails style" order arguments
8 years ago
e5d9009d71
Using "rails style" order arguments
8 years ago
db3d5d811c
Fix Vagrantfile to include yarn
...
The current Vagrantfile fails to build upon provisioning, as it lacks yarn.
Change the Vagrantfile to add the yarn repository, and install yarn.
8 years ago
Effy Elden