Commit Graph

805 Commits (9a7a8bacfc29f6503cbc49e437b202c0bf451249)

Author SHA1 Message Date
Michael Q Larson 106a10edca add a modal that allows one to scroll through all wiki pages 2015-03-30 15:55:00 -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
Berkeley Martinez b6da312547 Merge pull request #278 from FreeCodeCamp/accessability
Fix some bugs, improver perf of show all bonfires/challenges and add buttons to challenge views
2015-03-30 13:12:56 -07:00
Michael Q Larson 83a9223dcc respond to @BerkeleyTrue feedback 2015-03-30 13:09:24 -07:00
Michael Q Larson 64c4bfd566 remove a leftover console.log 2015-03-30 12:55:31 -07:00
Michael Q Larson 97c978dc7c Make Basejumps show up properly and get their github routes persisting in the database. 2015-03-29 18:13:04 -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 aa01a896a5 Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids 2015-03-29 17:09:12 -07:00
Michael Q Larson f0ae47dcf2 Fix show all bonfire bug where it wouldn't show while unauthenticated; add sr-only class to completed bonfires 2015-03-29 16:47:49 -07:00
Michael Q Larson 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
Quincy Larson 4405defb0f Merge pull request #275 from storbeck/master
Posts completed status when challenge 2 is opened for issue #274
2015-03-29 14:34:13 -07:00
Quincy Larson 7a27ded5bc Merge pull request #273 from aldraco/coursewaresErr
Coursewares error handling (issue #261)
2015-03-29 14:32:16 -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
Nathan Leniz 75073e362a Add errantly removed ramda include 2015-03-29 21:41:29 +09:00
Nathan Leniz aa2f0e8af8 Change completion event to remove duplicate entries if the user states they paired with themselves 2015-03-29 21:15:18 +09:00
Nathan Leniz 1fc3cffdbf Add .editorconfig to enforce certain automatic behavior on all editors,
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
Nathan Leniz f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
Michael Q Larson 47d0d8e0da Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-28 23:43:08 -07:00
Quincy Larson 1b247f97fc Merge pull request #262 from aldraco/bonfirelinks
Bonfire MDN links - Issue #255
2015-03-28 20:34:34 -07:00
Geoff Storbeck 64ccae938a Posts completed status when challenge 2 is opened for issue #274 2015-03-28 17:18:09 -04:00
Ashley Drake 3e839030ac Fixed async function 2015-03-28 14:08:51 -04:00
Ashley Drake 69533424a3 Fixed user.save error callback handler 2015-03-28 14:01:31 -04:00
Ashley Drake ca3d46a776 fixed obvious error handlers 2015-03-28 13:53:26 -04:00
Michael Q Larson ef27fda537 remove references to meeting from announcements and notification modal 2015-03-28 10:14:49 -07:00
Nathan Leniz 65a4c923b2 resolve merge conflicts 2015-03-29 00:51:09 +09:00
Nathan Leniz 6a19dc9bda Zipline/Basejump view with controller logic to serve. Will have to change based upon json 2015-03-29 00:09:50 +09:00
Michael Q Larson 672df775a2 add a zipline and a base jump to the seed file 2015-03-28 07:47:47 -07:00
Nathan Leniz 9e1a4a1348 Streak display in account/show.jade, refactor courseware.json for error handling and linting 2015-03-28 23:42:07 +09:00
Nathan Leniz ff94d10aa8 resolve merge conflict, favoring upstream 2015-03-28 17:41:07 +09:00
Nathan Leniz 0a07c1e397 Streaks! 2015-03-28 17:38:11 +09:00
Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements
Conflicts:
	views/coursewares/showJS.jade
2015-03-28 00:24:41 -07:00
Michael Q Larson a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -07:00
Michael Q Larson e4eb5052c7 intermediary work on ziplines 2015-03-27 23:15:39 -07:00
Nathan Leniz 338d87424c More work towards unifying timestamps 2015-03-28 12:22:08 +09:00
Nathan Leniz eb96d2cb02 Resolve merge conflict, using ziplines changes 2015-03-28 12:16:42 +09:00
Nathan Leniz 947b034533 Resolve merge conflict (spacing issue in app.js) 2015-03-28 11:35:14 +09:00
Nathan Leniz efd7707ac8 Move to Mongoose 4.0, begin implementation of streak 2015-03-28 11:34:12 +09:00
Michael Q Larson f7f7fb39b9 start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds 2015-03-27 14:36:17 -07:00
Michael Q Larson 94b6cae3ec apply Nathan's insights into multistep form' 2015-03-27 12:36:21 -07:00
Nathan Leniz 29e29d5687 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-28 02:51:52 +09: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 e78609171d continue work on the param-based funnel 2015-03-26 23:33:52 -07:00
jameskopacz c17ff59aef Handle callback errors for user, bonfire, challenges,
courseware, and resources controllers
2015-03-26 23:41:06 -05:00
Ashley Drake 4cad7c1aee fixed comma error for merge. 2015-03-26 09:53:22 -04:00
Michael Q Larson d64b5c5718 add progress bar to nonprofit project proposal wizard 2015-03-25 15:25:19 -07:00
Nathan Leniz e9c6498cdf Error handling 2015-03-26 02:28:04 +09:00
Michael Q Larson 6e4067ee00 most views are now in place 2015-03-24 22:12:16 -07:00
Michael Q Larson d4935d44de add the routes, controller actions and views for the nonprofit wizard 2015-03-24 21:46:42 -07:00
Michael Q Larson bcec96e427 half way done with the initial views and controllers 2015-03-24 19:08:26 -07:00
Nathan Leniz 83d23ed2a4 Remove sending 500 response to user manually and rely on middleware instead 2015-03-24 18:28:02 +09:00
Nathan Leniz d0a00428d5 Refactor story.js to use sendStatus instead of status, ensure returning on next(err) 2015-03-24 18:26:02 +09:00
A. Drake dbc57dd0cb links iterated through on the page. TODO formatting and adding more data. 2015-03-23 23:55:24 -04:00
A. Drake 0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
Nathan Leniz 999ba14db7 Fix indenting to 2 spaces, remove most lint errors 2015-03-22 20:20:08 +09:00
Nathan Leniz fb5e8dc387 Remove debug statement, closes #156, story decay to 32 hours 2015-03-22 20:11:37 +09:00
Nathan Leniz 31ce7b686a User will now get a point for posting a story as well as receiving an upvote on a posted story 2015-03-22 20:07:08 +09:00
Michael Q Larson f2f8d93f9f further work on ziplines 2015-03-21 22:49:31 -07:00
Michael Q Larson 91edf73965 start building zipline views and controller 2015-03-21 17:23:13 -07:00
Michael Q Larson 2dbd59b7f1 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
	controllers/resources.js
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
2015-03-21 16:36:35 -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
Nathan Leniz ac511982a4 User facing challenge mentions now point to coursewares, remove completed view from account/show 2015-03-21 18:42:19 +09:00
Nathan Leniz 9cdb2588b4 resolve merge conflict 2015-03-21 17:04:31 +09:00
Michael Q Larson 9c5d9eea23 try shorter decay rate 2015-03-21 00:47:21 -07:00
Nathan ec5b3e4b84 Change from 1 billion seconds to 172 million. 2015-03-21 16:41:29 +09:00
Nathan bc69233226 Merge pull request #226 from FreeCodeCamp/email-validation
fix email validation issue #212
2015-03-21 16:40:03 +09:00
Nathan Leniz 752f4125d4 Change decay rate of hot stories to 48 hours 2015-03-21 16:36:20 +09:00
Nathan Leniz 6ad7c22313 Working on codemirror display issue in html coursewares 2015-03-21 16:34:06 +09:00
Nathan Leniz a2e2e6bfa2 Improve profile view on devices, store name in completedCoursewares for display in account/show 2015-03-21 15:44:18 +09:00
Nathan Leniz be91849d20 coursewares properly push timestamps to user object 2015-03-21 14:28:00 +09:00
Nathan Leniz 5e095e8832 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-21 13:42:08 +09:00
Nathan Leniz b35f5ca59c Working on unifying coursewares view and logic 2015-03-21 13:42:02 +09:00
Nathan Leniz d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09: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
Michael Q Larson 56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -07:00
Michael Q Larson 5a15da975f fix email validation issue #212 2015-03-17 23:18:03 -07:00
Berkeley Martinez 3b913be893 handle async flow/errors of profile update 2015-03-17 21:09:54 -07:00
Berkeley Martinez ab14b32d19 middleware using next should specify it in arguments 2015-03-17 20:42:09 -07:00
Berkeley Martinez 7b449e7a5b Add returns to error handlers
add missing next to arguments for middleware
2015-03-17 20:39:27 -07:00
Berkeley Martinez 9e67ebf3c8 Merge pull request #204 from jameskopacz/jameskopacz-patch-199
Dev server crash fix
2015-03-17 20:10:29 -07:00
Michael Q Larson f1dcb4c373 start fixing the password in scope potential corner case security issue 2015-03-17 17:22:58 -07:00
Quincy Larson f144e84310 Merge pull request #214 from MrRenter/upvoteFix
Upvote fix
2015-03-17 15:48:15 -07:00
Michael Q Larson 95c249afc6 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	.gitignore
2015-03-17 15:41:52 -07:00
Nathan Leniz 514b5ea572 fix bug in server side checking for username, closes #219 2015-03-18 07:15:25 +09:00
Nathan Leniz c9dd6366ec Compare against userIds 2015-03-18 05:01:14 +09:00
Michael Q Larson f3f6d0d16e update title for portfolio views and add public/js/bundle.js to gitignore 2015-03-17 10:06:17 -07:00
Nathan Leniz 8b491ed27e Fix display of comments if user is not logged in, disable reply button if no user, reject attempted comments if no user and no author 2015-03-17 17:44:52 +09:00
Renter 7d83453259 Update story.js
fixed link 151 spacing
2015-03-17 03:32:41 -04:00
MrRenter 2d5b34802b so spaces and tabs are totally differnt...whitespace fixes 2015-03-17 03:20:07 -04:00
MrRenter 1320a14851 fixed crash bug if user was logged off 2015-03-17 03:15:00 -04:00
MrRenter c9970c1725 Hide upvote arrow on news page if already upvoted. Make it disappear on upvote 2015-03-17 03:00:37 -04:00
jameskopacz 09a1463744 Dev crash err handling 2015-03-14 19:25:56 -05:00
jameskopacz cf4c680874 Dev server crash fix 2015-03-14 18:13:08 -05:00
Michael Q Larson 8e8711d947 add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users 2015-03-11 23:58:16 -07:00
Nathan Leniz ef24ca746c Allow the use of quotation marks in original post and comments in camper news 2015-03-12 08:20:23 +09:00
Michael Q Larson 09f7be37ee make reply button consistent with discuss button throughout camper news 2015-03-10 10:22:20 -07:00
Michael Q Larson 526d874d1b add logic to truncate long headlines fetched from websites 2015-03-10 10:05:29 -07:00
Quincy Larson c0702b9d04 Merge pull request #180 from terakilobyte/master
MOre news updates
2015-03-09 16:39:04 -07:00
Nathan Leniz 5ddc87a072 Missing next declaration 2015-03-10 08:18:17 +09:00
Nathan Leniz d6a6834971 Validate min length of 5 for username, 8 for password 2015-03-10 08:17:10 +09:00
Nathan Leniz a65216e29e don't throw err on mongo errors but send 500 and call next 2015-03-10 08:15:43 +09:00
Michael Q Larson 09e42df355 update sitemap 2015-03-09 07:18:31 -07:00
Nathan Leniz 64d1c4a908 Server side checking of user input before allowing signup. 2015-03-09 18:35:56 +09:00
Nathan Leniz 3bfad2e272 Sanitize HTML on comments and story submission and properly use req.params. Code review cleanup 2015-03-09 18:30:37 +09:00
Nathan Leniz 55b047aa32 Refactor resources.js to include meta description. 2015-03-09 18:21:41 +09:00
Nathan Leniz eb991c4f15 Add image fetching for articles that support the og:image meta tag 2015-03-09 13:08:39 +09:00
Nathan Leniz 3b3de541b3 Update username for stories and comments on username change in profile 2015-03-09 11:59:50 +09:00
Nathan Leniz bc06c69a7b update user pictures on page fetch for learn-to-code 2015-03-09 07:59:18 +09:00
Michael Q Larson 8d2552fe57 give users without images a default image and retroactively give that to all their stories and comments and also make some UI changes to stories. 2015-03-08 15:39:36 -07:00
Michael Q Larson 4529558ce4 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-08 15:16:50 -07:00
Michael Q Larson 37c98a95ed add check for missing image 2015-03-08 15:16:44 -07:00
Nathan Leniz 7a56d4fcb2 Remove debug/console.log statements 2015-03-09 06:58:08 +09:00
Nathan Leniz 8608f48d8c Delete seed tasks, email signup now defaults a picture 2015-03-09 06:51:47 +09:00
Nathan Leniz 38dc4378df Add ranking algorithm to decay posts over time, add default image to user instead of gravatar 2015-03-09 06:09:51 +09:00
Nathan Leniz bd81c678f9 Add story limiting for hotStories, not working on recentStories 2015-03-08 20:36:13 +09:00
Nathan Leniz 6283ec1174 resolve show.jade merge conflict 2015-03-08 18:50:28 +09:00
Nathan Leniz de91be44da comment submit time bug fixed 2015-03-08 18:48:20 +09:00
Michael Q Larson aacb0070b3 add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces 2015-03-08 01:36:09 -08:00
Nathan Leniz f367a0310e Finalizing display issues for news release 2015-03-08 16:50:51 +09:00
Nathan Leniz 1edc1aa3cf Begin refactoring story lists to order list, remove separate rank div 2015-03-08 12:32:35 +09:00
Nathan Leniz 790a2d987b Fighting CSS 2015-03-08 11:53:03 +09:00
Michael Q Larson 0a741f0e54 further ux improvements to branch 2015-03-07 17:38:47 -08:00
Michael Q Larson 49886ca097 remove node-rest-client and use request 2015-03-07 15:57:30 -08:00
Nathan Leniz b776be58e5 Finish full functionality for intial release of camper news 2015-03-07 20:51:20 +09:00
Nathan Leniz a3769f6507 Story submission now with a description, refactor show to display description above comment box 2015-03-07 18:26:49 +09:00
Nathan Leniz 9bea52d42f Refactor post flow, get url info back from server, redirect to final submission form 2015-03-07 17:42:22 +09:00
Nathan Leniz b655cb7532 Title scraping in resource.js getURLTitle function 2015-03-07 16:08:15 +09:00
Nathan Leniz 39d66ea0da Merge branch 'master' into news 2015-03-07 15:23:56 +09:00
Michael Q Larson e6cf415f88 fix an issue of unathenticated users not being able to access challenges 2015-03-06 17:49:14 -08:00
Nathan Leniz 76842ee713 Respond with 404 if no query found ref #151 2015-03-07 04:51:00 +09:00
Nathan Leniz 89dd38cbac Fix minor bugs 2015-03-07 03:55:59 +09:00
Nathan Leniz be32cd51b8 Added text-index searching 2015-03-07 03:06:38 +09:00
Nathan Leniz 6910ed0aea Nesting of comments in view, disabling comment form display button on button click 2015-03-07 01:57:09 +09:00
Nathan Leniz aad15b88ba fudging around with interpreting opengraph info in resources.js 2015-03-06 17:25:28 +09:00
Michael Q Larson c8c396981a update sitemap 2015-03-06 00:13:58 -08:00
Nathan Leniz 6fc72de232 add basic text search for post headlines 2015-03-06 09:20:30 +09:00
Nathan Leniz 0276c6867e Display hot/recent/submit/search views correctly through index 2015-03-06 08:20:49 +09:00
Nathan Leniz 5440efc729 Wire hot, recent, submit, and search views in app and controller, modified button navigation to fetch their routes 2015-03-06 08:11:18 +09:00
Michael Q Larson f1f3258fe3 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp into news 2015-03-05 13:42:14 -08:00
Nathan Leniz 046a209637 Comment submission now works on main story, need to refresh page after submission to display new comment 2015-03-06 06:08:40 +09:00
Michael Q Larson 7e14990698 Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp into news 2015-03-05 10:56:31 -08:00
Michael Q Larson 4c0ff3b5ed Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into news
Conflicts:
	views/partials/navbar.jade
2015-03-05 10:56:06 -08:00
Nathan Leniz 8552a06ac6 Add url correcting in case user forgets http:// or https:// so url works properly in show view, remove upvote arrows from index view 2015-03-05 19:54:31 +09:00
Nathan Leniz 40a42e29c2 Fixed url redirect after submission, upvoting now works 2015-03-05 19:40:44 +09:00
Nathan Leniz 41442a540f Need to work on story redirect after submission, fix url link in stories/show 2015-03-05 19:21:26 +09:00
Michael Q Larson d8b8373b70 do some refactoring of the camper news views 2015-03-03 19:55:04 -08:00
Nathan Leniz 6ac780e836 Rewire upvote to use post and req.body instead of req.params, add logic on click handler to reject upvotes if the user has already upvoted, coment display now works 2015-03-04 07:15:00 +09:00
Michael Q Larson 3416353baf remove mention of forum from fcc 2015-03-03 11:31:16 -08:00
Nathan Leniz 4b84b49d07 Added start of individual post view and post lists view, wired upvoting functionality for individual posts 2015-03-03 22:03:33 +09:00
Nathan Leniz 94bbb7a4a5 Beginnings of the show individual post view 2015-03-03 19:50:16 +09:00
Nathan Leniz 52e494407b Get initial view working, sort out mongo mess with seed file 2015-03-03 19:23:56 +09:00
Michael Q Larson b7a95ee56f passing off hacker news clone to Nathan and his pair 2015-03-03 01:41:32 -08:00
Michael Q Larson a524ffdde0 beautify learn-to-code 2015-02-26 14:38:22 -08:00
Michael Q Larson 120cc113b9 current work on d3 2015-02-22 23:47:30 -08:00
Michael Q Larson 55f892a974 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 2015-02-22 18:16:42 -08:00
Michael Q Larson fc1d560a89 start refactoring points into progressTimestamps which is essentially points with timestamps 2015-02-22 18:16:26 -08:00
Nathan Leniz ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
Nathan Leniz 3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09:00
Nathan Leniz b5a449cb1c Cross off completed bonfires in list of all bonfires in modal 2015-02-22 17:36:43 +09:00
Nathan Leniz a197e99b1e Starting bonfires view partial, ajax call works, need to work into view 2015-02-22 16:27:38 +09:00
Nathan Leniz 8a5e3d9a9a Merge branch 'ux-improvements' of https://github.com/freecodecamp/freecodecamp into ux-improvements 2015-02-22 14:58:50 +09:00
Nathan Leniz 89eb361ec3 Merge master 2015-02-22 14:58:45 +09:00
Michael Q Larson 53bbe90290 find a son format that works with d3 2015-02-21 21:45:25 -08:00
Michael Q Larson 74f6fc6763 continue work trying to get d3 to work 2015-02-20 23:55:19 -08:00
Michael Q Larson 174ed6122b fix an issue of bonfire not lowercasing input from the user when accepting a pairedWith username 2015-02-20 00:13:07 -08:00
Michael Q Larson 85f6c6eb4d make both score and picture redirect to portfolio, make chat and forum links redirect universally regardless of completion of challenges, simplify accounts page 2015-02-19 16:33:08 -08:00
Michael Q Larson 749954542f refactor learn-to-code view to look more visual and have fewer components 2015-02-18 22:58:10 -08:00
Michael Q Larson 4ef8e7eda4 reverse the attempts to allow cross site scripts and just use relative paths for now 2015-02-17 15:35:16 -08:00
Michael Q Larson 5d9e82f9cb update format of AJAX call to json 2015-02-17 15:08:57 -08:00
Michael Q Larson 312debdb95 send json 2015-02-17 14:57:11 -08:00
Michael Q Larson 09e9dcefe0 attempt to configure mimetype for ajax calls 2015-02-17 14:52:46 -08:00
Michael Q Larson 0d3ee3c2b4 add screen hero installation view 2015-02-17 14:10:15 -08:00
Michael Q Larson 449589827c add ajax for github calls 2015-02-17 13:31:59 -08:00
Michael Q Larson 8e209d6bca start refactoring the learn-to-code view to use ajax 2015-02-16 23:35:02 -08:00
Michael Q Larson 1742be2efa Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-16 17:56:13 -08:00
Michael Q Larson 03f8ddf6c0 slight changes to announcements and remove errant debug statement. 2015-02-16 17:56:01 -08:00
Michael Q Larson d279ac6d1b add announcements and make the github api calls more robust 2015-02-16 17:48:42 -08:00
Michael Q Larson 762ee8aa26 fix about view to render data from github 2015-02-16 01:21:40 -08:00
Michael Q Larson 9dd1558f1c update the about page and make it the root 2015-02-15 23:59:03 -08:00
Nathan Leniz d0c2f6ccca Fixing up more bonfires 2015-02-16 00:03:35 -05:00
Nathan Leniz 3d7c7cf6b3 Remove debug statements from the server 2015-02-14 22:42:10 -05:00
Nathan Leniz 68ad6f9831 Added in debug statements to diagnose problem in production 2015-02-14 21:55:24 -05:00
Nathan Leniz d66f6bebf5 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-14 21:49:04 -05:00
Nathan Leniz 4f6a6bd8f0 Clean up username validation in bonfires and remove red border from input field if user deletes all input 2015-02-14 21:48:48 -05:00
Michael Q Larson a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00
Nathan Leniz b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Michael Q Larson bafba0b16f make some copy changes reflecting our shift to coderbyte 2015-02-13 11:01:12 -08:00
Michael Q Larson 43da6d16ff fix trello integration and make minor changes to courseware.json 2015-02-12 22:59:06 -08:00
Nathan Leniz d8baf3d588 Fix so routing handles /coursewares and /coursewares/ 2015-02-09 14:29:03 -05:00
Michael Q Larson b32d0219af remove errant comma 2015-02-09 07:57:53 -08:00
Michael Q Larson b84c514c29 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-08 23:46:23 -08:00
Michael Q Larson b71453f4e2 update the first 13 courseware challenges and remove some silly compliments 2015-02-08 23:46:08 -08:00
Nathan Leniz 0689793ef8 Remove debug statement 2015-02-08 14:25:26 -05:00
Nathan Leniz 9808db4f30 Fixing undefined challengeName on info pages 2015-02-08 14:24:42 -05:00
Nathan Leniz f572e4cb77 Simple fix for requesting challenges over challenge 53 2015-02-08 12:39:00 -05:00
Nathan Leniz 2b0428fe51 Fix old redirect in courseware.js 2015-02-08 00:57:37 -05:00
Michael Q Larson 180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
Michael Q Larson 4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
Nathan Leniz e2ab4438f5 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
2015-02-06 14:39:16 -05:00