Commit Graph

1029 Commits

Author SHA1 Message Date
krantzinator
cd430a5167 finished adding solutions for the Basic Bonfires 2015-10-26 19:06:48 -04:00
Quincy Larson
033dd5ee9c fix waypoint typo 2015-10-25 19:47:02 -07:00
Ben McMahon
3883483d8d Merge pull request #3595 from FreeCodeCamp/curriculum/JSONAndAJAX
Curriculum/json and ajax for QA and copy check
2015-10-26 00:47:30 +00:00
Quincy Larson
565d4d1309 Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228
Conflicts:
	seed/challenges/basic-javascript.json
2015-10-24 01:39:05 -07:00
Quincy Larson
0e70f98171 Merge branch 'fcc-running-cats' of https://github.com/ptsurbeleu/FreeCodeCamp into ptsurbeleu-fcc-running-cats
Conflicts:
	seed/challenges/bootstrap.json
2015-10-24 01:33:26 -07:00
Quincy Larson
b2a19cfec5 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
Quincy Larson
6dbbf56c5c Merge branch 'fix/bonfire-test' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-fix/bonfire-test
Conflicts:
	seed/challenges/basic-bonfires.json
2015-10-24 01:25:42 -07:00
Quincy Larson
882b82fe1d Merge pull request #3876 from FreeCodeCamp/fix/symmetric-dif
remove test based on closed @saadanerdetbare PR, closes #3362
2015-10-24 01:21:42 -07:00
Quincy Larson
d5ddb10b7a remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
Quincy Larson
2ebc551197 Merge pull request #3380 from joel-bentley/fix/tests-on-waypoint-img-responsive
Fix tests on Waypoint Mobile Responsive Images
2015-10-24 01:14:43 -07:00
Quincy Larson
a8f3e663e3 Merge pull request #3383 from abhisekp/correct-test-bf-where-belong
Modify tests for Bonfire - Where do I belong
2015-10-24 00:46:16 -07:00
Quincy Larson
333d4c0ffa Merge pull request #3384 from richchurcher/fix/where-do-i-belong
Modify description for Where do I belong
2015-10-24 00:45:28 -07:00
Quincy Larson
92868736c0 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
Quincy Larson
a6a5b430b3 Merge branch 'saintpeter-new-for-loops' of https://github.com/SaintPeter/FreeCodeCamp into SaintPeter-saintpeter-new-for-loops 2015-10-23 22:51:41 -07:00
Quincy Larson
990dbc6f52 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -07:00
Quincy Larson
6e7df9288a fix second instance of logger.html 2015-10-23 22:48:49 -07:00
Quincy Larson
7ede839a02 Merge branch 'fix/test-slot-machine-to-life' of https://github.com/natac13/freecodecamp into natac13-fix/test-slot-machine-to-life 2015-10-23 22:45:23 -07:00
Quincy Larson
f16dd554fc Merge pull request #3620 from ltegman/fix-everything-be-true-tests-3394
Fix BF: Everything Be True Description and Tests
2015-10-23 22:41:12 -07:00
Quincy Larson
e552984244 Merge pull request #3789 from ltegman/fix/OOP-functional-lesson-cleanup-3760
Add Better Explanations to the Functional Programming Lessons
2015-10-23 22:39:59 -07:00
Quincy Larson
bf6611e988 Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
Quincy Larson
e89c8b5525 Merge pull request #3841 from michael-krebs/feature/add-advanced-solutions
Adds dting's solutions to advanced bonfires
2015-10-23 22:10:18 -07:00
Quincy Larson
100075eea1 Merge pull request #3844 from krantzinator/feature/add-solutions
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
Quincy Larson
ae084236c2 Merge pull request #3846 from vetom/patch-1
Updating the waypoint information
2015-10-23 22:08:00 -07:00
Quincy Larson
84223fceff Merge pull request #3847 from junhaoyap/fix/jQuery-script-tag
Make first jQuery lesson more lenient for script tag
2015-10-23 21:55:37 -07:00
Quincy Larson
4d816df10a Merge pull request #3869 from natac13/fix/add-solution-intermediate-bonfires
added @dting's solutions to the intermediate bonfires
2015-10-23 21:44:45 -07:00
Quincy Larson
d2cab92237 finish editing ajax challenges 2015-10-23 21:32:51 -07:00
Joao Paulo Ribeiro
75d5f92f31 fix/test message in Where art thou bonfire 2015-10-24 01:20:50 -03:00
Quincy Larson
b6423979a4 confirm that all tests pass as intended 2015-10-23 16:46:21 -07:00
Quincy Larson
e7c6e626e0 merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
natac13
79ee2e31e9 added @dting's solutions to the intermediate bonfires
closes #3837
2015-10-23 19:18:45 -04:00
Joao Paulo Ribeiro
b2bbe00388 fix/test message in Bonfire:Where art thou 2015-10-23 15:26:23 -03:00
natac13
e7cae04c52 fixed unclear description for jQuery challenge using all selectors
suggested by @trs4ece

