Commit Graph

2961 Commits

Author SHA1 Message Date
04d9856d4f Remove vomit route. 2015-04-17 01:48:06 -04:00
dbc99eafb6 Update chat link and copy. 2015-04-17 01:41:01 -04:00
edefd90268 Fix bug where users could get points for completing the same challenge. 2015-04-17 01:40:32 -04: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
56e45ba9dd resolve merge conflict 2015-04-15 18:35:06 -04:00
8119858a24 Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show 2015-04-15 18:20:40 -04:00
6341b1158b add eslint task to gulp to let us know how we need to write better code 2015-04-15 18:20:20 -04:00
d20aa1cf3c Merge pull request #288 from FreeCodeCamp/resources
Create Wiki controller to replace our static pages
2015-04-15 01:03:19 -07:00
d968524c69 attempt to fix wording on seek and destroy bonfire issue #293 2015-04-15 00:59:12 -07:00
993db11189 Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show 2015-04-15 00:12:27 -07:00
22be5b90ba more improvements to the basejump challenges 2015-04-15 00:12:16 -07:00
27f80eddea Update README.md with better contribution directions. Point to AirBnB styleguide. (closes #307) 2015-04-15 00:07:14 -07:00
255a6b48be Merge pull request #298 from aldraco/coursewaresErr
Issue #277 Fix- coursewares chai-jquery test issue
2015-04-14 23:43:38 -07:00
3748356079 Update user migration script to ensure user model validity. 2015-04-15 00:53:36 -04:00
ddb88643e0 Nathan's updates to the userMigration script' 2015-04-14 21:19:05 -07:00
e033f224bc fix challenge map to redirect to nonprofits 2015-04-14 20:20:38 -07:00
e0aa084c7a finish getting field-guide working and improve zipline show view 2015-04-14 20:12:47 -07:00
9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04:00
6b671f7d1c Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show 2015-04-14 19:39:51 -07:00
d7a698f629 fix the field guide 2015-04-14 19:39:25 -07:00
be00c7e402 Revert "remove inspectlet thinking this may be the malware twitter is finding"
This reverts commit 4b9be16b24.
2015-04-14 16:03:27 -07:00
da738ed82d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-14 13:44:49 -07:00
4b9be16b24 remove inspectlet thinking this may be the malware twitter is finding 2015-04-14 13:44:17 -07:00
d1e4175624 additional work on basejumps 2015-04-14 13:43:10 -07:00
18bdefbfac Add in message about twitter authorization being down temporarily to error handler 2015-04-14 16:17:58 -04:00
a6d5721458 Switch from debug to console.log 2015-04-14 15:42:46 -04:00
4fb119ab68 Add debug to app.js to troubleshoot twitter signin in production, unable to repliate locally 2015-04-14 15:36:02 -04:00
7912dc722d Update bonfire challenge in courseware to encourage people not to try to complete all bonfires back to back, and not to worry if new bonfires are added. 2015-04-14 11:15:06 -04:00
77b5265fde start creating the basejump instructions 2015-04-13 21:56:51 -05:00
324e7fcbd3 Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show 2015-04-13 21:31:02 -04:00
96ac90274d Update User model to make migration easier and complete user migration script 2015-04-13 21:30:08 -04:00
11548bfcf9 add checkbox cross off effect to challenges and reword pairwise bonfire 2015-04-13 02:41:42 -04:00
83c14cccc4 continue work on user migration 2015-04-13 01:03:26 -04:00
e98f445444 update the challenge sequencing 2015-04-13 00:02:21 -04:00
f85804f270 start writing user migration for challenge completion 2015-04-12 02:07:01 -04:00
9a16ddad0a Merge pull request #290 from storbeck/ux-improvements
added 5 new bonfires
2015-04-12 00:02:10 -04:00
332d4f1875 refactor story.js mailer and remove some cruft 2015-04-09 17:50:10 -07:00
6f752b2437 minor tweaks to landing page 2015-04-09 13:06:36 -07:00
62cabd56ff update camper news and chat challenges to have new videos and updated copy 2015-04-09 12:58:30 -07:00
6deb527e98 Merge pull request #303 from FreeCodeCamp/slack
We're ready to move to slack from gitter thanks to @storbeck
2015-04-09 10:50:06 -07: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
e3acdb9ebb add slack key to secrets.js 2015-04-08 21:53:08 -07:00
3b7ea3d9a4 start work on challenge-migraiton 2015-04-08 18:03:06 -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
29b4e3b970 get seed data seeding and improve application submitted button 2015-04-08 14:57:08 -07:00
c02fafa6a9 add status, turn hours into integer, create a directory view of all nonprofits 2015-04-08 14:36:05 -07:00