Commit Graph

29599 Commits

Author SHA1 Message Date
ebc99f6e82 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:38 -07:00
482f16893c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:38 -07:00
3487c8a8d6 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:31 -07:00
097391f4f6 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:31 -07:00
60dbeb07fd Ready JavaScript Curriculum 2015-07-30 23:46:47 +01:00
b9adf97a91 Ready JavaScript Curriculum 2015-07-30 23:46:47 +01:00
3a22e96754 finish drafting copy and tests for bootstrap section 2015-07-30 15:45:54 -07:00
60105a9fe7 finish drafting copy and tests for bootstrap section 2015-07-30 15:45:54 -07:00
17e60ba837 Extra comma was breaking node seed 2015-07-30 21:54:33 +01:00
d588263658 Extra comma was breaking node seed 2015-07-30 21:54:33 +01:00
4e8337bfb3 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 13:01:57 -07:00
448daf1fa4 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 13:01:57 -07:00
86c6a9a440 fix some minor issues with bootstrap challenges 2015-07-30 13:01:46 -07:00
35761f6316 fix some minor issues with bootstrap challenges 2015-07-30 13:01:46 -07:00
e78a39cb8d Ready JavaScript Curriculum 2015-07-30 20:58:02 +01:00
1e412b1498 Ready JavaScript Curriculum 2015-07-30 20:58:02 +01:00
e6694023c6 Emergency check fix for the scroll locker
Fix to stop main.js from completely bugging out on any page that isn't challengeType: 0
2015-07-30 20:45:51 +01:00
fd10044367 add container-fluid divs to all bootstrap waypoints 2015-07-30 12:20:34 -07:00
14368f6471 add container-fluid divs to all bootstrap waypoints 2015-07-30 12:20:34 -07:00
a364bf989b finish color tutorial 2015-07-29 23:21:44 -07:00
fc7af46e0c finish color tutorial 2015-07-29 23:21:44 -07:00
fa47ed9afb remove extra debugs 2015-07-29 15:10:03 -07:00
5533779d45 add give brownie points!!!! 2015-07-29 15:00:24 -07:00
9731e8ccc6 fix return callbacks 2015-07-29 11:41:41 -07:00
9e22122832 adds user/about 2015-07-29 11:32:16 -07:00
c82b2e3ae6 set and render page title
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
262de30393 start work on RGB section 2015-07-29 00:33:17 -07:00
549ab1bd0e start work on RGB section 2015-07-29 00:33:17 -07:00
cf5b60768d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-28 23:11:13 -07:00
912e075039 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
5fd95c584c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
5c712d7a7a Merge pull request #1408 from kemitchell/kemitchell-content-license
Add CC-BY-SA-4.0 license for content
2015-07-28 20:00:56 -07:00
ce5377791e add CC-BY-SA-4.0 license for content 2015-07-28 19:55:49 -07:00
527df362db add ID related challenges 2015-07-28 18:51:39 -07:00
2d009777b3 add ID related challenges 2015-07-28 18:51:39 -07:00
79a96292b9 remove bower and pm2
These are better server as global installs
2015-07-28 17:28:45 -07:00
d7a4f7c2c2 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
fd3374fca7 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
884825cb1d add profile-picture to profile picture 2015-07-28 11:18:11 -07:00
7df555a2ff Fix Issue #1015
Fix two of the tests in "Waypoint: Create an Ordered List"
2015-07-28 13:17:05 -04:00
e67d843f48 Fix Issue #1015
Fix two of the tests in "Waypoint: Create an Ordered List"
2015-07-28 13:17:05 -04:00
a615449015 add bower to devdeps 2015-07-27 19:42:14 -07:00
41f643b5df Change order of subarrays to cover all cases
Since in all tests each subarray has a larger max than the previous subarray, if the user does not reset max for each subarray, the tests still pass.
2015-07-27 20:37:39 +02:00
19c2408348 Change order of subarrays to cover all cases
Since in all tests each subarray has a larger max than the previous subarray, if the user does not reset max for each subarray, the tests still pass.
2015-07-27 20:37:39 +02:00
b81567f02f Update basic-bonfires.json
Temporary fix to bug found in "Everything Be True" bonfire mission (additional test case to prevent "return collection[0].hasProperty(pre)" from passing)
2015-07-28 00:49:09 +08:00
7683e33d5d fix add webpack options in gulp file to watch task 2015-07-26 22:05:12 -07:00
1b9608f225 fix nonprofits totalSavings errors 2015-07-26 19:15:19 -07:00
b9d544d13e hide job position on small screens 2015-07-26 18:42:26 -07:00
cecf60aa17 update cities and add different help rooms 2015-07-26 15:53:31 -07:00
edbab55c98 Display contact information for job and size thumbnail 2015-07-26 07:57:14 -07:00