Skip to content
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

Hacker-news #5

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Hacker-news #5

wants to merge 36 commits into from

Conversation

CodeMaxx
Copy link
Member

@CodeMaxx CodeMaxx commented May 5, 2016

Initial commit . Will keep adding to it.

@siddharthbulia @DheerendraRathor @udiboy1209

@@ -1,8 +1,5 @@
from django.db import models


# Create your models here.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

o.O ? Be careful what you push!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why keep this line? Intentionally delete kiya hai

@CodeMaxx CodeMaxx force-pushed the hacker-news branch 3 times, most recently from 640571b to c2e036b Compare May 5, 2016 20:01
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.1%) to 46.012% when pulling c2e036b on CodeMaxx:hacker-news into a5af30b on stabiitb:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.1%) to 46.012% when pulling c143006 on CodeMaxx:hacker-news into a5af30b on stabiitb:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+2.01%) to 48.168% when pulling 6da59f1 on CodeMaxx:hacker-news into a5af30b on stabiitb:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.4%) to 45.755% when pulling 7edc62f on CodeMaxx:hacker-news into a5af30b on stabiitb:master.

@coveralls
Copy link

Coverage Status

Coverage increased (+3.4%) to 49.573% when pulling 3b628f7 on CodeMaxx:hacker-news into a5af30b on stabiitb:master.

arunabh98 and others added 3 commits May 7, 2016 15:50
Add Comments to Models, Form
Make detail section to view and add Comments
Init Work on Recursive comments
pub_date = models.DateTimeField('date published')

def __unicode__(self):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arunabh98 Use __str__() instead of __unicode__().... Adhere to python3.5 format

@udiboy1209
Copy link
Member

Why is this causing merge conflicts 😕 ? You're working on a separate folder right?

@CodeMaxx
Copy link
Member Author

CodeMaxx commented May 7, 2016

Yeah on a separate folder. But some changes had to made in the setting and stuff.

@CodeMaxx
Copy link
Member Author

CodeMaxx commented May 7, 2016

Also @arunabh98 accidentally added docupload stuff here as well.

import django.db.models.deletion


class Migration(migrations.Migration):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Put migration files in gitignore.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants