New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(frontend/proposal_list): Add reviewed and unreviewed filter #246

Closed
wants to merge 9 commits into
base: master
from

Conversation

Projects
None yet
3 participants
@anistark
Member

anistark commented May 16, 2015

a porro conference proposals

closes #239

@anistark anistark referenced this pull request May 16, 2015

Closed

add coveralls to junction #237

@theskumar theskumar changed the title from Fix Issue #239 to feat(frontend/proposal_list): Add reviewed and unreviewed filter May 16, 2015

@theskumar

This comment has been minimized.

Show comment
Hide comment
@theskumar

theskumar May 16, 2015

Member

@anistark please open a new PR for coverall separately, you can remove the commit w.r.t coverall in this PR.

Member

theskumar commented May 16, 2015

@anistark please open a new PR for coverall separately, you can remove the commit w.r.t coverall in this PR.

@anistark

This comment has been minimized.

Show comment
Hide comment
@anistark

anistark May 16, 2015

Member

@theskumar Removed coveralls. Adding separate PR for coveralls.

Member

anistark commented May 16, 2015

@theskumar Removed coveralls. Adding separate PR for coveralls.

@anistark

This comment has been minimized.

Show comment
Hide comment
@anistark

anistark May 16, 2015

Member

@theskumar Please review now.

Member

anistark commented May 16, 2015

@theskumar Please review now.

Show outdated Hide outdated requirements-dev.txt
conferences = models.ManyToManyField(to=Conference, related_name='proposal_status')
def __str__(self):
return self.name

This comment has been minimized.

@theskumar

theskumar May 16, 2015

Member

Why do we need this model? If we wan to know, if the proposal is reviewed or not, we can just add a new property is_reviewed to model to Proposal model class itself. Thoughts?

@theskumar

theskumar May 16, 2015

Member

Why do we need this model? If we wan to know, if the proposal is reviewed or not, we can just add a new property is_reviewed to model to Proposal model class itself. Thoughts?

@theskumar

This comment has been minimized.

Show comment
Hide comment
@theskumar

theskumar May 16, 2015

Member

seems like there are change in the master branch, you should rebase your work on top of it before continuing. The way to do it is:

git remote add upstream git@github.com:pythonindia/junction.git
git fetch upstream
git checkout master
git rebase upstream/master
git push origin master --force

Assuming running git remote -v indicates location of origin to your forked repository. On a side note, while working on something, you should always create a new branch with a descriptive name[1] and then send a pull request from that branch.

[1] https://github.com/agis-/git-style-guide

Member

theskumar commented May 16, 2015

seems like there are change in the master branch, you should rebase your work on top of it before continuing. The way to do it is:

git remote add upstream git@github.com:pythonindia/junction.git
git fetch upstream
git checkout master
git rebase upstream/master
git push origin master --force

Assuming running git remote -v indicates location of origin to your forked repository. On a side note, while working on something, you should always create a new branch with a descriptive name[1] and then send a pull request from that branch.

[1] https://github.com/agis-/git-style-guide

@kracekumar

This comment has been minimized.

Show comment
Hide comment
@kracekumar

kracekumar Dec 19, 2015

Member

Since the feature is already in master, closing the PR.

Member

kracekumar commented Dec 19, 2015

Since the feature is already in master, closing the PR.

@kracekumar kracekumar closed this Dec 19, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment