Commit Graph

2428 Commits

Author SHA1 Message Date
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
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
c9dd6366ec Compare against userIds 2015-03-18 05:01:14 +09:00
f3f6d0d16e update title for portfolio views and add public/js/bundle.js to gitignore 2015-03-17 10:06:17 -07:00
8b491ed27e Fix display of comments if user is not logged in, disable reply button if no user, reject attempted comments if no user and no author 2015-03-17 17:44:52 +09:00
8306662531 Merge remote-tracking branch 'upstream/master' 2015-03-17 17:13:30 +09:00
7d83453259 Update story.js
fixed link 151 spacing
2015-03-17 03:32:41 -04:00
2d5b34802b so spaces and tabs are totally differnt...whitespace fixes 2015-03-17 03:20:07 -04:00
1320a14851 fixed crash bug if user was logged off 2015-03-17 03:15:00 -04:00
9a5c7a0ce6 dammit part2 2015-03-17 03:09:34 -04:00
6a2209b9b4 god dammit already 2015-03-17 03:07:07 -04:00
c9970c1725 Hide upvote arrow on news page if already upvoted. Make it disappear on upvote 2015-03-17 03:00:37 -04:00
b7dd72f3a3 fixed coursewares 2015-03-17 03:00:37 -04:00
30d1398b71 Merge pull request #208 from jameskopacz/jameskopacz-patch-205
Comment overflow in News fix
2015-03-16 16:43:25 +09:00
6503cfc27d Comment overflow in News fix 2015-03-16 02:21:47 -05:00
39555fc656 Add compiles bundle.js to .gitignore 2015-03-15 17:10:21 +09:00
bf7d38e080 resolve conflict 2015-03-15 17:08:34 +09:00
c609294e1f force merge conflict for stream viewers 2015-03-15 17:06:05 +09:00
09a1463744 Dev crash err handling 2015-03-14 19:25:56 -05:00
cf4c680874 Dev server crash fix 2015-03-14 18:13:08 -05:00
191e38472e make selected indenting and outdenting work on courseware HTML, JS and Bonfires 2015-03-14 15:07:05 -07:00