Skip to content

Integrate updates from cujojs.com version #2

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

Merged
merged 4 commits into from
Jun 13, 2013
Merged

Conversation

briancavalier
Copy link
Member

This integrates the layout tweaks and new features (removing a contact) from the version used in http://cujojs.com. Added unit test for controller, and updated to wire 0.10.0

@briancavalier
Copy link
Member Author

Unfortunately, master is busted (someone just alerted me to it in #cujojs) because we list empty string ("") as our bower dep version in package.json, which now will install 0.9, and we list empty string for cujoJS lib versions in component.json. The problem is that bower 0.9 is incompatible with empty string versions in component.json (and presumably in bower.json as well).

So, I'm merging this. If it's broken in some way, it's on me and I'll fix it up later. But right now, master is flat out unusable, so I can't imagine how this will make the situation any worse :)

briancavalier added a commit that referenced this pull request Jun 13, 2013
Integrate updates from cujojs.com version
@briancavalier briancavalier merged commit 94aaaae into master Jun 13, 2013
@briancavalier briancavalier deleted the cujojs-com-update branch June 13, 2013 20:00
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