 Tim Windelschmidt
|
49eb0d9959
|
Removed Merge errors (I dont know why they exist) and some logging stuff
|
2015-09-05 14:12:29 +02:00 |
|
Tim Windelschmidt
|
c4e7aa945d
|
Merge branch 'master' of ssh://repos.ctdo.de/raumstatus
Conflicts:
node/package.json
node/statusbot.js
|
2015-09-05 13:57:25 +02:00 |
|
Tim Windelschmidt
|
931cd29833
|
Added HTML5 Push-Notifications
|
2015-09-05 13:45:41 +02:00 |
|
Tim Windelschmidt
|
200046b0f1
|
Added HTML5 Push-Notifications
|
2015-09-05 12:18:35 +02:00 |
Lucas Pleß
|
681d24175a
|
changed the ctdo room ip space to current setup
|
2014-07-29 18:34:00 +02:00 |
|
Lucas Pleß
|
d4b64c5f19
|
re-adding headers to allow AJAX call from different domains
|
2014-07-23 14:18:11 +02:00 |
|
Christian Kroll
|
c1fc86e20c
|
color blind friendly traffic light images
|
2014-07-23 04:52:59 +02:00 |
|
Lucas Pleß
|
e80ef9ae6f
|
should read the nmap manual about the T param. Using normal timing now.
|
2014-07-23 03:40:48 +02:00 |
|
Lucas Pleß
|
97a07163f2
|
fixing an error with the gage loading at page reload
|
2014-07-23 03:33:36 +02:00 |
|
Lucas Pleß
|
52aa2837df
|
aaaand removing the headers to check if it works better
|
2014-07-23 03:30:05 +02:00 |
|
Lucas Pleß
|
1fbb8a6ace
|
aaaand changed timing back, since it blocks the polling
|
2014-07-23 02:50:00 +02:00 |
|
Lucas Pleß
|
b89ebeaf4f
|
changed nmap timing,
added label to gage,
cleaned up a bit,
removed redis foo from flukso code since it is not needed
|
2014-07-23 02:45:57 +02:00 |
|
Lucas Pleß
|
0dd746c47f
|
added justgage for display of power consumption
added power consumption in spaceapi
|
2014-07-23 02:16:15 +02:00 |
|
Lucas Pleß
|
156616ebcf
|
try to add a image api
|
2014-07-06 01:42:11 +02:00 |
|
Lucas Pleß
|
f4404dab04
|
try to add a image api
|
2014-07-06 01:24:49 +02:00 |
|
Lucas Pleß
|
5e8249d0e4
|
fixing issues with spaceapi compliance
|
2014-07-06 01:11:45 +02:00 |
|
Christian Kroll
|
f4630b30b0
|
retabbed source because of inconsistencies... again
|
2013-11-26 21:11:05 +01:00 |
|
Christian Kroll
|
91ced0a2d2
|
Merge branch 'master' of git+ssh://repos.ctdo.de/raumstatus
|
2013-11-26 20:42:05 +01:00 |
|
Christian Kroll
|
3cac37d61f
|
slower timing template for nmap, retabbed source because of inconsistencies
|
2013-11-26 20:41:40 +01:00 |
|
Lucas Pleß
|
c7e9ddbc66
|
Merge branch 'master' of repos.ctdo.de:raumstatus
|
2013-11-26 13:59:41 +01:00 |
|
Lucas Pleß
|
70779ce691
|
removed mac addresses from code
|
2013-11-26 13:59:34 +01:00 |
|
Christian Kroll
|
a30d1ba420
|
korrekte Groß- und Kleinschreibung ist sexy
|
2013-10-26 00:15:28 +02:00 |
|
Christian Kroll
|
c48815c8b7
|
glossy LEDs
|
2013-10-23 03:29:19 +02:00 |
|
Lucas Pleß
|
d988d3a995
|
bugfix for node 0.10 https://github.com/joyent/libuv/issues/826
|
2013-10-23 01:49:08 +02:00 |
|
Lucas Pleß
|
db915edefc
|
fixed storing user count in redis (thx badboy_)
made user count api working and added data to graph
|
2013-10-22 14:01:50 +02:00 |
|
Lucas Pleß
|
82f8867161
|
added user-count history api (just demo-data)
added rickshaw graph using that user-count api
|
2013-10-22 01:40:57 +02:00 |
|
Lucas Pleß
|
319f828c84
|
dev end / prod env :/
|
2013-10-21 22:04:21 +02:00 |
|
Lucas Pleß
|
56ccca6bc0
|
making every nice and shiny
|
2013-10-21 22:02:41 +02:00 |
|
Lucas Pleß
|
9d969c94d3
|
working on nicer angular integration
|
2013-10-21 13:39:52 +02:00 |
|
Lucas Pleß
|
16b8a0fd1a
|
added link to source code
|
2013-10-21 01:16:57 +02:00 |
|
Lucas Pleß
|
d9438dd73f
|
changed expressjs binding to localhost only and moved angularJS on top of html page
|
2013-10-21 01:15:35 +02:00 |
|
Lucas Pleß
|
494b509e15
|
added angularJS Framework
|
2013-10-21 00:47:31 +02:00 |
|
Lucas Pleß
|
2743b5f970
|
added angularJS Framework
|
2013-10-21 00:04:58 +02:00 |
|
Lucas Pleß
|
f3fd20c1be
|
added ink-framework
added redis prefix
|
2013-10-14 21:26:54 +02:00 |
|
Lucas Pleß
|
e28975b889
|
bla
|
2013-10-08 22:13:20 +02:00 |
|
Lucas Pleß
|
a65f090634
|
initial commit
|
2013-10-02 14:04:01 +02:00 |