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

Events #34

Open
wants to merge 1,417 commits into
base: master
Choose a base branch
from
Open

Events #34

wants to merge 1,417 commits into from

Conversation

BademiChetan
Copy link
Contributor

@karthikabinav, @meetaw, @praveenv253 : Please review the code. I'll do the same.

@BademiChetan
Copy link
Contributor Author

@sriram1593, @varshaan, @vsvrp-1995, @surajy123 : Check for comments on your code.

@karthikabinav
Copy link
Contributor

Hey, can images be removed from tracking ?

@BademiChetan
Copy link
Contributor Author

@sriram1593, @varshaan, @vsvrp-1995, @surajy123 : Please merge the master branch into the events branch in your locahost, fix the merge conflicts and push.

@BademiChetan
Copy link
Contributor Author

@karthikabinav : Yeah, done.

dajax.assign("#summary",'innerHTML',"<table border='1'><thead><tr><th>S.No</th><th>Group Name</th><th>Cores</th></tr></thead><tbody id='groups'>")
groups=Group.objects.order_by('id').all()[1:]
dajax.assign("#summary",'innerHTML',"<table border='1' class='table table-striped table-bordered table-condensed'><thead><tr><th>S.No</th><th>Group Name</th><th>Cores</th></tr></thead><tbody id='groups'>")
groups=Group.objects.order_by('id').all()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whitespaces.
groups = Group.objects.order_by('id').all()

@BademiChetan
Copy link
Contributor Author

@akshayrangasai: Review front end code.

cache.set(str(unsaved_tab.id)+"_event", str(unsaved_tab.event), 2592000)
cache.set(str(unsaved_tab.id)+"_title", str(unsaved_tab.title), 2592000)
cache.set(str(unsaved_tab.id)+"_text", str(unsaved_tab.text), 2592000)
cache.set(str(unsaved_tab.id)+"_pref", str(unsaved_tab.pref), 2592000)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This should be done in the save method of the Tab model.

@s-ramaswamy
Copy link
Contributor

Also. We should really not be merging 250 commits at once. Please merge when the branch is done. Branch, add a small feature and merge it back.

varshaan and others added 30 commits January 6, 2013 13:34
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.

7 participants