016/master #34

Closed
wants to merge 7 commits into
base: master
from

Conversation

Projects
None yet
2 participants
@bengitscode
Contributor

bengitscode commented Mar 17, 2017

No description provided.

Ben Adamski added some commits Mar 16, 2017

Ben Adamski
Update from talk-template
-  Refresh for cohort LM-01.
-  .gitignore update.
Ben Adamski
Update from node-template
-  Refresh for cohort LM-01.
Ben Adamski
Fix grammatical error in README
-  Address and close #29
-  That wasn't a sentence. Now it is.
Ben Adamski
Add additional resources for understanding this
-  Address and close #23
-  Added a javascript is sexy article and a helpful blogpost.

@raq929 raq929 requested a review from bengitscode Mar 17, 2017

@bengitscode

This comment has been minimized.

Contributor

bengitscode commented Mar 18, 2017

@raq929 I know this is technically for LM-01 but we never updated in 016. I can close this PR and push a renamed branch if you prefer.

Ben Adamski
Make-standard
-  Ran make-standard task and added modified files.
@bengitscode

This comment has been minimized.

Contributor

bengitscode commented Mar 21, 2017

@raq929 I pushed 016/solution which was made by rebasing solution against 016/master, the next commit after that is just running make-standard on those solutions.

Should I just rename it solution and force push over solution? Just didn't want to without making sure first, a pr into solution would be full of standard/non-standard conflicts.

@raq929

This comment has been minimized.

raq929 commented Mar 21, 2017

No, you should make a PR against the current solution and I will review and push.

@raq929

This comment has been minimized.

raq929 commented Mar 21, 2017

Do not fix other things; I have opened issues on them.
But please do add spec/.eslintrc.json, which you missed when updating from node-template. Without it, grunt nag yells about all the tests.

@bengitscode

This comment has been minimized.

Contributor

bengitscode commented Mar 22, 2017

I just made the requested change. I noticed that issue but didn't understand those warnings were the result of that file missing.

I just rebased a solution branch against this update and have a PR against solution as requested above

Thanks for the feedback on the extraneous diff as well, that was a good catch.

@bengitscode

This comment has been minimized.

Contributor

bengitscode commented Mar 29, 2017

Changes moved to #42 and #43

@bengitscode bengitscode referenced this pull request Mar 29, 2017

Merged

017/master #42

@jordanallain jordanallain deleted the 016/master branch Jun 13, 2017

caleb-pearce pushed a commit that referenced this pull request Aug 14, 2017

racheltstevens
Update README
change wonderwoman from let to const
close #34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment