Commit Graph

153 Commits

Author SHA1 Message Date
Quincy Larson
12fbc41761 clean up User.js a little 2015-04-24 03:04:53 -07:00
Quincy Larson
bea77c580e redirect user to bonfires if has completed waypoints but not bonfires gulp 2015-04-24 02:02:02 -07:00
terakilobyte
ca812f09ae Update User model for migration 2015-04-22 07:30:40 -04:00
Michael Q Larson
d10011acc3 Pull some useful changes from aborted branch 2015-04-16 23:54:26 -07:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
brndnb
96ac90274d Update User model to make migration easier and complete user migration script 2015-04-13 21:30:08 -04:00
Michael Q Larson
83c14cccc4 continue work on user migration 2015-04-13 01:03:26 -04:00
Michael Q Larson
f85804f270 start writing user migration for challenge completion 2015-04-12 02:07:01 -04:00
Michael Q Larson
332d4f1875 refactor story.js mailer and remove some cruft 2015-04-09 17:50:10 -07:00
Michael Q Larson
9145e959de able to use the api upon button click 2015-04-08 22:42:40 -07:00
Michael Q Larson
7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
Michael Q Larson
29b4e3b970 get seed data seeding and improve application submitted button 2015-04-08 14:57:08 -07:00
Michael Q Larson
c02fafa6a9 add status, turn hours into integer, create a directory view of all nonprofits 2015-04-08 14:36:05 -07:00
Michael Q Larson
6242f322d7 still working on passing original author email all the way down the comment chain 2015-04-08 00:30:51 -07:00
Michael Q Larson
1c7d0b11b6 pass the original story URL to all comments for notification email 2015-04-07 23:39:52 -07:00
Michael Q Larson
60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
Michael Q Larson
9d746f7d49 add zipline and basejump to portfolio view, and bonfires with solutions(not yet writing name to bonfireCompletion record on user 2015-04-05 00:01:51 -07:00
Michael Q Larson
fbeff58477 build a functional challenge map and change navbar links 2015-04-03 20:05:53 -07:00
Michael Q Larson
3cff4e9879 add logic to add campers to nonprofit projects of interest to them 2015-04-02 17:23:45 -07:00
Michael Q Larson
36c43cc73a add jQuery to check for broken images and replace them with standard image. Remove gravatar logic. 2015-04-02 13:42:15 -07:00
Michael Q Larson
1248cde97f continue work on nonprofit show views 2015-04-01 22:31:08 -07:00
Michael Q Larson
ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -07:00
Michael Q Larson
18a9818200 Merge branch 'master' into nonprofit-show
Conflicts:
	controllers/challenges.js
	controllers/courseware.js
2015-03-30 16:17:04 -07:00
Michael Q Larson
660214f87e able to seed and view wiki content 2015-03-30 13:48:54 -07:00
Michael Q Larson
9fe8bf2fbf remove references to codepen from codebase 2015-03-29 15:14:13 -07:00
Nathan Leniz
1fc3cffdbf Add .editorconfig to enforce certain automatic behavior on all editors,
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
Nathan Leniz
f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
Nathan Leniz
0a07c1e397 Streaks! 2015-03-28 17:38:11 +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
A. Drake
0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
Michael Q Larson
ac8487a4fc update basejump, zipline and nonprofit models 2015-03-23 08:33:59 -07:00
Michael Q Larson
91edf73965 start building zipline views and controller 2015-03-21 17:23:13 -07:00
Michael Q Larson
0eb15269be create zipline model 2015-03-21 16:48:48 -07:00
Nathan Leniz
6ad7c22313 Working on codemirror display issue in html coursewares 2015-03-21 16:34:06 +09:00
Nathan Leniz
d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Nathan Leniz
ac89c44064 Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-03-09 18:45:21 +09:00
Nathan Leniz
4976bd5825 Add meta description property to Story model. 2015-03-09 18:36:55 +09:00
Michael Q Larson
d7edde2a19 fix the casing of the views and a minor Jade warn statement 2015-03-09 00:27:17 -07:00
Nathan Leniz
8608f48d8c Delete seed tasks, email signup now defaults a picture 2015-03-09 06:51:47 +09:00
Nathan Leniz
de91be44da comment submit time bug fixed 2015-03-08 18:48:20 +09:00
Nathan Leniz
f367a0310e Finalizing display issues for news release 2015-03-08 16:50:51 +09:00
Nathan Leniz
6910ed0aea Nesting of comments in view, disabling comment form display button on button click 2015-03-07 01:57:09 +09:00
Nathan Leniz
41442a540f Need to work on story redirect after submission, fix url link in stories/show 2015-03-05 19:21:26 +09:00
Michael Q Larson
d8b8373b70 do some refactoring of the camper news views 2015-03-03 19:55:04 -08:00
Nathan Leniz
6ac780e836 Rewire upvote to use post and req.body instead of req.params, add logic on click handler to reject upvotes if the user has already upvoted, coment display now works 2015-03-04 07:15:00 +09:00
Nathan Leniz
968832ae52 start of comments view 2015-03-03 22:52:45 +09:00
Nathan Leniz
52e494407b Get initial view working, sort out mongo mess with seed file 2015-03-03 19:23:56 +09:00
Michael Q Larson
b7a95ee56f passing off hacker news clone to Nathan and his pair 2015-03-03 01:41:32 -08:00
Michael Q Larson
9a143ef435 start building the schema for both the posts and comments 2015-03-03 00:18:52 -08:00
Michael Q Larson
fc1d560a89 start refactoring points into progressTimestamps which is essentially points with timestamps 2015-02-22 18:16:26 -08:00