search

mmm-usc / mmmlab_website

0 stars 1 forks source link

Nellie edits #11

Closed marklhc closed 1 year ago

marklhc commented 1 year ago

Need review before propagating the change

netlify[bot] commented 1 year ago

Deploy Preview for mmmlab ready!

Name Link
Latest commit
Latest deploy log https://app.netlify.com/sites/mmmlab/deploys/63869f23758bf63b6082521c
Deploy Preview https://deploy-preview-11--mmmlab.netlify.app
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

meltemozcan commented 1 year ago

Great job with all the updates @Nellie021231! Thanks for your hard work. I have reviewed the changes and all looks good with the PR itself but let's check in with @marklhc and @winniewytse about the deployment check related issues before merging.

One question for @marklhc, should the PR be nellie_edits -> master or nellie_edits -> devel? devel is 5 commits ahead of master.

As a side note for @Nellie021231, I created a branch off of nellie_edits to automate the extraction of image paths for the slideshow from the images folder as previously discussed with Mark. Once we determine what's happening with deployment we can merge my branch into yours and then merge into master (or devel, depending on Mark's reply to the above note).

marklhc commented 1 year ago

I resolved the merge conflicts. @meltemozcan should we wait for #14 to finish first before merging this?

meltemozcan commented 1 year ago

I resolved the merge conflicts. @meltemozcan should we wait for #14 to finish first before merging this?

@marklhc Thank you Mark! I think we can complete the merge in #14 (nellie edits from mel_nellie_edits) first once the code has been reviewed. It's a few lines of code so I hope it wouldn't take much time. I can send a review request to you for that pull request if you would like. Once we complete #14 we can merge this too. Please let me know if you'd like me to go ahead with either of the merges.