Commit Graph

2487 Commits

Author SHA1 Message Date
4b9be16b24 remove inspectlet thinking this may be the malware twitter is finding 2015-04-14 13:44:17 -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
2c6a781890 add inspectlet javascript 2015-04-07 00:32:01 -07:00
29568d45b8 fix a typo related to challenge tweets 2015-04-03 23:54:31 -07:00
2328cc2927 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	controllers/user.js
2015-03-31 15:11:06 -07:00
a60c5eb92c refactor passport so that emails aren't fired if there are errors in save actions 2015-03-31 15:07:34 -07:00
2bc92924e2 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-31 13:46:49 -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
22507de01f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-31 13:43:35 -07:00
362959ef42 Merge pull request #291 from jameskopacz/jameskopacz-patch-283
On story submission create unique story URL if slug already exists
2015-03-31 13:43:28 -07:00
8c97528171 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-31 13:32:51 -07:00
a24ad9b993 update the welcome mailer and change fontsize on bonfire helpful links 2015-03-31 10:00:30 -07:00
f5d6abdfef On story submission create unique story URL if slug already exists 2015-03-30 23:14:39 -05:00
b6dc82805d Merge pull request #279 from FreeCodeCamp/styleguide
Take @brndbr's styleguide to address #112
2015-03-30 13:12:40 -07:00
5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -07:00
9fe8bf2fbf remove references to codepen from codebase 2015-03-29 15:14:13 -07:00
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
7a27ded5bc Merge pull request #273 from aldraco/coursewaresErr
Coursewares error handling (issue #261)
2015-03-29 14:32:16 -07:00
d5fdc15605 Merge pull request #272 from aldraco/bonfireMDN3-4
Bonfire mdn links: 3-4 flame
2015-03-29 14:28:58 -07:00
47d0d8e0da Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-28 23:43:08 -07:00
1b247f97fc Merge pull request #262 from aldraco/bonfirelinks
Bonfire MDN links - Issue #255
2015-03-28 20:34:34 -07:00
64ccae938a Posts completed status when challenge 2 is opened for issue #274 2015-03-28 17:18:09 -04:00
3e839030ac Fixed async function 2015-03-28 14:08:51 -04:00
69533424a3 Fixed user.save error callback handler 2015-03-28 14:01:31 -04:00
ca3d46a776 fixed obvious error handlers 2015-03-28 13:53:26 -04:00
ef27fda537 remove references to meeting from announcements and notification modal 2015-03-28 10:14:49 -07:00
a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -07:00
e915e74b8d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-27 00:21:00 -07:00
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
c17ff59aef Handle callback errors for user, bonfire, challenges,
courseware, and resources controllers
2015-03-26 23:41:06 -05:00
85c996ad2e Added bonfire links for level 3. 2015-03-26 10:45:33 -04:00
c053069f23 Added bonfire links for level 2. 2015-03-26 10:34:59 -04:00
4cad7c1aee fixed comma error for merge. 2015-03-26 09:53:22 -04:00
8a357dd48a Merge pull request #265 from FreeCodeCamp/errorHandlerUpgrade
Add production error handler
2015-03-25 06:56:04 -07:00
6fe7392f8f Merge pull request #267 from storbeck/master
fixed typo for issue #266
2015-03-24 13:35:38 -07:00
482cc3fa7b fixed typo for issue #266 2015-03-24 15:58:17 -04:00
2b0cc91754 Add production error handler 2015-03-24 08:03:59 -07:00
6bcec35ae9 Merge pull request #264 from BlueOceanView/master
Add chai-jquery to package.json
2015-03-24 19:43:24 +09:00
a6ce700831 Add chai-jquery to package.json 2015-03-24 04:26:39 -06:00
b3174eeadf If no links are present, the template does not show the helpful links header. 2015-03-24 01:24:06 -04:00
c4624b7f20 links added, basic functionality working across pages. 2015-03-24 01:17:21 -04:00
4dae91ff41 formatting done. 2015-03-23 23:57:44 -04:00
dbc57dd0cb links iterated through on the page. TODO formatting and adding more data. 2015-03-23 23:55:24 -04:00
0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
5bfd8a8d54 Handle user save err and respond to end route handler
closes #260
2015-03-23 17:17:39 -07:00