|
|
29e29d5687
|
Merge remote-tracking branch 'upstream/master' into ux-improvements
|
2015-03-28 02:51:52 +09: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 |
|
|
|
25ae3ec909
|
resolve merge conflict in app.js while merging in master, get rid of completed-challenge route
|
2015-03-26 02:32:07 +09:00 |
|
|
|
e9c6498cdf
|
Error handling
|
2015-03-26 02:28:04 +09: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 |
|
|
|
83d23ed2a4
|
Remove sending 500 response to user manually and rely on middleware instead
|
2015-03-24 18:28:02 +09:00 |
|
|
|
d0a00428d5
|
Refactor story.js to use sendStatus instead of status, ensure returning on next(err)
|
2015-03-24 18:26:02 +09: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 |
|
|
|
999ba14db7
|
Fix indenting to 2 spaces, remove most lint errors
|
2015-03-22 20:20:08 +09:00 |
|
|
|
fb5e8dc387
|
Remove debug statement, closes #156, story decay to 32 hours
|
2015-03-22 20:11:37 +09:00 |
|
|
|
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 |
|
|
|
6e0da758e0
|
finish wiring in buttons and hotkeys
|
2015-03-22 01:38:04 -07:00 |
|
|
|
9633a2dbe0
|
get hotkey working in showVideo
|
2015-03-22 01:28:40 -07:00 |
|
|
|
d0a40dc202
|
fix intermittent variable declaration error in camper news view
|
2015-03-22 01:16:02 -07:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
5e97c678a5
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
controllers/story.js
|
2015-03-21 16:19:51 -07:00 |
|
|
|
03022c68ed
|
Merge pull request #244 from terakilobyte/ux-improvements
Ux improvements
|
2015-03-21 02:58:54 -07:00 |
|
|
|
fa0462da4c
|
point courseware reference in navbar to challenges
|
2015-03-21 18:58:14 +09:00 |
|
|
|
cf44287d7a
|
resolve merge conflict in navbar
|
2015-03-21 18:53:15 +09:00 |
|
|
|
ac511982a4
|
User facing challenge mentions now point to coursewares, remove completed view from account/show
|
2015-03-21 18:42:19 +09:00 |
|
|
|
9cdb2588b4
|
resolve merge conflict
|
2015-03-21 17:04:31 +09: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 |
|
|
|
6ad7c22313
|
Working on codemirror display issue in html coursewares
|
2015-03-21 16:34:06 +09:00 |
|
|
|
a2e2e6bfa2
|
Improve profile view on devices, store name in completedCoursewares for display in account/show
|
2015-03-21 15:44:18 +09:00 |
|
|
|
be91849d20
|
coursewares properly push timestamps to user object
|
2015-03-21 14:28:00 +09:00 |
|
|
|
cd89ad1574
|
Change complete-challenge to completed-challenge
|
2015-03-21 13:50:31 +09:00 |
|
|
|
5e095e8832
|
Merge remote-tracking branch 'upstream/master' into ux-improvements
|
2015-03-21 13:42:08 +09:00 |
|
|
|
b35f5ca59c
|
Working on unifying coursewares view and logic
|
2015-03-21 13:42:02 +09:00 |
|
|
|
6aaebbf34e
|
Clean up show all bonfires modal
|
2015-03-21 12:12:48 +09:00 |
|
|
|
d48da59aa7
|
resolve merge conflicts
|
2015-03-21 12:03:16 +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 |
|
|
|
56d7301d25
|
refactor announcement modal and add nodeschool-challenges
|
2015-03-19 22:34:36 -07:00 |
|
