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

New Todo UI for FlightJS #1138

Closed
wants to merge 6 commits into from
Closed

Conversation

margaritis
Copy link
Contributor

Upgraded FlightJS to new Todo ui.

  • jasmine-flight and flightjs are linked to git repos

…t and jasmine-flight are still on bower due to the fact that jasmine-fligth does not exist as an npm module and FlightJS is a UMD bundle at npm.
…irectly from git repos. updated tests and main app
}
"name": "flight-todomvc",
"private": true,
"version": "0.0.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

name and version isn't needed

@margaritis
Copy link
Contributor Author

This is exactly what happens when you are sending PRs seconds before leaving for a coffee!

node_modules/
node_modules/.bin/*

node_modules/depot/*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The start at the end isn't really needed. Ignoring the folder itself will work too.

@margaritis
Copy link
Contributor Author

@sindresorhus I think it is ok. @arthurvr i didn't have time to remove the asterisk. Thanks for the heads up! Gtg

@passy passy closed this in c898a78 Feb 8, 2015
@margaritis
Copy link
Contributor Author

@passy How can you check from Github which commits were not merged?

@margaritis
Copy link
Contributor Author

@sindresorhus I saw you reverted this. I have updated the transient deps, put back the asterisks, and squashed the whole thing. Do you want to sent a new PR?

@sindresorhus
Copy link
Member

Hmm, where did I revert this?

@margaritis
Copy link
Contributor Author

Here

@sindresorhus
Copy link
Member

Oh, gawd... I didn't mean to push that commit. Fixed now.

@sindresorhus
Copy link
Member

@kmargaritis Any idea why c898a78 contains so many changes?

@margaritis
Copy link
Contributor Author

No idea @sindresorhus. Probably @passy has a clue. This is what i sent b6c18e2

@passy
Copy link
Member

passy commented Feb 9, 2015

The commits are all in, but I squashed them before merging. I still have no idea what happened with that mega commit. Went through some theories with Sindre, but I'm still in the dark. Sorry for the poopoo.

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.

None yet

4 participants