383114add3
Change boost sprite to look like fa-retweet
blackle2017-01-15 10:55:31 -05:00
926459fc0a
Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse
Eugen Rochko2017-01-15 14:59:25 +01:00
7d7a11250cFix#427 - don't suggest hashtag if the search value contains a space
Eugen Rochko2017-01-15 14:45:43 +01:00
1d5cbfa356Fix#449 - don't do relationships fetch for empty array of IDs
Eugen Rochko2017-01-15 14:41:49 +01:00
cc1eccc8bcFix#466 - when logged in, make "get started" link to the frontpage instead of sign up
Eugen Rochko2017-01-15 14:38:59 +01:00
16f9490d33
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
EugenandGitHub2017-01-15 14:29:47 +01:00
bfec9aaee0
Merge branch 'ineffyble-feature/toot-app-source'
Eugen Rochko2017-01-15 14:04:56 +01:00
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
Eugen Rochko2017-01-15 14:01:33 +01:00
a097dd489b
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
Effy Elden2017-01-15 20:58:46 +11:00
777f527d86
Merge pull request #474 from ineffyble/add-back-link-to-settings
EugenandGitHub2017-01-15 02:15:37 +01:00
e45fed58cb
Add a textual 'Back to Mastodon' link in footer of settings pages
Effy Elden2017-01-15 11:03:35 +11:00
ed41f9f0b1
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
Effy Elden2017-01-15 10:30:23 +11:00
3f84816b24
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
Effy Elden2017-01-15 10:27:54 +11:00
a67ffcbf56
Make boost button arrows spin around
blackle2017-01-13 23:32:27 -05:00
f81dc7a33a
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
Effy Elden2017-01-15 09:12:11 +11:00
6c002cf615
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
Effy Elden2017-01-15 09:10:44 +11:00
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#11Effy Elden2017-01-15 08:58:50 +11:00
88801f7554
Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
EugenandGitHub2017-01-14 20:33:10 +01:00
32d756fb22
Hide 'Do not display on public timeline' for reply toots. Fixes#412.
Effy Elden2017-01-15 06:10:23 +11:00
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 Rochko2017-01-12 20:46:24 +01:00
91dc21c469
fix Vagrantfile so that the correct ruby is installed
vjackson7252017-01-12 23:20:55 +11:00
8f54a8851a
Add rake task for clearing out media from silenced accounts
Eugen Rochko2017-01-12 04:19:04 +01:00
4a2ee43e80Fix#457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
Eugen Rochko2017-01-12 03:54:50 +01:00
7951e7ffd5
Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service
Eugen Rochko2017-01-11 15:39:31 +01:00
10739df458
Merge pull request #456 from ineffyble/fix-repo-url
EugenandGitHub2017-01-11 14:19:19 +01:00
Eugen Rochko
Effy Elden
blackle
Effy EldenandGitHub
vjackson725
Kurtis Rainbolt-GreeneandGitHub
