-
Notifications
You must be signed in to change notification settings - Fork 10
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
Conversation
…ata and use it to update the current data.
Just need to test with accents, then we're good to go. |
Is this ok to merge? |
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. |
@peternewman I would wait for my merge before you start on that because otherwise git merge is gonna have problems I think |
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 :). |
Conflicts: data/manufacturer_data.py
Now I need to get the duplicate 0x4C5A's fixed upstream. |
Conflicts: data/manufacturer_data.py
Conflicts: data/manufacturer_data.py
LGTM |
Can I trouble you to deploy this please @nomis52 as I still can't deploy currently due to a few issues. |
Simplifies resolving #7 in future.