gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sahat Yalkabov
2014-05-13 19:08:59 -04:00
parent b38005d375 915a655ae6
commit f153b01c51
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -473,7 +473,7 @@ added in the [pull request #40](https://github.com/sahat/hackathon-starter/pull/
as part of CSRF protection. as part of CSRF protection.
``` ```
input(type='hidden', name='_csrf', value='_csrf') input(type='hidden', name='_csrf', value=_csrf)
``` ```
**Note:** It is now possible to whitelist certain URLs. In other words you can **Note:** It is now possible to whitelist certain URLs. In other words you can
@ -965,7 +965,7 @@ If you want to stick all your JavaScript inside templates, then in `layout.jade`
your main template file, add this to `head` block. your main template file, add this to `head` block.
```jade ```jade
script(src='/socket.io/socket.io.js?v=#{cacheBuster}') script(src='/socket.io/socket.io.js')
script. script.
var socket = io.connect(window.location.href); var socket = io.connect(window.location.href);
socket.on('greet', function (data) { socket.on('greet', function (data) {

4
package.json
View File

@ -13,7 +13,7 @@
"async": "^0.8.0", "async": "^0.8.0",
"bcrypt-nodejs": "^0.0.3", "bcrypt-nodejs": "^0.0.3",
"body-parser": "^1.0.2", "body-parser": "^1.0.2",
"cheerio": "^0.15.0", "cheerio": "^0.16.0",
"clockwork": "^0.1.1", "clockwork": "^0.1.1",
"compression": "^1.0.2", "compression": "^1.0.2",
"connect-assets": "^3.0.0-beta2", "connect-assets": "^3.0.0-beta2",
@ -36,7 +36,7 @@
"mongoose": "^3.8.8", "mongoose": "^3.8.8",
"morgan": "^1.0.0", "morgan": "^1.0.0",
"node-foursquare": "^0.2.1", "node-foursquare": "^0.2.1",
"node-linkedin": "^0.1.8", "node-linkedin": "^0.2.0",
"nodemailer": "^0.6.3", "nodemailer": "^0.6.3",
"passport": "^0.2.0", "passport": "^0.2.0",
"passport-facebook": "^1.0.3", "passport-facebook": "^1.0.3",