Open
Conversation
Enter Functionality
Resolved merge conflict between edit_butt and enter_keypress branches in script.js - retained both additions to script.js and added an extra closing curly bracke
Fixed merge conflict for BG_change branch and removed .visible class (don’t need to declare a CSS class in order for it to exist in DOM)
Fixed merge conflict (part 2) for BG_change
Needed Links and JavaScript in a certain order
Add Priority along with Todo Delete Priority along with Todo
Assign/delete priority of to-do items
Used indentations (tabs) to make style.css and script.js more legible and easier to understand.
Fixed: Error occurred when task was submitted without selecting priority first (hid alert, assigned default value, and removed some redundant code/comments). Fixed: Add task on key enter (used ng-submit in new HTML form). Fixed: Add duplicate tasks (issue in ng-repeat).
Moved around links to CSS/JS and moved the on-page script (in index.html) to a separate file, select.js.
Used indentation (tabs) to increase legibility and ease of future edits for index.html.
Conflicts resolved and latest commits downloaded
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
5 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.
Method added to clear completed items; METHOD INCOMPLETE and waiting for the feature that will mark completed items to be written