Commit Graph

822 Commits (7b7e6adff601ad6e33c58677bdc5398d5b499902)

Author SHA1 Message Date
Quincy Larson b606450aec update field guide flash message 2015-06-05 00:15:38 -07:00
terakilobyte 53a31509e6 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 22:36:08 -04:00
terakilobyte 8008997fbb Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-03 01:12:25 -04:00
Quincy Larson 1ab84010f6 fix production issue 2015-06-02 20:30:22 -07:00
Quincy Larson 16eb003c1f Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-01 16:17:19 -07:00
Quincy Larson 4f45867b6e move to freecodecamp.slack.com 2015-06-01 16:17:06 -07:00
Quincy Larson acc1236d42 remove vestigial mention of camp counselor team 2015-06-01 12:18:45 -07:00
terakilobyte 73de78bbad Fix dasherization issues for field guides. 2015-05-31 19:10:19 -04:00
terakilobyte 85e907478d Remove debug 2015-05-31 18:45:51 -04:00
terakilobyte c4a9285508 Fix dasherization for stories, closes #648 2015-05-31 18:43:11 -04:00
Quincy Larson d1c4567790 start refactoring challenge map 2015-05-31 11:27:16 -07:00
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
terakilobyte 9b8a7cdd49 Fix display of zipline/basejump completion in account view for new solutions. 2015-05-26 11:30:06 -04:00
terakilobyte 24f4648760 improve regex matching in challenge controller 2015-05-26 10:01:52 -04:00
terakilobyte 3078fa8104 Update chat link, fix 404 for ziplines and basejumps 2015-05-26 09:57:40 -04:00
terakilobyte f15d7daa2e Fix for old challenge names in account view so linking still works. 2015-05-26 08:32:17 -04: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 3a41be9e55 revert breaking changes to field guide controller 2015-05-26 01:36:37 -07:00
terakilobyte dc670055de Bug fix for headers 2015-05-26 02:17:24 -04:00
terakilobyte 873a0082a0 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-05-25 23:28:03 -04:00
terakilobyte c74a8a7fc0 Consisten dasherization in stories. Updated story cleanup script. 2015-05-25 23:27:21 -04:00
Quincy Larson eda9f17dfd add new videos 2015-05-25 20:04:19 -07:00
Quincy Larson 08837304fd fix unauthenticated challenge bug and hide pair, bug and help buttons when unauthenticated 2015-05-25 18:00:45 -07:00
Quincy Larson 95ab51986e challenges are working when authenticated 2015-05-25 17:52:00 -07:00
terakilobyte 5f169001f6 Change migration middleware to not rely on boolean flag in User model 2015-05-25 19:55:18 -04:00
terakilobyte 0debdc5fd6 Use middleware to migrate users 2015-05-25 19:02:09 -04:00
terakilobyte 1c4b40c8e6 Update to bonfires. Successfully completing triggers a save. "Paired with" form field moved to bonfire view. Controller hardened for checking pair as button is no longer disabled for unfound username 2015-05-25 17:27:27 -04: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 3ee2c29324 more challenge-related view and copy improvements 2015-05-24 23:51:56 -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 42d48dbcec Fixes email signin from field-guide. Closes #429 2015-05-22 08:59:25 -04:00
terakilobyte a4be01aabb Merge #470 2015-05-22 08:52:03 -04:00
terakilobyte fd8a291ecd Fix import of constantStrings.json in resources controller 2015-05-22 08:39:03 -04:00
terakilobyte 96556a4a87 Fix email-signin redirect when logging in from camper news 2015-05-22 08:34:28 -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
Berkeley Martinez 92f4c7a41a Use findone in controllers/story
also fixes some linting issues
closes #469
2015-05-21 09:15:16 -07:00
Berkeley Martinez 3f690629b0 Fix add missing return
add notes
2015-05-21 00:17:44 -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