Commit 7e76c55f authored by Jonne Haß's avatar Jonne Haß

Merge branch 'master' of github.com:diaspora/diaspora

parents 5d022360 ca763277
......@@ -57,6 +57,10 @@ class CommentsController < ApplicationController
end
end
def new
render :layout => false
end
def index
if user_signed_in?
@post = current_user.find_visible_shareable_by_id(Post, params[:post_id])
......@@ -68,6 +72,7 @@ class CommentsController < ApplicationController
@comments = @post.comments.includes(:author => :profile).order('created_at ASC')
respond_with do |format|
format.json { render :json => @post.comments.as_api_response(:backbone), :status => 200 }
format.mobile{render :layout => false}
end
else
raise ActiveRecord::RecordNotFound.new
......
= new_comment_form(params[:post_id], current_user)
= render :partial => 'new_comment', :locals =>{:post_id => params[:post_id]}
......@@ -248,6 +248,7 @@ body {
.comments {
overflow: auto;
position: relative;
text-align: left;
* {
max-width: 100%; }
min-height: 34px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment