WIP: OOificaiton and ATL For Students#7
Open
raynichc wants to merge 59 commits intoGibbonEdu:mainfrom
Open
Conversation
# Conflicts: # ATL/src/Domain/ATLColumnGateway.php
…urseClassID from edit
# Conflicts: # ATL/CHANGEDB.php # ATL/CHANGELOG.txt # ATL/atl_manage.php # ATL/atl_manage_delete.php # ATL/atl_manage_edit.php # ATL/atl_view_rubric.php # ATL/atl_write.php # ATL/manifest.php # ATL/src/Domain/ATLColumnGateway.php # ATL/version.php
Member
|
Looking great! Be sure to give a nudge here or on Slack when you're ready to look at merging 👍 |
Member
|
Hi Ray, we lost track of this PR a bit, is this still WIP or ready to merge? We've accidentally created some conflicts, but they should be minor, if you want to merge them back into your changes and let us know if you're ready to merge this PR. Thanks! |
Member
|
Hi @raynichc , this PR keeps dropping off the radar, sorry about that! 😞 It looks like there are some conflicts, but they should ideally be easy to resolve. It'd be nice to get this module all up to date. Are you able to see if you can handle the merge conflicts and then give a shout and I'll get it merged in promptly 😅 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Work in Progress, do not merge yet. Probably about 80% done.
Mostly OOification of the ATL module, but also adding an new feature for ATL columns to be marked as for students. Students have a page to fill in these ATLs assigned to them.