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

Calendar implementation #32

Merged
merged 152 commits into from
May 16, 2015
Merged

Calendar implementation #32

merged 152 commits into from
May 16, 2015

Conversation

richard1
Copy link
Contributor

FullCalendar frontend + calendar/events models backend.

This is a giant pull request, so please review thoroughly!

ctarangi and others added 30 commits April 25, 2015 17:57
Conflicts:
	hitmeup/settings.py
	hitmeup/urls.py
…ndships

Conflicts:
	user_accounts/migrations/0001_initial.py

class Meta:
model = Event
fields = ('start',) # grabs all the fields.
Copy link
Member

Choose a reason for hiding this comment

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

What do you mean by "grabs all the fields"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Resolved

end: '',
description: '',
location: '',
errors: []
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this "resets states upon submission" necessary? Do the states get properly reset every time the person clicks the day anyways?

{
'name': 'View Calendar',
'view': 'calendar:view_calendar',
},
Copy link
Member

Choose a reason for hiding this comment

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

Add a # TODO here to make this entry appear only on authenticated. IIRC Kavin's branch has something for this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

auth_required field added, set to True

@richard1
Copy link
Contributor Author

BY THE EXECUTIVE POWER INVESTED IN ME BY @metakirby5
I, @richard1, HEREBY MERGE IN PULL REQUEST NUMBER

#32

THIS SIXTEENTH OF MAY IN THE YEAR TWO THOUSAND AND FIFTEEN

🚢 🚢 🚢 🚢 🚢

richard1 added a commit that referenced this pull request May 16, 2015
@richard1 richard1 merged commit 593dd94 into master May 16, 2015
@metakirby5 metakirby5 deleted the ourcalendar branch May 18, 2015 09:30
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