Feature/teacher dashboard #146
Merged
Conversation
This file contains 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
Want100Cookies
previously requested changes
Jan 25, 2018
src/main/resources/data.sql
Outdated
| (2, "[email protected]", "Jane Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '654321'), | ||
| (3, "[email protected]", "Administrator", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '987555'), | ||
| (4, "[email protected]", "John Doe", "$2a$04$FYZXxiv7A74rX33gfs2m/.AGqhQ/unlJCB2nHLRiuHCVlECcyLyb6", 1, '123456'); | ||
| ======= |
There was a problem hiding this comment.
Please resolve merge conflicts first
There was a problem hiding this comment.
Forgot to push them
| @@ -1,31 +1,26 @@ | |||
| <div ng-init="init()"> | |||
| <div ng-init="$ctrl.onInit()"> | |||
| @@ -1,18 +1,19 @@ | |||
| <div ng-init="init()"> | |||
| <div ng-init="$ctrl.onInit()"> | |||
| <table layout-fill> | |||
| </div> | ||
|
|
||
| <!-- $scope.items = [1, 2, 3, 4, 5, 6, 7]; |
There was a problem hiding this comment.
Forgot to remove this outcommented code
Want100Cookies
approved these changes
Jan 25, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #133
Closes #135