nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

somehow some dirty state made it into my merge :(

Browse source
This commit is contained in:
Maxwell Salzberg 2012-07-02 11:34:31 -07:00
parent 190fceaf5c
commit c2bbe4e466
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/collections/posts.js
View file

@ -2,7 +2,3 @@ app.collections.Posts = Backbone.Collection.extend({
model: app.models.Post, model: app.models.Post,
url : "/posts" url : "/posts"
}); });
app.collection.PublicPosts = app.collection.Posts.extend({
url : '/public'
})

6
db/schema.rb
View file

@ -107,6 +107,8 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
end end
add_index "conversations", ["author_id"], :name => "conversations_author_id_fk"
create_table "invitation_codes", :force => true do |t| create_table "invitation_codes", :force => true do |t|
t.string "token" t.string "token"
t.integer "user_id" t.integer "user_id"
@ -144,6 +146,7 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
t.string "target_type", :limit => 60, :null => false t.string "target_type", :limit => 60, :null => false
end end
add_index "likes", ["author_id"], :name => "likes_author_id_fk"
add_index "likes", ["guid"], :name => "index_likes_on_guid", :unique => true add_index "likes", ["guid"], :name => "index_likes_on_guid", :unique => true
add_index "likes", ["target_id", "author_id", "target_type"], :name => "index_likes_on_target_id_and_author_id_and_target_type", :unique => true add_index "likes", ["target_id", "author_id", "target_type"], :name => "index_likes_on_target_id_and_author_id_and_target_type", :unique => true
add_index "likes", ["target_id"], :name => "index_likes_on_post_id" add_index "likes", ["target_id"], :name => "index_likes_on_post_id"
@ -169,6 +172,7 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
end end
add_index "messages", ["author_id"], :name => "index_messages_on_author_id" add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
add_index "messages", ["conversation_id"], :name => "messages_conversation_id_fk"
create_table "notification_actors", :force => true do |t| create_table "notification_actors", :force => true do |t|
t.integer "notification_id" t.integer "notification_id"
@ -200,7 +204,7 @@ ActiveRecord::Schema.define(:version => 20120521191429) do
t.text "data", :null => false t.text "data", :null => false
end end
add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url" add_index "o_embed_caches", ["url"], :name => "index_o_embed_caches_on_url", :length => {"url"=>255}
create_table "participations", :force => true do |t| create_table "participations", :force => true do |t|
t.string "guid" t.string "guid"