gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,537 Commits 9 Branches 0 Tags
4092dcecf72ef26a51f5a57e650bacd3c704d1ca
Commit Graph

129 Commits

Author SHA1 Message Date
Quincy Larson
43f347bae0 Merge branch 'calculator' into staging 
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
 2015-06-14 01:10:48 -07:00
Quincy Larson
3979dc42b9 start importing calculator 2015-06-12 11:59:07 -07:00
Quincy Larson
7077b18480 fix twitch view 2015-06-11 18:57:22 -07:00
Quincy Larson
243f4cd2ec update twitch page and add new cities 2015-06-10 23:04:43 -07:00
Quincy Larson
8900f8f8a1 fix 840 2015-06-04 14:18:47 -07:00
Quincy Larson
c7cbdd7e69 update forms 2015-06-04 12:32:19 -07:00
terakilobyte
d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00
Quincy Larson
d7a600bc20 update nonprofit buttons to allow directory access from nonprofit landing page 2015-06-01 12:39:01 -07:00
Quincy Larson
acc1236d42 remove vestigial mention of camp counselor team 2015-06-01 12:18:45 -07:00
Quincy Larson
560e66527b add jobs 2015-05-28 16:40:22 -07:00
Quincy Larson
4e4031c5d4 hotfixes - hide help/pair/bug buttons unless has created slack account 2015-05-26 02:36:29 -07:00
Quincy Larson
7279559c41 Merge branch 'staging' into nonprofit-improvements 
Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade
 2015-05-22 19:36:15 -07:00
Quincy Larson
b9adbd5976 add jobs page 2015-05-22 19:30:56 -07:00
terakilobyte
5ed5d5cd63 Factor out more mentions of courseware and bonfire. Remove extraneous methos from resources.js. Refactor sitemap to use new structure. 2015-05-20 22:45:19 -04:00
Nathan
770e298b65 Merge pull request #419 from QuincyLarson/point-fix 
add campwide meeting and fix user show points
 2015-05-05 12:48:32 -04:00
Quincy Larson
200fa53012 add campwide meeting and fix user show points 2015-05-05 09:22:38 -07:00
Quincy Larson
ef48efe8a8 improve sitemap 2015-05-02 16:50:59 -07:00
Quincy Larson
d492afb4f5 Merge branch 'mobile-news' 
Conflicts:
	views/challengeMap/show.jade
 2015-05-01 21:54:10 -07:00
Quincy Larson
19456f2e23 add unsubscribe path 2015-04-30 23:41:40 -07:00
Quincy Larson
fb3a116fff Merge branch 'master' into mobile-news 
Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade
 2015-04-30 19:10:10 -07:00
Quincy Larson
fefd7e19f5 update the sitemap to new news path 2015-04-30 17:22:14 -07:00
Quincy Larson
0bbc803955 replace landing youtube videos with superior vimeo video 2015-04-28 12:11:49 -07:00
terakilobyte
cef70a67a9 Fix broken url 2015-04-27 19:39:58 -04:00
Quincy Larson
fd456ec9be make new landing pages and forms for project managers and nonprofits 2015-04-27 16:17:29 -07:00
Quincy Larson
e49c9ca87e make some improvements to the field guide articles and move the bonfire styleguide into field guides 2015-04-24 21:30:22 -07:00
Nathan
15ea7f3473 Merge pull request #363 from FreeCodeCamp/root 
Root
 2015-04-24 19:16:43 -04:00
terakilobyte
f79834bec9 Greatly increase the speed of sitemap by a factor of at least 10 (Nathan, Quincy, and Berkeley pairing). 2015-04-24 18:57:55 -04:00
terakilobyte
a8689fec4a Refactor sitemap function to use async for for easier reasoning. Factor out the user fetch as this was causing a huge blocking operation and eating a massive amount of memory. 2015-04-24 13:13:50 -04:00
Quincy Larson
bea77c580e redirect user to bonfires if has completed waypoints but not bonfires gulp 2015-04-24 02:02:02 -07:00
Quincy Larson
bf723b522b start making ux changes 2015-04-23 23:46:58 -07:00
Quincy Larson
92db9e5aba fix the sitemap 2015-04-23 11:56:37 -07:00
Quincy Larson
be36f3dafd remove confusing modal 2015-04-23 07:57:14 -07: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
d10011acc3 Pull some useful changes from aborted branch 2015-04-16 23:54:26 -07:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04: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
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
73b536de95 update sitemap 2015-04-08 15:05:24 -07:00
Michael Q Larson
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
Michael Q Larson
840930d967 get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map 2015-04-05 18:37:58 -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
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
ef27fda537 remove references to meeting from announcements and notification modal 2015-03-28 10:14:49 -07:00
Michael Q Larson
c69d919d46 Merge branch 'master' into ux-improvements 2015-03-27 10:28:31 -07: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
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