Commit Graph

86 Commits

Author SHA1 Message Date
henne a2d3c85e48 Merge branch 'corona_hotfix' into 'master'
Space nun dauerhaft zu (aufgrund von corona...) aber wir können buzzern und...

See merge request ctdo/raumstatus!2
2020-04-01 16:55:19 +02:00
henne cb0c51e5a3 Space nun dauerhaft zu (aufgrund von corona...) aber wir können buzzern und musik hören beim Maskenherstellen 2020-04-01 16:55:04 +02:00
henne 0e7edc330b Merge branch 'henne-master-patch-35546' into 'master'
fixed spaceapi

See merge request ctdo/raumstatus!1
2019-12-10 22:54:28 +01:00
henne f639247018 fixed spaceapi 2019-12-10 22:52:31 +01:00
Fionera 3591c14c56 Add people_now_present to spaceapi 2019-11-20 13:18:26 +01:00
root 1d82202cd3 foobar 2018-04-20 17:55:30 +02:00
root 01812f3a7e test 2018-04-20 16:09:05 +02:00
root b59bd71683 bla 2018-04-20 16:07:56 +02:00
zeus 00469cf564 alle links zu https umgebaut. 2018-04-20 16:02:47 +02:00
zeus bb7dec62af link vom logo angepasst 2018-04-20 15:50:25 +02:00
Tim Windelschmidt 1f73d31d91 Add API Support 2018-04-19 20:17:45 +02:00
smash d2cc89dcef simpleanswer.lastchange linked to spaceanswer.state.lastchange but expected ms instead.
made that one independent so simpleanswer should hopefully work again...
2018-02-22 19:41:09 +01:00
smash 19f9bdd65d updated logo url (svg to png) 2018-02-22 18:31:09 +01:00
smash a86cfb5925 update: wir sind erfa, war allerdings noch ext_ccc='chaostreff' 2018-02-22 18:25:46 +01:00
smash 48eaf7b9d1 runden bitte! 2018-02-22 18:21:46 +01:00
smash 7a512ee77d lastchange was in ms, spaceapi expects seconds here 2018-02-22 18:12:46 +01:00
smash 266a492611 changed calender url to wp events url 2018-01-14 16:52:22 +01:00
Lucas Pleß 41244870c6 removed user count on view 2017-11-25 15:08:58 +01:00
Lucas Pleß 0baa612293 changed status host back to rpi3 2017-11-25 15:06:54 +01:00
Lucas Pleß 1241022d9f removed usercount, user<->mac mapping and redis stuff, removed snmp checks since this all is not working anymore due to changed infrastructure in the ctdo 2017-11-25 15:03:13 +01:00
fionera 81634750e3 Changed Repo URL 2016-11-28 11:20:10 +01:00
Tim Windelschmidt ddf4b6e8bd Added MQTT 2016-11-28 11:15:23 +01:00
fionera 0edaff16c8 Update statusbot.js 2016-11-09 14:47:38 +01:00
smash 8065739b0b corrected calendar url for google ical, added ext_ccc 2016-10-30 13:13:43 +01:00
fionera d8c38758fe Added Feed. Please add the correct Calendar URL 2016-10-29 15:24:33 +02:00
Tim Windelschmidt 78a8aff0f4 Missed the -1 2016-09-27 21:54:49 +02:00
Tim Windelschmidt 7ef49b15d6 Added very ugly hack for removing the " Char 2016-09-27 21:50:18 +02:00
Tim Windelschmidt f44ebd78e0 Added Image.png for the Wiki 2016-09-27 21:33:30 +02:00
Tim Windelschmidt ab74c51295 Merge branch 'master' of repos.ctdo.de:ctdo/raumstatus 2016-09-27 21:19:17 +02:00
Tim Windelschmidt d39cbaa25b Fixed the UTF8 and Space error 2016-09-27 21:11:28 +02:00
Lucas Pleß 81b6ee9961 changed application port for new server, changed mailinglist 2016-07-16 18:39:32 +02:00
Lucas Pleß 80472969d2 changed room state polling device to flipdot, since the new room switch is not manageable 2016-04-28 17:58:12 +02:00
Tim Windelschmidt 7bed7ba82f Rechanged stuff so that it works now /o\ 2016-01-08 18:30:09 +01:00
Tim Windelschmidt 9f174cb8e3 Removed deprecated Thingi and changed folder of views 2016-01-08 18:14:07 +01:00
Tim Windelschmidt 84e7689377 Updated ALL 2016-01-08 17:47:28 +01:00
Tim Windelschmidt 8d9133c6d3 Removed unused File and begin with update 2016-01-08 14:37:57 +01:00
Tim Windelschmidt e4fae9ca53 Moved the if(enabled) to notification api 2016-01-06 08:28:39 +01:00
Tim Windelschmidt 4586e7e12a Changed a lot (Button for Notifications etc.) 2016-01-06 08:11:55 +01:00
Tim Windelschmidt 407e3522cd Removed wrong line from package.json 2015-10-07 12:29:50 +02:00
Tim Windelschmidt 14f0af92e3 Added Codelines from the Shell 2015-10-07 12:23:39 +02:00
Tim Windelschmidt 8e041efb86 Moved the Notifications into the AngularJS System 2015-09-16 17:33:56 +02:00
Tim Windelschmidt 129fae722c Removed unused stuff 2015-09-16 17:16:15 +02:00
Tim Windelschmidt f598a2b20e Removed Dickbutt Easteregg 2015-09-16 16:02:40 +02:00
Tim Windelschmidt d300e734b3 Changed the log output 2015-09-16 15:04:30 +02:00
Tim Windelschmidt 0cacac09fa Changed the Notificationsystem for better usage 2015-09-15 08:19:24 +02:00
Tim Windelschmidt 8966f49322 Added Dickbutt easteregg (Idea by Pascal) 2015-09-12 20:55:40 +02:00
Tim Windelschmidt 623f9b665f Added Eastereggs and changed the server listening for better error catching 2015-09-11 21:14:24 +02:00
Tim Windelschmidt 3b5fd08cc4 Disabaled wrong Notification System 2015-09-06 18:34:30 +02:00
Tim Windelschmidt 78e823516c Added Browser Notifications 2015-09-05 20:06:23 +02:00
Tim Windelschmidt d24f1852bf Fixed errors 2015-09-05 16:20:21 +02:00