Skip to content

Commit

Permalink
Now compatible with node.js v0.6.11
Browse files Browse the repository at this point in the history
- Updates socket.io-* dependencies to v0.9.0
- Switched to Iconic icon set in place of famfamfam silk
  • Loading branch information
msmathers committed Feb 27, 2012
1 parent 8e0ef86 commit bfec9bd
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 18 deletions.
6 changes: 6 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 0.2.5 / 2012-02-27

- Compatible with node.js v0.6.x
- Updated socket.io-* dependencies to v0.9.0, fixes socket.io-client bug
- Switched to Iconic icon set in place of famfamfam silk

# 0.2.4 / 2012-02-20

- Eased node.js version restrictions to allow v0.4.9 - v.0.4.12
Expand Down
2 changes: 1 addition & 1 deletion LICENSE/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2011 Narrative Science
Copyright 2012 Narrative Science

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,24 @@ Users create *stream* and *history* screens to view and search log messages.

## Requirements

[node.js](http://nodejs.org) (>=0.4.9 <=0.4.12)
[node.js](http://nodejs.org) (>=0.4.9 <=0.6.11)

[socket.io](http://socket.io) (0.8.4)
[socket.io](http://socket.io) (0.9.0)

[socket.io-client](https://github.com/LearnBoost/socket.io-client) (0.8.4)
[socket.io-client](https://github.com/LearnBoost/socket.io-client) (0.9.0)

[forever](https://github.com/indexzero/forever) (0.8.2)

[connect](http://senchalabs.github.com/connect/) (1.7.1)
[connect](http://senchalabs.github.com/connect/) (>=1.7.1)

[underscore](http://documentcloud.github.com/underscore/) (1.1.7)
[underscore](http://documentcloud.github.com/underscore/) (>=1.1.7)

## Compatibility

Harvesters & server have been tested on *Ubuntu 11.04*
Harvesters & server have been tested on *Ubuntu 11.10*

Web clients have been tested on *Chrome*, *Safari*, and *Firefox*.

NOTE: Log.io is currently incompatible with node.js v0.6.x

# Install log server on Machine A

1) Install via npm
Expand Down Expand Up @@ -74,9 +72,11 @@ NOTE: Log.io is currently incompatible with node.js v0.6.x

- Ryan Dahl &lt;ry at tiny clouds dot org&gt; ([ry](https://github.com/ry)) + Joyent http://www.joyent.com/ ([joyent](https://github.com/joyent/))

- P.J. Onori &lt;http://somerandomdude.com&gt; ([somerandomdude](https://github.com/somerandomdude))

## License

Copyright 2011 Narrative Science &lt;[email protected]&gt;
Copyright 2012 Narrative Science &lt;[email protected]&gt;

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
5 changes: 3 additions & 2 deletions lib/client/css/web_client.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ body {
background-color: #222;
display: table-cell;
border-right: 1px solid #333;
width: 230px;
width: 270px;
}
#controls2 {
overflow: auto;
Expand Down Expand Up @@ -91,6 +91,7 @@ body {
}
.screen-buttons img {
border: none;
margin: 1px 2px 0px 2px;
}
.screen-buttons .start {
display: none;
Expand Down Expand Up @@ -217,7 +218,7 @@ div.add-button:hover {
background: #111;
border-top: 1px solid #000;
overflow: hidden;
max-width: 230px;
max-width: 270px;
background: -webkit-gradient(linear, left top, left bottom, from(#222), to(#000));
background: -moz-linear-gradient(top, #222, #000);
}
Expand Down
Binary file modified lib/client/images/icons/bin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/client/images/icons/control_pause.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/client/images/icons/control_play.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/client/images/icons/cross.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "log.io",
"version": "0.2.4",
"version": "0.2.5",
"description": "Real-time log monitoring in your browser",
"homepage": "http://logio.org",
"keywords": ["logs", "monitoring", "realtime", "socket.io", "node.js", "ajax"],
Expand All @@ -14,15 +14,15 @@
},
"dependencies": {
"forever": "0.8.2",
"socket.io": "0.8.4",
"socket.io-client": "0.8.4",
"connect": "1.7.1",
"underscore": "1.1.7"
"socket.io": "0.9.0",
"socket.io-client": "0.9.0",
"connect": ">=1.7.1",
"underscore": ">=1.1.7"
},
"scripts": {
"postinstall": "bin/install.sh",
"postupdate": "bin/install.sh"
},
"main": "index",
"engines": { "node": ">=0.4.9 <=0.4.12" }
"engines": { "node": ">=0.4.9 <=0.6.11" }
}

0 comments on commit bfec9bd

Please sign in to comment.