search

CannabisData / cannabisdata

Cannabis Data monorepo
MIT License
8 stars 1 forks source link

User settings fixes + licenses map on the dashboard #6

Closed keeganskeate closed 1 year ago

keeganskeate commented 1 year ago

The changes are relatively straight forward, however, the fork may not be aligned with the main repository. Please feel free to let me know if any corrections are needed.

keeganskeate commented 1 year ago

The changes address issues #2 , #3, and #4.

gregoryfoster commented 1 year ago

Hi @keeganskeate, and ty for this pull request. Can you please rebase your changes on top of the current staging branch commit 9a7bcfb20e11fe200bf6404c6b0175b6b47b263c? I gave it a shot but I think you'll better recognize the changes that need to be preserved.

It also looks like I may have confused matters by squashing your initial commits when merging, so the historical commits in this pull request aren't recognized - likely not a good practice on my part. I'll preserve the commit history from here on out.

gregoryfoster commented 1 year ago

I'm going to push up a new staging branch which reverts the changes I made and preserves your commit history, will likely then do the same for main. That would automatically close this pull request, so commenting and closing now. Best to make this change early!