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 #7

Merged
merged 10 commits into from
May 17, 2017
Merged

Calendar #7

merged 10 commits into from
May 17, 2017

Conversation

GiorgiB97
Copy link
Contributor

Merge calendar and master.

GiorgiB97 and others added 10 commits May 4, 2017 18:37
- Generated empty module
- Basic interface created
- Basic interface created
Create/Edit event implemented
Color labels added
Broken Commit
- events are now draggable
- event adding and editing now works
- very basic version of attachments upload implemented
NOTE: there is a bug in event start/end date picker
- Attachment upload works (angular-file-upload)
@thecodeholic thecodeholic changed the base branch from master to calendar May 17, 2017 08:27
@thecodeholic thecodeholic merged commit 34b3782 into thecodeholic:calendar May 17, 2017
thecodeholic pushed a commit that referenced this pull request Jun 6, 2017
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.

2 participants