gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,003 Commits 9 Branches 0 Tags
17829b4bd33ec44d8ffe53c24a31e18b4884010a
Commit Graph

772 Commits

Author SHA1 Message Date
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