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

Scheduling #31

Merged
merged 25 commits into from
Dec 17, 2016
Merged

Scheduling #31

merged 25 commits into from
Dec 17, 2016

Conversation

JackCai1206
Copy link
Collaborator

completed some basic functions of scheduling
still need to complete a ui for a calendar

AsianPsychoBoy added 25 commits December 8, 2016 13:02
…ling

# Conflicts:
#	src/app/app.module.ts
#	src/app/router.config.ts
#	src/app/shared/model/session.ts
…ling

# Conflicts:
#	src/app/shared/model/user.ts
…ling

# Conflicts:
#	src/app/app.module.ts
#	src/app/shared/model/user.service.ts
…ling

# Conflicts:
#	src/app/app.module.ts
#	src/app/router.config.ts
@michaelgira23 michaelgira23 merged commit d5a2425 into master Dec 17, 2016
@michaelgira23 michaelgira23 modified the milestone: Finished Demo Dec 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants