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

119 Commits

Author SHA1 Message Date
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
Michael Q Larson
9fb048183c finish up adding the slack functionality with a redirect on the chat navbar button 2015-04-08 22:52:14 -07:00
Michael Q Larson
9145e959de able to use the api upon button click 2015-04-08 22:42:40 -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
73b536de95 update sitemap 2015-04-08 15:05:24 -07:00
Michael Q Larson
1c7d0b11b6 pass the original story URL to all comments for notification email 2015-04-07 23:39:52 -07:00
Michael Q Larson
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
Michael Q Larson
60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
Michael Q Larson
c8b72499ab dynamically redirect chat link in navbar 2015-04-05 00:16:23 -07:00
Michael Q Larson
fbeff58477 build a functional challenge map and change navbar links 2015-04-03 20:05:53 -07:00
Berkeley Martinez
e04470872e Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261 
Conflicts:
	controllers/courseware.js
 2015-03-31 13:43:58 -07:00
Michael Q Larson
ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -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
5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -07:00
Michael Q Larson
43810ccb0c Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements 
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	public/js/main.js
	views/bonfire/show.jade
 2015-03-29 14:44:49 -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
Nathan Leniz
f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
Nathan Leniz
0a07c1e397 Streaks! 2015-03-28 17:38:11 +09:00
Michael Q Larson
a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -07:00
Nathan Leniz
338d87424c More work towards unifying timestamps 2015-03-28 12:22:08 +09:00
Nathan Leniz
eb96d2cb02 Resolve merge conflict, using ziplines changes 2015-03-28 12:16:42 +09:00
Michael Q Larson
f7f7fb39b9 start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds 2015-03-27 14:36:17 -07:00
Nathan Leniz
29e29d5687 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-28 02:51:52 +09:00
Michael Q Larson
683498e62a remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting 2015-03-27 00:20:50 -07:00
jameskopacz
c17ff59aef Handle callback errors for user, bonfire, challenges, 
courseware, and resources controllers
 2015-03-26 23:41:06 -05:00
Michael Q Larson
f2f8d93f9f further work on ziplines 2015-03-21 22:49:31 -07:00
Michael Q Larson
2dbd59b7f1 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 
Conflicts:
	controllers/resources.js
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
 2015-03-21 16:36:35 -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
Nathan Leniz
6ad7c22313 Working on codemirror display issue in html coursewares 2015-03-21 16:34:06 +09:00
Nathan Leniz
5e095e8832 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-21 13:42:08 +09:00
Nathan Leniz
b35f5ca59c Working on unifying coursewares view and logic 2015-03-21 13:42:02 +09:00
Nathan Leniz
d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson
56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -07:00
Berkeley Martinez
3b913be893 handle async flow/errors of profile update 2015-03-17 21:09:54 -07:00
Berkeley Martinez
ab14b32d19 middleware using next should specify it in arguments 2015-03-17 20:42:09 -07:00
Berkeley Martinez
7b449e7a5b Add returns to error handlers 
add missing next to arguments for middleware
 2015-03-17 20:39:27 -07:00
jameskopacz
09a1463744 Dev crash err handling 2015-03-14 19:25:56 -05:00
jameskopacz
cf4c680874 Dev server crash fix 2015-03-14 18:13:08 -05:00
Michael Q Larson
8e8711d947 add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users 2015-03-11 23:58:16 -07:00
Michael Q Larson
526d874d1b add logic to truncate long headlines fetched from websites 2015-03-10 10:05:29 -07:00
Quincy Larson
c0702b9d04 Merge pull request #180 from terakilobyte/master 
MOre news updates
 2015-03-09 16:39:04 -07:00
Michael Q Larson
09e42df355 update sitemap 2015-03-09 07:18:31 -07:00
Nathan Leniz
55b047aa32 Refactor resources.js to include meta description. 2015-03-09 18:21:41 +09:00
Nathan Leniz
eb991c4f15 Add image fetching for articles that support the og:image meta tag 2015-03-09 13:08:39 +09:00
Nathan Leniz
3b3de541b3 Update username for stories and comments on username change in profile 2015-03-09 11:59:50 +09:00
Nathan Leniz
bc06c69a7b update user pictures on page fetch for learn-to-code 2015-03-09 07:59:18 +09:00