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

Tasks #11

Closed
wants to merge 3 commits into from
Closed

Tasks #11

wants to merge 3 commits into from

Conversation

lewisevan
Copy link
Collaborator

Adds a new feature that allows admins to create and assign tasks. Members can view their assigned tasks from the homepage, and mark the tasks as started/completed.

Admins can create and assign tasks to other users. Tasks can then be marked as "Started" or "Completed" by the assigned member.
Display additional user info on users page.
@lewisevan lewisevan added the enhancement New feature or request label Nov 7, 2019
@JettBurns14
Copy link
Owner

Cool, thanks for the edits! I'll check this out locally and merge if things look good!

Copy link
Owner

@JettBurns14 JettBurns14 left a comment

Choose a reason for hiding this comment

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

Hey @lewisevan, I like the changes, but I can't merge them without making a mess with Git. I pushed commits after you made the PR, not realizing at the time that merging your code would be very difficult. I'm going to make another temporary branch to apply your changes to, and merge that in myself (unless you want to do that, and have your name on the commits).

@lewisevan
Copy link
Collaborator Author

You can just go ahead and re-commit the changes in another branch. That will probably be the easiest way to merge them.

Your changes look great by the way! Except now I've lost the ability to edit announcement messages....

@JettBurns14
Copy link
Owner

Yeah, will do!

Huh, everything should be working... I'll check on it after this merge.

@JettBurns14 JettBurns14 removed the enhancement New feature or request label Nov 16, 2019
@JettBurns14 JettBurns14 added the enhancement New feature or request label Nov 18, 2019
@JettBurns14 JettBurns14 deleted the el-updates branch November 19, 2019 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants