Commit 5798c906 authored by Ned Kahvo's avatar Ned Kahvo
Browse files

Merge remote-tracking branch 'upstream/master'

parents 01f788f2 a1973a48
......@@ -2,4 +2,5 @@
rsync.sh
*.swp
*.log
.monitor
\ No newline at end of file
.monitor
node_modules/
......@@ -40,22 +40,14 @@ how to install and run on your own computer (linux/osx)
-------------------------------------------------------
- install redis v2.2.2
- install node.js >= 0.4.1
- install npm
- install these npm packages:
- async
- express
- jade
- redis-client
- redis
- sanitizer
- socket.io
- simplesets
- connect-redis
- (and perhaps more which you will notice when you try to start it)
- now start redis ($ redis-server)
- now start ($ node server.js 80) where "80" is the port you want it to run on.
- install node.js >= 0.4.7
- install npm
- cd to the scrumblr directory; you should see server.js and config.js and other files.
- run `npm install`
- If you get errors about express, you may need to change in package.json to have "express": ">=2.4.x",
- run redis `redis-server`
- run scrumblr `node server.js 80` where "80" is the port you have opened in your firewall and want scrumblr to run on.
- open a browser to `http://localhost:80` where "80" is the port you chose in the previous step.
license
-------
......
......@@ -46,16 +46,39 @@
display: block;
width: 79px;
height: 45px;
margin: 3px 10px 0px 19px;
margin: 1px 10px 0px 19px;
font-family: "Arial Rounded MT Bold" , arial, serif;
font-size: 10px;
letter-spacing: 0px;
letter-spacing: 0px;
line-height: 9px;
xtext-shadow: 0px 0px 1px #444;
opacity: 1;
color: #333;
text-align: center;
padding-top: 8px;
}
.xcontent {
overflow: hidden;
display: block;
width: 79px;
height: 45px;
margin: 0px 10px 0px 19px;
font-family: "Arial Rounded MT Bold", "Arial" , arial, serif;
xfont-size: 10px;
letter-spacing: 0px;
line-height: 8px;
xtext-shadow: 0px 0px 1px #444;
opacity: 1;
color: #333;
text-align: center;
padding-top: 8px;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment