Commit Graph

2386 Commits

Author SHA1 Message Date
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
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
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
Michael Q Larson
7a765fdca2 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-10 17:41:32 -07:00
Berkeley Martinez
702cb64b69 use waffleio board link instead of trello 2015-03-10 16:34:58 -07:00
jameskopacz
71456b7544 Gitter chat fix
Added https://*.gitter.im to 'frameSrc' CSP
2015-03-10 17:42:15 -05:00
Michael Q Larson
bb91982577 make link on show page open in new tab 2015-03-10 12:24:38 -07:00
Michael Q Larson
09f7be37ee make reply button consistent with discuss button throughout camper news 2015-03-10 10:22:20 -07:00
Michael Q Larson
526d874d1b add logic to truncate long headlines fetched from websites 2015-03-10 10:05:29 -07:00
Michael Q Larson
ca52ab2b9b make links open a new tab 2015-03-10 09:43:13 -07:00
Michael Q Larson
5c0764c022 switch to tiny bullets in stories 2015-03-09 23:18:09 -07:00
Michael Q Larson
f93fe396db hide all codemirror textareas until codemirror can replace them on load 2015-03-09 23:03:17 -07:00
Michael Q Larson
f9133957e3 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 22:52:52 -07:00
Quincy Larson
68cc8cf7a7 Merge pull request #178 from jameskopacz/jameskopacz-patch-3
Hide codeEditor textarea to prevent flash
2015-03-09 22:52:03 -07:00
Michael Q Larson
f068df3ddf Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 22:50:11 -07:00
Quincy Larson
367262403c Merge pull request #177 from jameskopacz/patch-1
Pointer on upvote button and reply button mouseover
2015-03-09 22:46:00 -07:00
Quincy Larson
073ad1c231 Merge pull request #166 from piecedigital/master
Altered Cash Register
2015-03-09 22:44:44 -07:00
Michael Q Larson
47507471ff update the stories view to have ghost discuss button and update chat instructions 2015-03-09 22:10:09 -07:00
Michael Q Larson
d224fda65f Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-09 17:05:24 -07:00
Michael Q Larson
0d43c8942e add discuss button to views and fix onhover issues 2015-03-09 17:05:18 -07:00
Quincy Larson
c0702b9d04 Merge pull request #180 from terakilobyte/master
MOre news updates
2015-03-09 16:39:04 -07:00
Nathan Leniz
5ddc87a072 Missing next declaration 2015-03-10 08:18:17 +09:00
Nathan Leniz
d6a6834971 Validate min length of 5 for username, 8 for password 2015-03-10 08:17:10 +09:00
Nathan Leniz
a65216e29e don't throw err on mongo errors but send 500 and call next 2015-03-10 08:15:43 +09:00
jameskopacz
b21217f80c Hide codeEditor to prevent flash
Fixes #176.

Hide #codeEditor textarea so it won't flash when code mirror hides it.
2015-03-09 17:38:21 -05:00
Berkeley Martinez
489aa68854 Merge pull request #167 from jameskopacz/jameskopacz-patch-1
"Update my public portfolio" button fix
2015-03-09 14:47:08 -07:00
jameskopacz
6f18936ee9 Pointer on upvote button and reply button mouseover 2015-03-09 16:18:12 -05:00
Berkeley Martinez
6d9c103769 Merge pull request #169 from jameskopacz/jameskopacz-patch-2
"challengeName is not defined" fix
2015-03-09 13:08:11 -07:00
Free Code Camp
2488499932 Remove reference to forum from README.md 2015-03-09 08:58:10 -07:00
Michael Q Larson
792d72c6b4 alias /news to /stories 2015-03-09 08:54:45 -07:00
Michael Q Larson
09e42df355 update sitemap 2015-03-09 07:18:31 -07:00