closes #3845
2015-10-22 17:32:40 -04:00
Berkeley Martinez
d29d3407ec Merge pull request #3835 from FreeCodeCamp/feature/solutions
Add solutions to upper intermediate bonfires
2015-10-22 12:53:58 -07:00
krantzinator
1d3fbc656a added 5 solutions to basic bonfires 2015-10-22 08:33:10 -04:00
Quincy Larson
d8ebb7bf38 update weather challenge with api key 2015-10-22 02:14:34 -07:00
Logan Tegman
3cea1ba105 Merge pull request #3827 from junhaoyap/fix/style-elements
Check is now stricter and needs braces and semicolon
2015-10-21 23:57:13 -07:00
Logan Tegman
9f9951c970 Merge pull request #3831 from uwaseem/fix/issue-3830
Fix typo - changes 'it's attribute' to 'its attribute'
2015-10-21 23:40:56 -07:00
junhaoyap
5ee8b50431 Make first jQuery lesson more lenient for script tag 2015-10-21 21:02:43 -07:00
Tomás Veras
2e2990770e Updating the waypoint information
After commit ec1d3ac in learnyoumongo, exercise "Find Limit" was renamed to "Find Project".
2015-10-21 23:49:17 -04:00
Michael Krebs
d232e03e01 Adds dting's solutions to advanced bonfires 2015-10-21 20:56:14 -04:00
Quincy Larson
5105efa624 add solutions to challenges object and add solutions for upper intermediate bonfires 2015-10-21 15:04:58 -07:00
Michael Krebs
6dfda01661 Changes Finders Keepers MDN link from array.some() to array.filter() 2015-10-21 17:15:25 -04:00
uwaseem
ee31bb30a1 Fix typo - changes 'it's attribute' to 'its attribute' 2015-10-21 22:50:15 +08:00
junhaoyap
fb3d490960 Add stricter check for CSS selectors styling elements 2015-10-20 22:27:27 -07:00
M-Bowe
e4f8bff4c1 Fix typo in basic-ziplines 2015-10-20 23:09:08 -04:00
Aniruddh Agarwal
eb688d1720 Merge pull request #3813 from ltegman/fix/nest-anchor-in-paragraph-3805
Fix Waypoint Nest Anchor in Paragraph Code Guidance
2015-10-20 20:22:10 +08:00
junhaoyap
7acdfaa09e Add regex test for waypoint use CSS to be more strict 2015-10-19 21:38:15 -07:00
Logan Tegman
68dfdaf1ff Fix Waypoint Nest Anchor in Paragraph Code Guidance
Added comments to delineate which areas of the code should be modified since we were seeing a lot of confusion on the tests not passing when the `p` tag was at the bottom of the page.
Closes #3805
2015-10-19 21:33:24 -07:00
Aniruddh Agarwal
3066f5a579 Merge pull request #3367 from bugron/fix/nest-all_elements_in-container_fluid
Adds a new test which checks if all elements are nested in .container-fluid
2015-10-19 06:07:03 +08:00
emersonp
cc587d59a5 Corrected typo - missing period. 2015-10-18 09:01:51 -07:00