Commit Graph

4032 Commits

Author SHA1 Message Date
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
0c2e45acc3 fix path for windows machines 2015-07-31 20:31:42 -07:00
13f2f349dc remove bonfire/comments models
remove comments from user router
2015-07-31 20:22:08 -07:00
646fa1cbac remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
ee8776feb3 removes comments
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
d52525f1f4 Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-08-01 00:47:39 +01:00
ae38aab8cc fix issue with codemirror framework and script tag rendering 2015-07-31 16:38:12 -07:00
2833e96091 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 14:38:43 -07:00
2ccd6e3ee3 fix html view instruction column 2015-07-31 14:36:00 -07:00
6454f37079 fix upvoting story no longer gives you brownie points
closes #1008
2015-07-31 14:31:12 -07:00
e7f522a611 fix giveBrowniePoints error messages 2015-07-31 13:45:45 -07:00
fd06b81088 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 13:38:17 -07:00
a0230609f5 fix resultant javascript error on certain pages 2015-07-31 13:38:04 -07:00
2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
0e21d6eb30 set browniePoints timeout to 30 seconds for dev 2015-07-31 12:45:34 -07:00
f1b964a26d send back user bio on giveBroniePoints 2015-07-31 12:16:27 -07:00
4b47e5282c Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-07-31 19:56:11 +01:00
74d938b3af Merge remote-tracking branch 'origin/staging' into staging 2015-07-31 19:54:00 +01:00
dd9984fc2d Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-07-31 19:53:21 +01:00
4cc5234df8 bump thundercats 2015-07-31 11:29:37 -07:00
051a7bb287 add new jquery challenges and resequence other challenges 2015-07-30 22:40:17 -07:00
62897b8a51 add removal and clone jquery challenges 2015-07-30 18:31:40 -07:00
1d7fc8589c add .remove() challenge 2015-07-30 18:12:29 -07:00
d4d4124158 add a removeClass challenge 2015-07-30 18:05:02 -07:00
1fa0c48257 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 17:31:53 -07:00
489f52180b add two new jquery challenges 2015-07-30 17:31:47 -07:00
972ae79b22 Ready JavaScript Curriculum 2015-07-31 00:22:56 +01:00
482f16893c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:38 -07:00
097391f4f6 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:31 -07:00
b9adf97a91 Ready JavaScript Curriculum 2015-07-30 23:46:47 +01:00
60105a9fe7 finish drafting copy and tests for bootstrap section 2015-07-30 15:45:54 -07:00
d588263658 Extra comma was breaking node seed 2015-07-30 21:54:33 +01:00
448daf1fa4 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 13:01:57 -07:00
35761f6316 fix some minor issues with bootstrap challenges 2015-07-30 13:01:46 -07: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
14368f6471 add container-fluid divs to all bootstrap waypoints 2015-07-30 12:20:34 -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
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
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