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

Try json #39

Merged
merged 6 commits into from
Nov 7, 2016
Merged

Try json #39

merged 6 commits into from
Nov 7, 2016

Conversation

melissaebrooks
Copy link
Contributor

This new version of the webpage is much more modular. The html is much simpler, with the javascript scripting and json data strcutures separated out.

Using the json data strcuture also allows for much simpler, cleaner and faster javascript. It also removes the dependency on the google dojo API/framework.

@melissaebrooks
Copy link
Contributor Author

Related to issue #6 and groundwork for issue #7.

Malcolm Brooks added 2 commits November 7, 2016 17:02
…een made since first branched.

Merge remote branch 'origin/master' into tryJSON

Conflicts:
	lib/ImageMetaTag/webpage.py
	test.py
@melissaebrooks
Copy link
Contributor Author

Resolved conflicts with previous changes, since branching for this work. The new webpage.py version was kept, and commits #16, #17, #18 and #19 were re-introduced.

@melissaebrooks melissaebrooks merged commit 1c2f39d into master Nov 7, 2016
@melissaebrooks melissaebrooks deleted the tryJSON branch January 3, 2017 13:19
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.

1 participant