Replace datepickers with material datepickers #395
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
|
sorry for the merge conflicts. This is because we moved all the folders around a little bit (#394). Maybe the easiest way to fix it is to take the files you changed and copy them to their new location of the master branch (replacing the files that are there and don't include your changes yet). If you get stuck, let me know. |
# Conflicts: # src/app/child-dev-project/attendance/add-day-attendance/add-day-attendance.component.spec.ts # src/app/child-dev-project/attendance/attendance-manager/attendance-manager.component.spec.ts # src/app/child-dev-project/health-checkup/health-checkup-component/health-checkup.component.spec.ts # src/app/child-dev-project/notes/note-details/note-details.component.spec.ts # src/app/core/ui-helper/entity-subrecord/entity-subrecord.component.spec.ts # src/app/core/ui-helper/ui-helper.module.ts
TheSlimvReal
approved these changes
Jan 21, 2020
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.
see issue: #370
Visible/Frontend Changes
(Child School Relations (popup when editing lines of the Education section in ChildDetails) is not modified because of problems with dates as strings)