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

224 Commits

Author SHA1 Message Date
Michael Q Larson
fa74a1b454 got show all nonprofits button working and improved nonprofit show view 2015-03-31 17:38:33 -07:00
Michael Q Larson
f72774d412 minor wording improvement to a zipline. 2015-03-31 13:32:39 -07: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
Michael Q Larson
e4eb5052c7 intermediary work on ziplines 2015-03-27 23:15:39 -07:00
Ashley Drake
85c996ad2e Added bonfire links for level 3. 2015-03-26 10:45:33 -04:00
Ashley Drake
c053069f23 Added bonfire links for level 2. 2015-03-26 10:34:59 -04:00
Ashley Drake
4cad7c1aee fixed comma error for merge. 2015-03-26 09:53:22 -04:00
Michael Q Larson
09b812688e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 
Conflicts:
	app.js
 2015-03-25 14:20:34 -07:00
Geoff Storbeck
482cc3fa7b fixed typo for issue #266 2015-03-24 15:58:17 -04:00
A. Drake
c4624b7f20 links added, basic functionality working across pages. 2015-03-24 01:17:21 -04:00
A. Drake
dbc57dd0cb links iterated through on the page. TODO formatting and adding more data. 2015-03-23 23:55:24 -04:00
A. Drake
0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
Michael Q Larson
f2f8d93f9f further work on ziplines 2015-03-21 22:49:31 -07:00
Michael Q Larson
91edf73965 start building zipline views and controller 2015-03-21 17:23:13 -07:00
Michael Q Larson
88e261ccf6 Merge branch 'master' into ux-improvements 
Conflicts:
	controllers/resources.js
	controllers/user.js
	seed_data/challenges.json
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
 2015-03-21 16:25:39 -07:00
Michael Q Larson
2f240655a2 update announcements and move announcement modal back into learn-to-code view 2015-03-19 23:24:44 -07:00
Michael Q Larson
9adc444a31 fix a courseware test 2015-03-10 17:52:48 -07:00
piecedigital
a2aec8d20d initial commit 2015-03-08 23:20:23 -04:00
Nathan Leniz
bc06c69a7b update user pictures on page fetch for learn-to-code 2015-03-09 07:59:18 +09:00
Nathan Leniz
8608f48d8c Delete seed tasks, email signup now defaults a picture 2015-03-09 06:51:47 +09:00
Michael Q Larson
3bd979ad08 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-08 12:16:35 -07:00
Nathan Leniz
bd81c678f9 Add story limiting for hotStories, not working on recentStories 2015-03-08 20:36:13 +09:00
Nathan
95f938efdf Merge pull request #149 from jonboiser/master 
Fixed expected answer for third test on Pairwise bonfire.
 2015-03-07 21:05:51 +09:00
Jonathan Boiser
a6cd9876d9 Rewrite description of Pairwise bonfire. Added second test illustrating the no-reuse rule. 2015-03-06 23:39:45 -08:00
Nathan Leniz
89dd38cbac Fix minor bugs 2015-03-07 03:55:59 +09:00
Nathan Leniz
6910ed0aea Nesting of comments in view, disabling comment form display button on button click 2015-03-07 01:57:09 +09:00
Michael Q Larson
7e14990698 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp into news 2015-03-05 10:56:31 -08:00
Michael Q Larson
4971d06db2 Merge branch 'master' into news 2015-03-05 10:56:20 -08:00
Michael Q Larson
4c0ff3b5ed Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into news 
Conflicts:
	views/partials/navbar.jade
 2015-03-05 10:56:06 -08:00
Nathan Leniz
41442a540f Need to work on story redirect after submission, fix url link in stories/show 2015-03-05 19:21:26 +09:00
Michael Q Larson
3d9c49b76e refactor the first challenge to make use of the array atribute we gave it 2015-03-04 22:04:58 -08:00
Michael Q Larson
d8b8373b70 do some refactoring of the camper news views 2015-03-03 19:55:04 -08:00
Nathan Leniz
6ac780e836 Rewire upvote to use post and req.body instead of req.params, add logic on click handler to reject upvotes if the user has already upvoted, coment display now works 2015-03-04 07:15:00 +09:00
Michael Q Larson
3416353baf remove mention of forum from fcc 2015-03-03 11:31:16 -08:00
Nathan Leniz
52e494407b Get initial view working, sort out mongo mess with seed file 2015-03-03 19:23:56 +09:00
Michael Q Larson
b7a95ee56f passing off hacker news clone to Nathan and his pair 2015-03-03 01:41:32 -08:00
Michael Q Larson
130f743dfc wrap some json notation that Nathan left unwrapped in code tags 2015-03-03 00:22:39 -08:00