Commit Graph

2414 Commits (ab14b32d19bdc81737438824a5f0b65abfda5252)

Author SHA1 Message Date
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 911cbf74a2 Merge pull request #223 from jameskopacz/jameskopacz-patch-2
Stories js var double output fix
2015-03-17 20:27:40 -07:00
Berkeley Martinez f1e489a494 Merge pull request #222 from jameskopacz/jameskopacz-patch-1
fullUser fixes
2015-03-17 20:16:40 -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
jameskopacz 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
jameskopacz 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
Michael Q Larson a36f978856 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-17 17:58:01 -07:00
Michael Q Larson a52ab83757 half way done with the new upvoting ux 2015-03-17 17:57:50 -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 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
Michael Q Larson 6d8d123d85 unblock the cdn paths that firefox over-vigilantly blocked 2015-03-17 16:18:41 -07:00
Quincy Larson f144e84310 Merge pull request #214 from MrRenter/upvoteFix
Upvote fix
2015-03-17 15:48:15 -07:00
Michael Q Larson 95c249afc6 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
Conflicts:
	.gitignore
2015-03-17 15:41:52 -07:00
Free Code Camp 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
Free Code Camp 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
Nathan Leniz 514b5ea572 fix bug in server side checking for username, closes #219 2015-03-18 07:15:25 +09:00
Nathan Leniz c9dd6366ec Compare against userIds 2015-03-18 05:01:14 +09:00
Michael Q Larson f3f6d0d16e update title for portfolio views and add public/js/bundle.js to gitignore 2015-03-17 10:06:17 -07:00
Nathan Leniz 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
Nathan Leniz 8306662531 Merge remote-tracking branch 'upstream/master' 2015-03-17 17:13:30 +09:00
Renter 7d83453259 Update story.js
fixed link 151 spacing
2015-03-17 03:32:41 -04:00
MrRenter 2d5b34802b so spaces and tabs are totally differnt...whitespace fixes 2015-03-17 03:20:07 -04:00
MrRenter 1320a14851 fixed crash bug if user was logged off 2015-03-17 03:15:00 -04:00
MrRenter 9a5c7a0ce6 dammit part2 2015-03-17 03:09:34 -04:00
MrRenter 6a2209b9b4 god dammit already 2015-03-17 03:07:07 -04:00
MrRenter c9970c1725 Hide upvote arrow on news page if already upvoted. Make it disappear on upvote 2015-03-17 03:00:37 -04:00
Renter b7dd72f3a3 fixed coursewares 2015-03-17 03:00:37 -04:00
Nathan 30d1398b71 Merge pull request #208 from jameskopacz/jameskopacz-patch-205
Comment overflow in News fix
2015-03-16 16:43:25 +09:00
jameskopacz 6503cfc27d Comment overflow in News fix 2015-03-16 02:21:47 -05:00
Nathan Leniz 39555fc656 Add compiles bundle.js to .gitignore 2015-03-15 17:10:21 +09:00
Nathan Leniz bf7d38e080 resolve conflict 2015-03-15 17:08:34 +09:00
Nathan Leniz c609294e1f force merge conflict for stream viewers 2015-03-15 17:06:05 +09:00
jameskopacz 09a1463744 Dev crash err handling 2015-03-14 19:25:56 -05:00
jameskopacz cf4c680874 Dev server crash fix 2015-03-14 18:13:08 -05:00
Michael Q Larson 191e38472e make selected indenting and outdenting work on courseware HTML, JS and Bonfires 2015-03-14 15:07:05 -07:00
Michael Q Larson f99718daa0 update meta og:image 2015-03-14 01:51:28 -07:00
Quincy Larson fcc1af0ed7 Merge pull request #192 from FreeCodeCamp/QuincyLarson-patch-1
Fix #187 by updating reference to Trello board
2015-03-12 00:16:57 -07:00
Quincy Larson b6fd96902e Fix #187 by updating reference to Trello board 2015-03-12 00:16:46 -07:00
Michael Q Larson 8e8711d947 add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users 2015-03-11 23:58:16 -07:00
Michael Q Larson 3004c64ee7 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-11 23:08:06 -07:00
Free Code Camp f2c449f8b8 Merge pull request #190 from terakilobyte/allow-quotation-marks
Allow quotation marks
2015-03-12 02:06:35 -04:00
Michael Q Larson 58e4e3c21a Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-11 23:01:39 -07:00
Free Code Camp 657d9e467c Merge pull request #188 from terakilobyte/next-courseware-flow
Next courseware flow
2015-03-12 01:35:23 -04:00
Free Code Camp 648a54b966 Merge pull request #184 from jameskopacz/jameskopacz-patch-182
Gitter chat embed fix
2015-03-12 01:33:39 -04:00
Michael Q Larson e8ea6b39c9 fix link issue on show view 2015-03-11 22:29:03 -07:00
Nathan Leniz ef24ca746c Allow the use of quotation marks in original post and comments in camper news 2015-03-12 08:20:23 +09:00
Nathan Leniz ac4b4c64de Merge remote-tracking branch 'upstream/master' into next-courseware-flow 2015-03-12 00:04:12 +09:00
Nathan Leniz 4b1be9c67a Fix flow of next courseware in showJS view 2015-03-12 00:03:56 +09:00
Michael Q Larson 9adc444a31 fix a courseware test 2015-03-10 17:52:48 -07:00