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

Basic functionality of Annotations 2.0 -- no saving but reading and UI b... #162

Merged

Conversation

jywarren
Copy link
Member

...asically working #87

I'm going to leave this open overnight to see if @manleyjster has any input; then will merge into stable for user testing. Then will continue fixing annotations saving etc.

@jywarren
Copy link
Member Author

Tests pass, btw

@jywarren
Copy link
Member Author

Actually, looking at this, it's pretty straightforward. I'm going to merge it in!

jywarren added a commit that referenced this pull request Apr 17, 2015
Basic functionality of Annotations 2.0 -- no saving but reading and UI b...
@jywarren jywarren merged commit 650e1bc into publiclab:master Apr 17, 2015
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