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

Refactor js code to integrate Flux Alt #28

Merged
merged 5 commits into from
Apr 9, 2015
Merged

Conversation

mbreining
Copy link
Member

@justin808 Please review. This PR contains the Flux Alt refactoring on top of the latest master. One commit.

I'll close and delete the previous feature/flux_integration branch.

Note that the alt library does not get installed by npm install although it is defined in package.json. I suspect there is a dependency conflict somewhere, although I would expect npm to error out. I didn't get a chance to investigate so for now I'm installing it manually cd client && npm install alt.

@mbreining mbreining mentioned this pull request Apr 8, 2015
@mbreining
Copy link
Member Author

@justin808 Lint errors have been addressed. Also updated the npm shrinkwrap. Let me know if you want to merge. Thanks.

@mbreining mbreining force-pushed the flux_alt_integration branch 2 times, most recently from 8496ecc to bdde1c1 Compare April 8, 2015 03:16
@justin808
Copy link
Member

LGTM

justin808 added a commit that referenced this pull request Apr 9, 2015
Refactor js code to integrate Flux Alt
@justin808 justin808 merged commit db39174 into master Apr 9, 2015
@mbreining mbreining deleted the flux_alt_integration branch April 26, 2015 18:15
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.

2 participants