Commit Graph

164 Commits

Author SHA1 Message Date
Quincy Larson
5380a9ea74 add yet unfinished curriculum overview to challengeMap 2015-05-31 02:01:55 -07:00
Quincy Larson
ebe3e2b04a Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	controllers/resources.js
2015-05-29 10:44:03 -07:00
Quincy Larson
1b9325dec0 start adding additional tests to html waypoints to make them more robust 2015-05-29 10:43:14 -07:00
Quincy Larson
560e66527b add jobs 2015-05-28 16:40:22 -07:00
Quincy Larson
673a617151 create pair, help, bug modals 2015-05-28 14:29:45 -07:00
Quincy Larson
0bade642a9 fix some aspects of zipline/basejump submission 2015-05-26 13:09:07 -07:00
Quincy Larson
4e4031c5d4 hotfixes - hide help/pair/bug buttons unless has created slack account 2015-05-26 02:36:29 -07:00
terakilobyte
fb3447c366 Update challengeMap display, more consistent dasherization 2015-05-25 16:02:25 -04:00
Quincy Larson
f9386d1291 switching to Terakilobyte's computer 2015-05-25 12:20:20 -07:00
Quincy Larson
bf0cf4cc7d add the bug, pair and help buttons to challenge views 2015-05-24 00:53:01 -07:00
Quincy Larson
1949005632 remove modal from field guide and create index view 2015-05-23 18:39:30 -07:00
Quincy Larson
27a35e65a7 make a ton of small improvements related to github issues 2015-05-23 16:48:55 -07:00
Quincy Larson
a3ab32f339 improve get help and add find a pair 2015-05-23 00:53:41 -07:00
terakilobyte
b626c811d0 Add initial I need help button and slack webhook integration 2015-05-23 02:26:29 -04: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
fd8a291ecd Fix import of constantStrings.json in resources controller 2015-05-22 08:39:03 -04:00
Berkeley Martinez
b58b725f9d Fix Lint all the controllers
Fix many undefined variables
Fix many unhandled error calls
2015-05-21 11:07:40 -07:00
terakilobyte
16f9478c3e Move bonfire view into courseware view folder. Update seed file to exit when finished. 2015-05-21 00:34:51 -04: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
terakilobyte
27a14dbf0f Create helper methods in resources. Get map view working. 2015-05-20 13:07:41 -04:00
terakilobyte
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
terakilobyte
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
Quincy Larson
ae70d0abd9 Merge branch 'courseware' into challenge-restructure 2015-05-18 23:33:03 -07:00
terakilobyte
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
terakilobyte
e6851b22d8 Minor updates 2015-05-18 21:20:32 -04:00
Quincy Larson
2d981d833c additional work on courseware 2015-05-15 23:34:20 -07:00
terakilobyte
94abc6cf5b Begin restructuring all Coursewares and Bonfires to one unified model and flow. 2015-05-16 00:39:43 -04:00
Quincy Larson
8981be2dca add more courseware and a working submit route 2015-05-15 18:43:07 -07:00
terakilobyte
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
terakilobyte
d3aaa5a11e Ensure twit exists in package.json and remove unecessary console statement 2015-05-05 14:24:07 -04:00
terakilobyte
82a1680943 Resolve merge conflicts 2015-05-05 14:18:28 -04:00
terakilobyte
cbdba845df Resolve merge conflicts 2015-05-02 00:41:38 -04:00
Quincy Larson
1ec3ef7433 remove errant console.log 2015-04-30 23:42:46 -07:00
Quincy Larson
19456f2e23 add unsubscribe path 2015-04-30 23:41:40 -07:00
Quincy Larson
cc13b325d6 fix some issues with @terakilobyte and beautify the camper news index view 2015-04-30 14:55:00 -07:00
A. Drake
e77eae2643 Edited per instructions in codepen to let users specify additional screen names 2015-04-29 20:07:38 -04:00
A. Drake
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
Quincy Larson
fd456ec9be make new landing pages and forms for project managers and nonprofits 2015-04-27 16:17:29 -07:00
terakilobyte
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
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
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
terakilobyte
b3929f693b Clean up privacy policy routing. Adopt same pattern from courseware/bonfire mongo lookup to fieldguides. 2015-04-24 13:49:32 -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
92db9e5aba fix the sitemap 2015-04-23 11:56:37 -07:00
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