Skip to content

JSON/API Lesson Cleanup#4022

Merged
BerkeleyTrue merged 1 commit intofreeCodeCamp:stagingfrom
arialaurel:fix/json-api-lesson-cleanup
Oct 30, 2015
Merged

JSON/API Lesson Cleanup#4022
BerkeleyTrue merged 1 commit intofreeCodeCamp:stagingfrom
arialaurel:fix/json-api-lesson-cleanup

Conversation

@arialaurel
Copy link
Copy Markdown
Member

@dcsan dcsan added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Oct 30, 2015
@arialaurel arialaurel force-pushed the fix/json-api-lesson-cleanup branch from bce177e to a7b7201 Compare October 30, 2015 05:04
@arialaurel arialaurel force-pushed the fix/json-api-lesson-cleanup branch from a7b7201 to d1de10e Compare October 30, 2015 05:09
@bugron
Copy link
Copy Markdown
Contributor

bugron commented Oct 30, 2015

@ltegman I've caused conflicts by merging #3986 which solves the second point from your list, so, please, rebase it.

@arialaurel
Copy link
Copy Markdown
Member Author

Resolved 😄

This comment was marked as off-topic.

This comment was marked as off-topic.

+ Fixes Convert JSON to HTML lesson (Closes freeCodeCamp#4016)
+ Add Formatting to Geolocation lesson output (Closes freeCodeCamp#4010)
+ Fixes Render Images lesson
+ Removes unnecessary `?callback=` from JSON challenges. (Closes freeCodeCamp#3972)
+ Lots of other formatting and consistancy changes.
+ Also closes freeCodeCamp#3962 and closes freeCodeCamp#3969
@arialaurel arialaurel force-pushed the fix/json-api-lesson-cleanup branch from 8ecde25 to 086b0bb Compare October 30, 2015 19:11
@arialaurel
Copy link
Copy Markdown
Member Author

Leftover regex \" replaced with (\\\"|\\') as per @BerkeleyTrue's comment.

BerkeleyTrue pushed a commit that referenced this pull request Oct 30, 2015
@BerkeleyTrue BerkeleyTrue merged commit 718681f into freeCodeCamp:staging Oct 30, 2015
@BerkeleyTrue BerkeleyTrue removed the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Oct 30, 2015
@BerkeleyTrue
Copy link
Copy Markdown
Contributor

👍

@arialaurel arialaurel deleted the fix/json-api-lesson-cleanup branch November 7, 2015 21:27
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.

4 participants