|
|
6a19dc9bda
|
Zipline/Basejump view with controller logic to serve. Will have to change based upon json
|
2015-03-29 00:09:50 +09:00 |
|
|
|
9e1a4a1348
|
Streak display in account/show.jade, refactor courseware.json for error handling and linting
|
2015-03-28 23:42:07 +09:00 |
|
|
|
85a06d5ac2
|
Merge pull request #256 from terakilobyte/ux-improvements
User will now get a point for news/stories interactions
|
2015-03-28 06:12:18 -07:00 |
|
|
|
ff94d10aa8
|
resolve merge conflict, favoring upstream
|
2015-03-28 17:41:07 +09:00 |
|
|
|
0a07c1e397
|
Streaks!
|
2015-03-28 17:38:11 +09:00 |
|
|
|
4d3337df32
|
Merge branch 'ziplines' into ux-improvements
Conflicts:
views/coursewares/showJS.jade
|
2015-03-28 00:24:41 -07:00 |
|
|
|
e4eb5052c7
|
intermediary work on ziplines
|
2015-03-27 23:15:39 -07:00 |
|
|
|
338d87424c
|
More work towards unifying timestamps
|
2015-03-28 12:22:08 +09:00 |
|
|
|
eb96d2cb02
|
Resolve merge conflict, using ziplines changes
|
2015-03-28 12:16:42 +09:00 |
|
|
|
947b034533
|
Resolve merge conflict (spacing issue in app.js)
|
2015-03-28 11:35:14 +09:00 |
|
|
|
efd7707ac8
|
Move to Mongoose 4.0, begin implementation of streak
|
2015-03-28 11:34:12 +09:00 |
|
|
|
f7f7fb39b9
|
start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds
|
2015-03-27 14:36:17 -07:00 |
|
|
|
94b6cae3ec
|
apply Nathan's insights into multistep form'
|
2015-03-27 12:36:21 -07:00 |
|
|
|
29e29d5687
|
Merge remote-tracking branch 'upstream/master' into ux-improvements
|
2015-03-28 02:51:52 +09:00 |
|
|
|
c69d919d46
|
Merge branch 'master' into ux-improvements
|
2015-03-27 10:28:31 -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 |
|
|
|
e78609171d
|
continue work on the param-based funnel
|
2015-03-26 23:33:52 -07:00 |
|
|
|
d64b5c5718
|
add progress bar to nonprofit project proposal wizard
|
2015-03-25 15:25:19 -07:00 |
|
|
|
09b812688e
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
app.js
|
2015-03-25 14:20:34 -07:00 |
|
|
|
7d4c30c502
|
start adding progress bar to nonprofit onboarding
|
2015-03-25 14:18:27 -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 |
|
|
|
6e4067ee00
|
most views are now in place
|
2015-03-24 22:12:16 -07:00 |
|
|
|
d4935d44de
|
add the routes, controller actions and views for the nonprofit wizard
|
2015-03-24 21:46:42 -07:00 |
|
|
|
bcec96e427
|
half way done with the initial views and controllers
|
2015-03-24 19:08:26 -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 |
|
|
|
1facf532f3
|
start building the nonprofit project flow
|
2015-03-23 10:42:59 -07:00 |
|
|
|
ac8487a4fc
|
update basejump, zipline and nonprofit models
|
2015-03-23 08:33:59 -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 |
|
|
|
f9523beb29
|
update copy on show all bonfires button
|
2015-03-22 18:22:07 -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 |
|
