aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,191 Commits
134 Branches
278 Tags
1.0 GiB
Commit Graph

1191 Commits (b84d1533d42fd3abed9e8a9d86defa0264c309a8)
 

Author SHA1 Message Date
Eugen Rochko c468446f4c Fix boops?
Eugen Rochko cde0476ca2 Fix
Eugen Rochko fcb5a85cdd Add sounds for notifications. Boop by @jk@mastodon.social
Eugen d7a7baa9a7 Merge pull request from ineffyble/master 
Add Heroku deployment support
Effy Elden ab4f5f5da5 Add Heroku deployment support
Eugen Rochko 6cf44ca92c Improve how the list entry Account component looks when target is blocked/follow is requested
Eugen 99fe89026c Merge pull request from blackle/replytimeline 
Show 'do not display in public timeline' when replying to self
blackle 889709a2a6 Show 'do not display in public timeline' when replying to self
Eugen Rochko 1a33e4042e Fix upload file input being re-rendered needlessly
Eugen Rochko 7d53ee73f3 Fix - Add "favourites" column
Eugen Rochko da5d366230 Fix - Improve lightbox, add loading indicator
Eugen Rochko a78148f763 Merge branch 'blackle-sensitive'
Eugen Rochko 2ae0fb4419 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive
Eugen Rochko 0439c7d58b Move follow requests link above logout link in getting started column
blackle 144402ec7e Show visibility toggle on media gallery for sensitive images
Eugen 3778355454 Merge pull request from blackle/backflip 
Change boost sprite to look like fa-retweet
blackle 383114add3 Change boost sprite to look like fa-retweet
Eugen Rochko 926459fc0a Fix typo introduced in which made unlisted toggle only fade in/out and not also collapse
Eugen Rochko 7d7a11250c Fix - don't suggest hashtag if the search value contains a space
Eugen Rochko 1d5cbfa356 Fix - don't do relationships fetch for empty array of IDs
Eugen Rochko cc1eccc8bc Fix - when logged in, make "get started" link to the frontpage instead of sign up
Eugen 16f9490d33 Merge pull request from ineffyble/fix-paperclip-s3-acl 
Fix S3 default settings
Eugen Rochko bfec9aaee0 Merge branch 'ineffyble-feature/toot-app-source'
Eugen Rochko 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  until it's consistent with non-animated version
Eugen Rochko ab165547fd Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
Eugen 1f7c0ad8d3 Merge pull request from blackle/backflip 
Make boost button spin around
Effy Elden a097dd489b Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
Eugen 777f527d86 Merge pull request from ineffyble/add-back-link-to-settings 
Add a 'Back to Mastodon' link to footer of settings pages
Effy Elden e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages
Effy Elden ed41f9f0b1 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
Effy Elden 3f84816b24 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
blackle a67ffcbf56 Make boost button arrows spin around
Effy Elden f81dc7a33a Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
Effy Elden 6c002cf615 Test for presence of Application in haml before trying to render details, to fix errors identified by CI
Effy Elden 65122798b2 Fix typo in rel
Effy Elden 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
Eugen 88801f7554 Merge pull request from ineffyble/fix/412-hide-public-timeline-option-for-replies 
Hide 'Do not display on public timeline' for reply toots
Effy Elden 32d756fb22 Hide 'Do not display on public timeline' for reply toots. Fixes .
Eugen f63f0c4625 Fix too late return
Eugen Rochko 7cde08e30b Improve extended about page layout
Eugen Rochko c01dd089ff Adding about/more page with extended information that can be set up by an admin
Eugen Rochko e25170f960 Add extended about page stub
Eugen Rochko 2939e9898b Extend rails-settings-cached to merge db-saved hash values with defaults
Eugen Rochko ca50ceeaf0 Add settings for contact information
Eugen Rochko 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
Eugen babc6a1528 Merge pull request from vjackson725/master 
fix Vagrantfile so that the correct ruby is installed
vjackson725 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.
Eugen Rochko 8f54a8851a Add rake task for clearing out media from silenced accounts
Eugen Rochko 4a2ee43e80 Fix - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
Eugen Rochko 7951e7ffd5 Add ruby version to Gemfile, move devDependencies in package.json to dependencies, 
fix bug in process feed service