Skip to content
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

Write a script to generate data/manufacturer_data.py from the ESTA data and use it to update the current data #8

Merged
merged 15 commits into from
Jul 9, 2016

Conversation

peternewman
Copy link
Member

@peternewman peternewman commented Mar 6, 2015

Simplifies resolving #7 in future.

@peternewman
Copy link
Member Author

Just need to test with accents, then we're good to go.

@nomis52
Copy link
Member

nomis52 commented Mar 31, 2015

Is this ok to merge?

@peternewman
Copy link
Member Author

I sort of got blocked. I want to fix the issues with the admin UI before I commit more changes, but I've been rather busy at work recently. I still need to test with the accents too.

@daveol
Copy link
Contributor

daveol commented Apr 5, 2015

@peternewman I would wait for my merge before you start on that because otherwise git merge is gonna have problems I think

@peternewman
Copy link
Member Author

Thanks for the heads up @daveol however I don't think it should be a problem, as you haven't touched the Python code (so far at least), so it should merge cleanly. I still need to test if the accents break the JS though, and if they do, you can fix it in your new PRs :).

@peternewman
Copy link
Member Author

Now I need to get the duplicate 0x4C5A's fixed upstream.

@peternewman
Copy link
Member Author

This is now ready for merging @nomis52 and I've raised a separate issue regarding foreign characters ( #61 ).

@peternewman peternewman changed the title Write a script to generate data/manufacturer_data.py from the PLASA data and use it to update the current data Write a script to generate data/manufacturer_data.py from the ESTA data and use it to update the current data Jul 9, 2016
@nomis52
Copy link
Member

nomis52 commented Jul 9, 2016

LGTM

@peternewman peternewman merged commit cc0b7cf into OpenLightingProject:master Jul 9, 2016
@peternewman
Copy link
Member Author

Can I trouble you to deploy this please @nomis52 as I still can't deploy currently due to a few issues.

peternewman added a commit that referenced this pull request Jun 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants