Commit Graph

145 Commits

Author SHA1 Message Date
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
27a14dbf0f Create helper methods in resources. Get map view working. 2015-05-20 13:07:41 -04:00
56bae0ca98 Users can now jump around and continue a linear progression through challenges. Added getstuff for easy debugging 2015-05-20 00:38:25 -04:00
a174a1c630 Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js 2015-05-19 22:31:01 -04:00
ae70d0abd9 Merge branch 'courseware' into challenge-restructure 2015-05-18 23:33:03 -07:00
ba29f0533a Updated to show how json should be modeled, fleshed out resources to load new challengeMap stub 2015-05-18 22:03:27 -04:00
e6851b22d8 Minor updates 2015-05-18 21:20:32 -04:00
2d981d833c additional work on courseware 2015-05-15 23:34:20 -07:00
94abc6cf5b Begin restructuring all Coursewares and Bonfires to one unified model and flow. 2015-05-16 00:39:43 -04:00
8981be2dca add more courseware and a working submit route 2015-05-15 18:43:07 -07:00
b73c7eac62 Ensure all bonfires have names in account profile view. Add more aptly names state flag for future user data massaging. 2015-05-05 16:12:53 -04:00
d3aaa5a11e Ensure twit exists in package.json and remove unecessary console statement 2015-05-05 14:24:07 -04:00
82a1680943 Resolve merge conflicts 2015-05-05 14:18:28 -04:00
cbdba845df Resolve merge conflicts 2015-05-02 00:41:38 -04:00
1ec3ef7433 remove errant console.log 2015-04-30 23:42:46 -07:00
19456f2e23 add unsubscribe path 2015-04-30 23:41:40 -07:00
cc13b325d6 fix some issues with @terakilobyte and beautify the camper news index view 2015-04-30 14:55:00 -07:00
e77eae2643 Edited per instructions in codepen to let users specify additional screen names 2015-04-29 20:07:38 -04:00
ffa2404993 Added API endpoint for twitter calls to use in codepen. NOTE added tokens to env file 2015-04-29 08:00:57 -04:00
fd456ec9be make new landing pages and forms for project managers and nonprofits 2015-04-27 16:17:29 -07:00
a9feb269f6 Remove some debug/console.log statements.
Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes #367.
2015-04-25 12:28:14 -04:00
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
096edd553b Factor out $('title') to a re-usable variable to make the linter happy and remove old database lookup based on old challenge architecture. 2015-04-24 15:53:22 -04:00
b3929f693b Clean up privacy policy routing. Adopt same pattern from courseware/bonfire mongo lookup to fieldguides. 2015-04-24 13:49:32 -04:00
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
92db9e5aba fix the sitemap 2015-04-23 11:56:37 -07:00
f1acc59f82 Fix bug where users could get points for completing the same challenge. 2015-04-17 01:39:55 -04:00
b9372b9af6 Resolve merge conflicts using Webstorm's merge integration tool. v2 2015-04-17 00:39:48 -04:00
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
9fb048183c finish up adding the slack functionality with a redirect on the chat navbar button 2015-04-08 22:52:14 -07:00
9145e959de able to use the api upon button click 2015-04-08 22:42:40 -07:00
7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
73b536de95 update sitemap 2015-04-08 15:05:24 -07:00
1c7d0b11b6 pass the original story URL to all comments for notification email 2015-04-07 23:39:52 -07:00
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
c8b72499ab dynamically redirect chat link in navbar 2015-04-05 00:16:23 -07:00
fbeff58477 build a functional challenge map and change navbar links 2015-04-03 20:05:53 -07:00
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
ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -07:00
106a10edca add a modal that allows one to scroll through all wiki pages 2015-03-30 15:55:00 -07:00
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
660214f87e able to seed and view wiki content 2015-03-30 13:48:54 -07:00
5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -07:00
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
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
f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
0a07c1e397 Streaks! 2015-03-28 17:38:11 +09:00
a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -07:00
338d87424c More work towards unifying timestamps 2015-03-28 12:22:08 +09:00