greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,772 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

2772 Commits (a6f6d7e1cf56bb07ec109a43ba0b8f7793be708b)

Author SHA1 Message Date
Michael Q Larson 8fbfae9554 further updates to basejumps 2015-04-17 19:05:18 -07:00
Michael Q Larson b1e92ddcd8 comment out non-twitter auth options and add pintrest clone to basejumps 2015-04-17 19:04:46 -07:00
Michael Q Larson fe31271ee5 add ziplines, basejumps and node school challenges to coursewares.json 2015-04-17 17:38:30 -07:00
Nathan 5bdcc15e05 Enable search 2015-04-17 20:32:46 -04:00
Michael Q Larson 820fbb99c7 finalize the way zipline and basejump challenges will look, fix twitch view 2015-04-17 15:01:08 -07:00
Michael Q Larson 061d86b074 simplify the camper news UX 2015-04-17 13:09:35 -07:00
Michael Q Larson d10011acc3 Pull some useful changes from aborted branch 2015-04-16 23:54:26 -07:00
Michael Q Larson d2fae63310 fix a few minor issues post merge 2015-04-16 23:16:55 -07:00
Quincy Larson d7f862eea5 Merge pull request #320 from FreeCodeCamp/ux-improvements 
Pulling Ux improvements the rest of the way into master
 2015-04-16 23:07:10 -07:00
Quincy Larson 8afb3e1199 Merge pull request #319 from terakilobyte/ux-improvements 
Ux improvements
 2015-04-16 23:00:58 -07:00
terakilobyte 020e1999a3 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-04-17 01:52:04 -04:00
terakilobyte 04d9856d4f Remove vomit route. 2015-04-17 01:48:06 -04:00
terakilobyte dbc99eafb6 Update chat link and copy. 2015-04-17 01:41:01 -04:00
terakilobyte edefd90268 Fix bug where users could get points for completing the same challenge. 2015-04-17 01:40:32 -04:00
terakilobyte f1acc59f82 Fix bug where users could get points for completing the same challenge. 2015-04-17 01:39:55 -04:00
terakilobyte b9372b9af6 Resolve merge conflicts using Webstorm's merge integration tool. v2 2015-04-17 00:39:48 -04:00
terakilobyte b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
terakilobyte 56e45ba9dd resolve merge conflict 2015-04-15 18:35:06 -04:00
terakilobyte 8119858a24 Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show 2015-04-15 18:20:40 -04:00
terakilobyte 6341b1158b add eslint task to gulp to let us know how we need to write better code 2015-04-15 18:20:20 -04:00
Quincy Larson d20aa1cf3c Merge pull request #288 from FreeCodeCamp/resources 
Create Wiki controller to replace our static pages
 2015-04-15 01:03:19 -07:00
Michael Q Larson d968524c69 attempt to fix wording on seek and destroy bonfire issue #293 2015-04-15 00:59:12 -07:00
Michael Q Larson 993db11189 Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show 2015-04-15 00:12:27 -07:00
Michael Q Larson 22be5b90ba more improvements to the basejump challenges 2015-04-15 00:12:16 -07:00
Quincy Larson 27f80eddea Update README.md with better contribution directions. Point to AirBnB styleguide. (closes #307) 2015-04-15 00:07:14 -07:00
Quincy Larson 255a6b48be Merge pull request #298 from aldraco/coursewaresErr 
Issue #277 Fix- coursewares chai-jquery test issue
 2015-04-14 23:43:38 -07:00
terakilobyte 3748356079 Update user migration script to ensure user model validity. 2015-04-15 00:53:36 -04:00
Michael Q Larson ddb88643e0 Nathan's updates to the userMigration script' 2015-04-14 21:19:05 -07:00
Michael Q Larson e033f224bc fix challenge map to redirect to nonprofits 2015-04-14 20:20:38 -07:00
Michael Q Larson e0aa084c7a finish getting field-guide working and improve zipline show view 2015-04-14 20:12:47 -07:00
terakilobyte 9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04:00
Michael Q Larson 6b671f7d1c Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show 2015-04-14 19:39:51 -07:00
Michael Q Larson d7a698f629 fix the field guide 2015-04-14 19:39:25 -07:00
Michael Q Larson be00c7e402 Revert "remove inspectlet thinking this may be the malware twitter is finding" 
This reverts commit 4b9be16b24.
 2015-04-14 16:03:27 -07:00
Michael Q Larson da738ed82d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-14 13:44:49 -07:00
Michael Q Larson 4b9be16b24 remove inspectlet thinking this may be the malware twitter is finding 2015-04-14 13:44:17 -07:00
Michael Q Larson d1e4175624 additional work on basejumps 2015-04-14 13:43:10 -07:00
terakilobyte 18bdefbfac Add in message about twitter authorization being down temporarily to error handler 2015-04-14 16:17:58 -04:00
brndnb a6d5721458 Switch from debug to console.log 2015-04-14 15:42:46 -04:00
brndnb 4fb119ab68 Add debug to app.js to troubleshoot twitter signin in production, unable to repliate locally 2015-04-14 15:36:02 -04:00
brndnb 7912dc722d Update bonfire challenge in courseware to encourage people not to try to complete all bonfires back to back, and not to worry if new bonfires are added. 2015-04-14 11:15:06 -04:00
Michael Q Larson 77b5265fde start creating the basejump instructions 2015-04-13 21:56:51 -05:00
brndnb 324e7fcbd3 Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show 2015-04-13 21:31:02 -04:00
brndnb 96ac90274d Update User model to make migration easier and complete user migration script 2015-04-13 21:30:08 -04:00
Michael Q Larson 11548bfcf9 add checkbox cross off effect to challenges and reword pairwise bonfire 2015-04-13 02:41:42 -04:00
Michael Q Larson 83c14cccc4 continue work on user migration 2015-04-13 01:03:26 -04:00
Michael Q Larson e98f445444 update the challenge sequencing 2015-04-13 00:02:21 -04:00
Michael Q Larson f85804f270 start writing user migration for challenge completion 2015-04-12 02:07:01 -04:00
Nathan 9a16ddad0a Merge pull request #290 from storbeck/ux-improvements 
added 5 new bonfires
 2015-04-12 00:02:10 -04:00
Michael Q Larson 332d4f1875 refactor story.js mailer and remove some cruft 2015-04-09 17:50:10 -07:00