gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,652 Commits 9 Branches 0 Tags
b49d2fd34380061dff87ff2f91521117c59e3b06
Commit Graph

258 Commits

Author SHA1 Message Date
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
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
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
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
d1e4175624 additional work on basejumps 2015-04-14 13:43:10 -07: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
Michael Q Larson
332d4f1875 refactor story.js mailer and remove some cruft 2015-04-09 17:50:10 -07:00
Michael Q Larson
62cabd56ff update camper news and chat challenges to have new videos and updated copy 2015-04-09 12:58:30 -07:00
Michael Q Larson
3b7ea3d9a4 start work on challenge-migraiton 2015-04-08 18:03:06 -07:00
Michael Q Larson
7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
Michael Q Larson
29b4e3b970 get seed data seeding and improve application submitted button 2015-04-08 14:57:08 -07:00
Michael Q Larson
c02fafa6a9 add status, turn hours into integer, create a directory view of all nonprofits 2015-04-08 14:36:05 -07:00
Michael Q Larson
751d25219e improve the wiki seed file and add strikethrough to read wikis 2015-04-07 22:33:49 -07:00
Michael Q Larson
df4c698177 improve the challenge map 2015-04-07 12:45:31 -07:00
Michael Q Larson
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
Michael Q Larson
9d746f7d49 add zipline and basejump to portfolio view, and bonfires with solutions(not yet writing name to bonfireCompletion record on user 2015-04-05 00:01:51 -07:00
Geoff Storbeck
e6272d4c7e Forgot comma on the end of the new entry to bonfireMDNlinks.js 2015-04-04 12:22:29 -04:00
Geoff Storbeck
543c79b67a Updated from upstream 2015-04-04 12:16:00 -04:00
Michael Q Larson
fa74a1b454 got show all nonprofits button working and improved nonprofit show view 2015-03-31 17:38:33 -07:00
Geoff Storbeck
003f6c6c0a Updated language and added more test cases 2015-03-31 19:07:22 -04:00
Michael Q Larson
f72774d412 minor wording improvement to a zipline. 2015-03-31 13:32:39 -07:00
Geoff Storbeck
46d185a503 added 5 new bonfires 2015-03-30 23:27:09 -04:00
Michael Q Larson
ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -07:00
Michael Q Larson
acea52dc1b make further improvements to wiki and start new show view for nonprofits 2015-03-30 18:02:50 -07:00
Michael Q Larson
18a9818200 Merge branch 'master' into nonprofit-show 
Conflicts:
	controllers/challenges.js
	controllers/courseware.js
 2015-03-30 16:17:04 -07:00
Michael Q Larson
106a10edca add a modal that allows one to scroll through all wiki pages 2015-03-30 15:55:00 -07:00
Michael Q Larson
23a3e235a7 Update routes for all static pages and leave redirects for existing routes to get to new wiki routes 2015-03-30 15:15:07 -07:00
Michael Q Larson
660214f87e able to seed and view wiki content 2015-03-30 13:48:54 -07:00
Michael Q Larson
97c978dc7c Make Basejumps show up properly and get their github routes persisting in the database. 2015-03-29 18:13:04 -07:00
Michael Q Larson
44ffc715de add nonprofit.json seed data from scrapped nonprofit branch 2015-03-29 15:29:14 -07:00
Michael Q Larson
81ce249dfc tiny fix for a bonfire 2015-03-29 14:56:13 -07:00
Michael Q Larson
b0099efe6e updates to javascript waypoints 2015-03-29 14:19:04 -07:00
Michael Q Larson
70f812dc78 Merge branch 'master' into ux-improvements 
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	views/bonfire/show.jade
 2015-03-29 13:05:39 -07:00
Michael Q Larson
4a805729cf add javascript waypoints 2015-03-29 12:51:23 -07:00
Michael Q Larson
672df775a2 add a zipline and a base jump to the seed file 2015-03-28 07:47:47 -07:00
Michael Q Larson
4d3337df32 Merge branch 'ziplines' into ux-improvements 
Conflicts:
	views/coursewares/showJS.jade
 2015-03-28 00:24:41 -07:00