|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6c929b8375
|
Revert "start adding error handling to passport"
This reverts commit 89ee552a12.
|
2015-03-22 22:23:46 -07:00 |
|
|
|
816f22260b
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-03-22 22:23:01 -07:00 |
|
|
|
89ee552a12
|
start adding error handling to passport
|
2015-03-22 22:22:52 -07:00 |
|
|
|
d8bf99708d
|
Add uncaught exception handler
closes #258
|
2015-03-22 22:18:01 -07:00 |
|
|
|
940dbea622
|
Handle err in config/passport
|
2015-03-22 22:07:58 -07:00 |
|
|
|
f246ef618c
|
Close web worker after completion
closes #257
|
2015-03-22 16:57:10 -07:00 |
|
|
|
5e97c678a5
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
controllers/story.js
|
2015-03-21 16:19:51 -07:00 |
|
|
|
9c5d9eea23
|
try shorter decay rate
|
2015-03-21 00:47:21 -07:00 |
|
|
|
ec5b3e4b84
|
Change from 1 billion seconds to 172 million.
|
2015-03-21 16:41:29 +09:00 |
|
|
|
bc69233226
|
Merge pull request #226 from FreeCodeCamp/email-validation
fix email validation issue #212
|
2015-03-21 16:40:03 +09:00 |
|
|
|
bd7461d2c7
|
Merge pull request #243 from terakilobyte/master
Change decay rate of hot stories to 48 hours
|
2015-03-21 00:39:29 -07:00 |
|
|
|
752f4125d4
|
Change decay rate of hot stories to 48 hours
|
2015-03-21 16:36:20 +09:00 |
|
|
|
2f240655a2
|
update announcements and move announcement modal back into learn-to-code view
|
2015-03-19 23:24:44 -07:00 |
|
|
|
29a0701e71
|
update link to nodeschool challenges video
|
2015-03-19 23:09:50 -07:00 |
|
