specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity
1392 commits 82 branches 202 tags 316 MiB
Commit graph

1392 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rakib Hasan 9433d03705 Removed try clause from create action in status controller 
Using catch statement in api_controller.rb to catch NotPermitted
Exception, and render error message
 2017-02-19 08:29:56 +00:00
Rakib Hasan 87a6bed9e9 previous commit was creating the status regardless 
of mix of video and images in status, just wasn't rendering
the show action. I moved the validation before the status creation
 2017-02-19 08:28:33 +00:00
Rakib Hasan 6f9ecd899e revisted fix for #462 
Moved validation to services/post_status_service.rb
 2017-02-19 08:28:33 +00:00
Rakib Hasan 6d2301988f Fix for issue #462 
Modified uploadCompose action to send media ids of attached
media when sending a request. Modified create method in MediaController
to check if when posting a video, there are no other media attached
to the status by looking at the media ids sent from the uploadCompose
action.
 2017-02-19 08:28:33 +00:00
Rakib Hasan 910df0f795 Removing dispatch of fetchContextFail 
No need to flash error message when status is not found.
The column will display the message "status not found"
 2017-02-19 08:21:45 +00:00
Rakib Hasan 8e760d5f62 adding new react class StatusNotFound 2017-02-19 08:21:37 +00:00
Rakib Hasan 9e0dbb7337 Fixing issue #626 
The status is not showing anymore after clicking on it
 2017-02-19 08:21:05 +00:00
Eugen Rochko 9e99b8c068 Fix #642 - Add "empty column" text to home/notifications 2017-02-18 02:37:59 +01:00
Eugen 1d5dfda3d4 Merge pull request #643 from yiskah/patch-7 
Add target="_blank" to github link under getting started
 2017-02-17 21:13:47 +01:00
shel 6a6d8f60c4 Add target="_blank" to github link 
This makes so clicking the link to the github opens in a new tab or windows.

I just keep getting frustrated clicking the link to github and then losing my place in my home timeline >_> that's all
 2017-02-17 14:50:50 -05:00
Eugen 2940deb51d 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 ca57f17d3d French translation update 2017-02-17 10:27:00 +01:00
Tom McAtee 8a93ae4f18 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 a1e96ae94f 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 5ddad41245 Do not display non-Status stream entries anymore 2017-02-17 02:20:52 +01:00
Eugen Rochko dbd80465c8 Fix small styling issues 2017-02-17 02:05:15 +01:00
Eugen Rochko f2931af61e 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 8b16f81882 Close dropdown when clicking items 2017-02-17 01:44:06 +01:00
Eugen Rochko 0cbf3a146f 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 8132cf8153 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 d0f087db2d 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 9c88d1b99e Speed up capistrano deployments 2017-02-16 02:34:21 +01:00
Eugen Rochko 24ba7c9762 Adding index overview for reports in admin UI 2017-02-16 02:28:10 +01:00
Eugen Rochko f722aa8c75 Fix Salmon issue 2017-02-16 01:59:34 +01:00
Eugen Rochko ff49649130 Expose Link headers via CORS 2017-02-15 23:26:17 +01:00
Eugen Rochko 5426f06ac2 Fix admin UI for accounts somewhat 2017-02-15 00:22:58 +01:00
Eugen Rochko 0a2427f79b 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 e571a01853 Fix outdated info 2017-02-14 21:33:31 +01:00
Eugen Rochko 3b81baaaaf Adding POST /api/v1/reports API, and a UI for submitting reports 2017-02-14 20:59:26 +01:00
Eugen Rochko 40a4053732 Disable PuSH for blocked domains 2017-02-14 04:01:37 +01:00
Eugen 94b61bdcf6 Merge pull request #632 from mcat-ee/patch-1 
Fixed the URL
 2017-02-14 03:20:44 +01:00
Tom McAtee 68dba5f2eb 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 f3ce9322b0 Fix #631 - Docker-deployed streaming API wasn't launched with the right environment 2017-02-13 23:10:11 +01:00
Eugen Rochko 63886bdc59 Fix #587 - Display TOTP secret next to QR code 2017-02-13 20:56:03 +01:00
Eugen bae7cf8cce Merge pull request #630 from yiskah/patch-6 
Add memetastic.space to instance list
 2017-02-13 20:42:40 +01:00
Eugen Rochko fae1799646 Add rake task for making someone into an admin 2017-02-13 20:42:02 +01:00
Eugen Rochko 138d21aea8 Update service timeout setting from 15s to 90s 2017-02-13 20:42:02 +01:00
shel 7a99699e2d Add memetastic.space 
It's uh, it's an instance now.
 2017-02-13 14:37:58 -05:00
Eugen ed9ae70487 Merge pull request #629 from halcy/patch-1 
Add https://icosahedron.website/
 2017-02-13 18:43:58 +01:00
Eugen Rochko 77df3785f1 Merge branch 'yiskah-patch-5' 2017-02-13 18:38:31 +01:00
Eugen Rochko ec521e6bfc Add remote mentions warning when composing a private status 2017-02-13 18:38:00 +01:00
Lorenz Diener 73210a93df Add https://icosahedron.website/ 2017-02-13 17:25:21 +01:00
Eugen Rochko 2ab7bd13e2 Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5 2017-02-13 17:22:40 +01:00
Eugen Rochko 677e95031e Clean up collapsible components 2017-02-13 17:20:18 +01:00
Eugen Rochko 2d8a4c4390 Add "next" link to Atom feeds 2017-02-13 15:38:45 +01:00
Eugen 63b3cb37db Merge pull request #627 from halcy/style-fixes 
Activity stream background should use $color5
 2017-02-13 15:16:15 +01:00
Your Name e4a7e8222e Activity stream background should use $color5 2017-02-13 12:31:52 +00:00
Eugen Rochko 8e08ae5bb9 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 df63461ff0 Add handler for salmons of undoing favourites 2017-02-12 19:50:18 +01:00
Eugen Rochko 720ff55262 Adding more unit tests. Fixing Salmon slaps XML 2017-02-12 17:30:15 +01:00