Commit Graph

29260 Commits

Author SHA1 Message Date
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
e53a771cfe Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
bf6611e988 Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
ed0a25e1cb 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
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
0281e0915c Merge pull request #3844 from krantzinator/feature/add-solutions
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
100075eea1 Merge pull request #3844 from krantzinator/feature/add-solutions
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
4385c4d7cd Merge pull request #3846 from vetom/patch-1
Updating the waypoint information
2015-10-23 22:08:00 -07:00
ae084236c2 Merge pull request #3846 from vetom/patch-1
Updating the waypoint information
2015-10-23 22:08:00 -07:00
cbd4a14adb 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
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
6fd5178f71 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
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
cc2b04467d Merge pull request #3863 from ribeirojpn/fix/test-message-in-Bonfire-Where-art-thou
fix first test message in Where art thou bonfire
2015-10-23 21:34:10 -07:00
b149bc7a04 Merge pull request #3863 from ribeirojpn/fix/test-message-in-Bonfire-Where-art-thou
fix first test message in Where art thou bonfire
2015-10-23 21:34:10 -07:00
d2cab92237 finish editing ajax challenges 2015-10-23 21:32:51 -07:00
97a3b12bfb finish editing ajax challenges 2015-10-23 21:32:51 -07:00
518bf25f39 fix/test message in Where art thou bonfire 2015-10-24 01:20:50 -03:00
75d5f92f31 fix/test message in Where art thou bonfire 2015-10-24 01:20:50 -03:00
b6423979a4 confirm that all tests pass as intended 2015-10-23 16:46:21 -07:00
acd2f6282e confirm that all tests pass as intended 2015-10-23 16:46:21 -07:00
e7c6e626e0 merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
36ba68781f merge staging and overhaul ajax challenges 2015-10-23 16:19:00 -07:00
502510ac29 added @dting's solutions to the intermediate bonfires
closes #3837
2015-10-23 19:18:45 -04:00
79ee2e31e9 added @dting's solutions to the intermediate bonfires
closes #3837
2015-10-23 19:18:45 -04:00
0f7b9add2f Merge pull request #3868 from FreeCodeCamp/fix/javascript-linting
Fix linting in JavaScript editor
2015-10-24 00:05:53 +01:00
756efcd9fb Fix linting in JavaScript editor 2015-10-23 15:38:51 -07:00
fab104c52d Merge pull request #3824 from FreeCodeCamp/fix/init-app-for-dev
Fix first start for new devs
2015-10-23 14:32:15 -07:00
69387e57ee Merge pull request #3824 from FreeCodeCamp/fix/init-app-for-dev
Fix first start for new devs
2015-10-23 14:32:15 -07:00
1fa5db288f Merge pull request #3849 from FreeCodeCamp/feature/block-camper-news
Add camper must be auth with gitub to post to news
2015-10-23 14:28:47 -07:00
2ac70458b0 remove unnecessary bullet point from Camper News view 2015-10-23 14:28:27 -07:00
4910118366 update flash message 2015-10-23 14:12:09 -07:00
1db84d1455 Merge branch 'staging' into feature/block-camper-news 2015-10-23 14:08:19 -07:00
c1e5238a34 fix/test message in Bonfire:Where art thou 2015-10-23 15:26:23 -03:00
b2bbe00388 fix/test message in Bonfire:Where art thou 2015-10-23 15:26:23 -03:00
844f978fb0 Merge pull request #3854 from natac13/fix/unclear-description-target-with-jquery-selectors-#3845
fixed unclear description for jQuery challenge using all selectors
2015-10-22 23:49:22 -07:00
924d35e610 fixed unclear description for jQuery challenge using all selectors
suggested by @trs4ece

closes #3845
2015-10-22 17:32:40 -04:00
e7cae04c52 fixed unclear description for jQuery challenge using all selectors
suggested by @trs4ece

closes #3845
2015-10-22 17:32:40 -04:00
d29d3407ec Merge pull request #3835 from FreeCodeCamp/feature/solutions
Add solutions to upper intermediate bonfires
2015-10-22 12:53:58 -07:00
b26810bdf7 Merge pull request #3835 from FreeCodeCamp/feature/solutions
Add solutions to upper intermediate bonfires
2015-10-22 12:53:58 -07:00
2c33a1e568 Merge pull request #3851 from FreeCodeCamp/fix/weather
update weather challenge with api key
2015-10-22 21:06:30 +08:00
9a19e7e2e6 added 5 solutions to basic bonfires 2015-10-22 08:33:10 -04:00
1d3fbc656a added 5 solutions to basic bonfires 2015-10-22 08:33:10 -04:00
073650fcc4 update weather challenge with api key 2015-10-22 02:14:34 -07:00
d8ebb7bf38 update weather challenge with api key 2015-10-22 02:14:34 -07:00
474b201b45 continue refining clementine instructions 2015-10-22 01:45:33 -07:00
32140ab57a continue refining clementine instructions 2015-10-22 01:45:33 -07:00
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
7e1cf529ad 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
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