-
Notifications
You must be signed in to change notification settings - Fork 1
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
Add a "notes" section to the edit page #169
Conversation
Add latest changes from upstream (5-4-21)
This link represents the deploy preview for this given pr. Building with commit 2ddaf59 https://app.netlify.com/sites/ehs-service/deploys/60932bd5a4806a0007b16dae |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! If you have extra time (and know how to do it), you could make the text wrap around after it has hit the end of the bounding box, or you can implement a larger bounding box to be more square-like. Otherwise, it looks great!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@theTisch21 you need to rebase off of master and resolve conflicts: your files are behind by 2 commits
@daniel-sudz |
@theTisch21 I'm giving you write access. Next time you can just make a new branch. |
@Zjjc123 that doesn't help with anything -- it's just a branch that was behind and not fast-forwarded before changes were made which results in merge conflicts. Where the branch is located (at origin or forked doesn't affect merging.) |
Oh this is unrelated to the issue. I just didn't know where to tell him that I gave him write |
@daniel-sudz @Zjjc123 I don't see the merge conflicts on my end. Would it be easier if I made a new branch based on |
Thanks for write access! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We probably need to fix up the UI it's so ugly right now. But your changes look good to me but @daniel-sudz should check on it.
@theTisch21 I don't see a merge issue. I think @daniel-sudz was talking about the issue before you fixed it. |
I don't see a merge issue either, and github says I can automatically merge, so I'm gonna do that. @daniel-sudz if you see a problem, you can undo this merge. |
This PR:
Adds a new property to the firebase document "notes"
Adds a parameter to the VALIDATE_FREE_FORM function to mark it optional, and accept
null
stringsAdds a field to the edit page where users can submit notes