0eb15269be
create zipline model
2015-03-21 16:48:48 -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
94e8550408
reverse change that was locking users out
2015-03-19 15:28:20 -07:00
76d0467758
update nonprofit project guide copy
2015-03-18 16:01:21 -07:00
af19ea4308
improve upvoting UX and start adding angular validation to submit-story view
2015-03-18 00:40:18 -07:00
e31bad4b27
Merge pull request #227 from jameskopacz/jameskopacz-patch-224
...
connect-mongo version update
2015-03-18 00:26:45 -07:00
769fdc68e2
connect-mongo version update
2015-03-18 02:16:57 -05:00
5a15da975f
fix email validation issue #212
2015-03-17 23:18:03 -07:00
df7c21d6c8
newrelic should not run in development mode.
...
removed unused packages from app.js
2015-03-17 21:57:31 -07:00
3b913be893
handle async flow/errors of profile update
2015-03-17 21:09:54 -07:00
ab14b32d19
middleware using next should specify it in arguments
2015-03-17 20:42:09 -07:00
7b449e7a5b
Add returns to error handlers
...
add missing next to arguments for middleware
2015-03-17 20:39:27 -07:00
911cbf74a2
Merge pull request #223 from jameskopacz/jameskopacz-patch-2
...
Stories js var double output fix
2015-03-17 20:27:40 -07:00
f1e489a494
Merge pull request #222 from jameskopacz/jameskopacz-patch-1
...
fullUser fixes
2015-03-17 20:16:40 -07:00
9e67ebf3c8
Merge pull request #204 from jameskopacz/jameskopacz-patch-199
...
Dev server crash fix
2015-03-17 20:10:29 -07:00
5ff3aabdd5
stories js var double output fix
...
challengeName and user are in stories/index.jade and stories/show.jade.
show.jade is only called from index.jade. This fix removes double output of those vars.
2015-03-17 21:18:55 -05:00
770d177873
fullUser fixes
...
Set to null if user isn't logged in.
```delete fullUser.password;``` wasn't deleting the password so setting it to null instead.
2015-03-17 21:11:14 -05:00
a36f978856
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-17 17:58:01 -07:00
a52ab83757
half way done with the new upvoting ux
2015-03-17 17:57:50 -07:00
f1dcb4c373
start fixing the password in scope potential corner case security issue
2015-03-17 17:22:58 -07:00
ac6dcf1657
Merge pull request #221 from FreeCodeCamp/firefox-news-fix
...
unblock the cdn paths that firefox over-vigilantly blocked
2015-03-17 16:32:53 -07:00
6d8d123d85
unblock the cdn paths that firefox over-vigilantly blocked
2015-03-17 16:18:41 -07:00
f144e84310
Merge pull request #214 from MrRenter/upvoteFix
...
Upvote fix
2015-03-17 15:48:15 -07:00
95c249afc6
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
...
Conflicts:
.gitignore
2015-03-17 15:41:52 -07:00
d4f3a4e213
Merge pull request #220 from terakilobyte/existing-username-fix
...
fix bug in server side checking for username, closes #219
2015-03-17 18:19:34 -04:00
0052f99863
Merge pull request #217 from terakilobyte/fix-no-user-comment-display
...
Fix no user comment display
2015-03-17 18:16:16 -04:00
514b5ea572
fix bug in server side checking for username, closes #219
2015-03-18 07:15:25 +09:00
Michael Q Larson
Nathan Leniz
Berkeley Martinez
jameskopacz
Free Code Camp