Commit graph

1332 commits

Author SHA1 Message Date
Eugen
2be45ca939 Merge pull request #640 from mcat-ee/master
Added SMTP_FROM_ADDRESS to heroku deploy config
2017-02-17 13:09:21 +01:00
nicolas
649536187c French translation update 2017-02-17 10:27:00 +01:00
Tom McAtee
7fd2d771b7 Added SMTP_FROM_ADDRESS to heroku deploy config
Allows the user to set the address mastodon emails are maraked as being sent from
2017-02-17 14:45:31 +10:30
Eugen Rochko
60cc2a32c2 Add foreign key to prevent reblogs of non-existent (after race conditions) statuses from happening
Fix issue with detailed status view not supporting unreblogging/unfavouriting
2017-02-17 02:33:10 +01:00
Eugen Rochko
3d291bcc55 Do not display non-Status stream entries anymore 2017-02-17 02:20:52 +01:00
Eugen Rochko
8cff4e811d Fix small styling issues 2017-02-17 02:05:15 +01:00
Eugen Rochko
014cb5e998 Quick fix for avatars with the same URL not being perceived as updated and in need of re-download 2017-02-17 01:50:01 +01:00
Eugen Rochko
f22abea0ba Close dropdown when clicking items 2017-02-17 01:44:06 +01:00
Eugen Rochko
52a0427d24 Speed up/optimize loading of statuses, context and cards by not re-fetching what is already loaded 2017-02-17 01:34:37 +01:00
Eugen Rochko
7f9d6d0160 Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments
Make replies default to privacy settings of the status being replied to
2017-02-17 01:30:24 +01:00
Eugen Rochko
0613d66df8 Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report 2017-02-17 00:42:52 +01:00
Eugen Rochko
a6b992b18e Speed up capistrano deployments 2017-02-16 02:34:21 +01:00
Eugen Rochko
6917e53fe0 Adding index overview for reports in admin UI 2017-02-16 02:28:10 +01:00
Eugen Rochko
cdb9df6e52 Fix Salmon issue 2017-02-16 01:59:34 +01:00
Eugen Rochko
0fe2cc37ee Expose Link headers via CORS 2017-02-15 23:26:17 +01:00
Eugen Rochko
513a78d67b Fix admin UI for accounts somewhat 2017-02-15 00:22:58 +01:00
Eugen Rochko
596de038c8 Fix #634 - Only include innermost-level statuses in report UI
Fix #635 - Include the initially-reported status in report UI even if it's not
among the user's most recent statuses
2017-02-15 00:01:52 +01:00
Eugen
02332f452c Fix outdated info 2017-02-14 21:33:31 +01:00
Eugen Rochko
2cc31b3194 Adding POST /api/v1/reports API, and a UI for submitting reports 2017-02-14 20:59:26 +01:00
Eugen Rochko
94a6dfab3a Disable PuSH for blocked domains 2017-02-14 04:01:37 +01:00
Eugen
0fd73264c8 Merge pull request #632 from mcat-ee/patch-1
Fixed the URL
2017-02-14 03:20:44 +01:00
Tom McAtee
525d615fd7 Fixed the URL
Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md).

I've replaced the vanilla address with one that includes a specific reference to the root of the repo
2017-02-14 12:46:18 +10:30
Eugen
6e8232e7bb Fix #631 - Docker-deployed streaming API wasn't launched with the right environment 2017-02-13 23:10:11 +01:00
Eugen Rochko
a83dc927d8 Fix #587 - Display TOTP secret next to QR code 2017-02-13 20:56:03 +01:00
Eugen
2bdd46cc26 Merge pull request #630 from yiskah/patch-6
Add memetastic.space to instance list
2017-02-13 20:42:40 +01:00
Eugen Rochko
1e94617a09 Add rake task for making someone into an admin 2017-02-13 20:42:02 +01:00
Eugen Rochko
03ce24d3bf Update service timeout setting from 15s to 90s 2017-02-13 20:42:02 +01:00
shel
b2ecb316ef Add memetastic.space
It's uh, it's an instance now.
2017-02-13 14:37:58 -05:00
Eugen
e3f3c44fb0 Merge pull request #629 from halcy/patch-1
Add https://icosahedron.website/
2017-02-13 18:43:58 +01:00
Eugen Rochko
fdc66bdf00 Merge branch 'yiskah-patch-5' 2017-02-13 18:38:31 +01:00
Eugen Rochko
edd9637e0a Add remote mentions warning when composing a private status 2017-02-13 18:38:00 +01:00
Lorenz Diener
d315966c70 Add https://icosahedron.website/ 2017-02-13 17:25:21 +01:00
Eugen Rochko
e2ae7a8e5c Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5 2017-02-13 17:22:40 +01:00
Eugen Rochko
a1d7e6773c Clean up collapsible components 2017-02-13 17:20:18 +01:00
Eugen Rochko
f09e8f5c40 Add "next" link to Atom feeds 2017-02-13 15:38:45 +01:00
Eugen
7380c30ad9 Merge pull request #627 from halcy/style-fixes
Activity stream background should use $color5
2017-02-13 15:16:15 +01:00
Your Name
c6fba8b27c Activity stream background should use $color5 2017-02-13 12:31:52 +00:00
Eugen Rochko
04b2b771c1 Add IDs to salmon slaps even if they are transient. Add title, too, mostly
in case of debugging incoming salmons. Add <thr:in-reply-to /> to favourite
salmons because it seems to be required by GS.
2017-02-13 13:30:33 +01:00
Eugen Rochko
2980de5cc5 Add handler for salmons of undoing favourites 2017-02-12 19:50:18 +01:00
Eugen Rochko
8550d32165 Adding more unit tests. Fixing Salmon slaps XML 2017-02-12 17:30:15 +01:00
Eugen Rochko
f48dc93379 Deduplicate delete salmons (send only one per mentioned-account domain) 2017-02-12 17:30:15 +01:00
Eugen
2a5a04bb4b Merge pull request #625 from ineffyble/patch-1
Remove toot.zone
2017-02-12 13:27:40 +01:00
Effy Elden
92ca519ac4 Remove toot.zone
toot.zone is being discontinued
2017-02-12 14:51:53 +11:00
Eugen Rochko
79f3ee31df Take out private toot distribution out of PuSH again 2017-02-12 01:31:04 +01:00
Eugen Rochko
f9f8f52fe9 Stop trying to shoehorn all Salmon updates into the poor database-connected
StreamEntry model. Simply render Salmon slaps as they are needed
2017-02-12 01:19:14 +01:00
shel
d4686e485e Add privacy disclaimer
I haven't had a chance to test this, because I don't currently have a fully functioning computer I can set up a dev-environment on, but this *should* make it so when a user toggles a post to be private, a disclaimer appears clarifying what "private" really means.
2017-02-11 17:42:19 -05:00
shel
c0be5dac90 Add privacy disclaimer
Add variable for text of privacy disclaimer
2017-02-11 16:47:01 -05:00
Eugen Rochko
12ed6f5712 Resolve issue with rendering authorize/reject Salmon slaps 2017-02-11 19:42:05 +01:00
Eugen Rochko
c001ef3df6 Fix Status.permitted_for scope query 2017-02-11 19:16:10 +01:00
Eugen Rochko
db53bfd30e Fix semantics of follow requests another slaps 2017-02-11 17:13:11 +01:00