Friend Feed feature + Minor changes in Request

[liorsicd]

friend feed feature

In our app, all friends need the option to see the founded furniture that answering their request.

for that, I build a new feature, FriendFeed, that show the data to the friend.

1. build the logic side -

• model - connected to DB -connect the model to the admin site
• view and URL

2. build basic HTML feed to show the data (rendered by the Django view) solve #17

replace #18

Minor changes in Request

After the first draft, we learned (together with @nadavshoshan) that Django can generate the HTML form from the related model. It's also very helpful when we want to set limits options in the form (Enum).

So after the change now our request form is generated by Django and sends to the HTML file as an object.

[liorsicd]

@ifireball In 'clean it up' you mean rebase those commits and split them into small commits? another question - is it possible to remove all the branch merging from the log (without losing any file..)?

[ifireball]

Rebase commits, make sure each one deals with a single topic and has a good, descriptive, commit message, and that when read it series they "add up" to tell the full story of the PR. Don't have "junk" commits like "moved file X" or "fixed after comments".

A metaphor I sometimes use is that a PR is a presentation about a change you're making and each commit is a slide within that presentation.

About the branch merges - assuming all those branches were merged into master already - rebasing should remove them from the PR history - if they were not merged you need to submit them as PRs.

[liorsicd]

@ifireball if they were not merged you need to submit them as PRs.

I am this situation :

all of those commits are merges. so I created PR just for them to 'clear' (before I will push my new commits) #27