10152 Commits

Author SHA1 Message Date
dottoremoe
65ec66666d Update Acknowledgement.md 2016-03-01 06:59:52 +08:00
Neil Lathwood
282ac48dfd Merge pull request #3117 from richardlawley/app-page-layout
Updated Apps layout to use panels
2016-02-29 22:04:23 +00:00
Tony Murray
7c3af01638 Merge pull request #3120 from murrant/fix-3118
Fix os images with subdirectories in url
2016-02-29 11:36:10 -06:00
Tony Murray
ade3c81570 Need global $config to be able to access it. 2016-02-29 11:26:03 -06:00
Tony Murray
8400962130 Fix os images with subdirectories in url
Fix #3118
Obviously, the answer to the question in the code is yes
2016-02-29 11:20:03 -06:00
Richard
6f61ec37d5 Updated Apps layout to use panels 2016-02-29 13:23:42 +00:00
Daniel Preussker
5e9bbea801 Merge pull request #3109 from Rosiak/fix-state-dev-overview-bug
Fix Device Overview Display
2016-02-28 19:11:41 +00:00
Rosiak
eff7e18d4e Align tables
Something that bugged me for a while..
2016-02-28 02:29:51 +01:00
Rosiak
74db415404 Fixup 2016-02-28 01:27:23 +01:00
Neil Lathwood
2bf9fa1409 Merge pull request #3102 from Rosiak/state-monitoring
Proper State Monitoring
2016-02-27 18:56:09 +00:00
Rosiak
f298ccb30f Scrut fix 2016-02-27 19:12:13 +01:00
Rosiak
5a831c6dbc Check if it exists in table before inserting 2016-02-27 16:23:58 +01:00
Rosiak
73149f3f19 More updates
Add sensor_prev to be able to alert on state change

Add docs
2016-02-27 15:29:11 +01:00
Neil Lathwood
970a332023 Merge pull request #3106 from laf/alert-ip-fix2
Added check if that value is set
2016-02-27 11:52:23 +00:00
laf
7e483f6bd2 Added check if that value is set 2016-02-27 11:51:31 +00:00
Søren Rosiak
5149a94397 Merge pull request #3103 from laf/alert-ip-fix 2016-02-27 11:48:26 +01:00
laf
a028689095 Updated alerts query to change ip 2016-02-27 03:54:07 +00:00
Rosiak
6923a32dbd A few things
ucwords = happy ocd

Basic state page

Allign order = happy ocd
2016-02-27 02:35:28 +01:00
Rosiak
ebe9154934 Added more sensors 2016-02-27 01:56:50 +01:00
Rosiak
d030e959df Scrut fix 2016-02-26 23:56:54 +01:00
Rosiak
687bedf131 Add license stuff.. 2016-02-26 23:50:32 +01:00
Rosiak
928fd70ced Proper State Monitoring 2016-02-26 23:40:34 +01:00
Neil Lathwood
d0f844e776 Merge pull request #3100 from murrant/issue-3090
Make sure port_assoc_mode is an int before inserting a device into the db
2016-02-26 16:51:35 +00:00
Neil Lathwood
33b459e17a Merge pull request #3097 from richardlawley/contributoragreement
Update AUTHORS.md
2016-02-26 15:07:08 +00:00
Richard Lawley
af6c57070c I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-02-26 14:15:54 +00:00
Tony Murray
f8f895e5b1 Make sure port_assoc_mode is an int before inserting a device into the db.
fixes #3090
2016-02-26 08:05:07 -06:00
Neil Lathwood
7f21325e9f Merge pull request #3093 from murrant/php_fixes
Fix a few php errors for syslog, and everywhere else.
2016-02-26 13:26:28 +00:00
Neil Lathwood
2762c586ff Merge pull request #3082 from hvt/enlarge-device-purpose-field
Enlarge device purpose (description) field
2016-02-26 13:24:35 +00:00
Neil Lathwood
cdca29e00b Merge pull request #3076 from murrant/device_icon
Populate device icon in the database
2016-02-26 13:18:47 +00:00
Neil Lathwood
c4acda6c0c Merge pull request #3091 from murrant/avtech
Support Avtech Sensors
2016-02-26 13:15:46 +00:00
Neil Lathwood
00dc1bf8ac Merge pull request #3089 from GeorgesDick/patch-10
Create qnap.inc.php
2016-02-26 13:03:53 +00:00
Neil Lathwood
da0ad58683 Merge pull request #3088 from GeorgesDick/patch-9
Create qnap.inc.php
2016-02-26 13:03:25 +00:00
Neil Lathwood
cbc039fddb Merge pull request #3063 from csmithATsquiz/daily_autoupdate
Disabling auto-updates doesn't work
2016-02-26 11:39:40 +00:00
Tony Murray
9f22b18dc8 Split is removed in PHP7, replace with explode as none were using it as a regex.
Also fix two array keys without quotes in include/syslog.php
Fixes #2205
2016-02-25 14:34:06 -06:00
GeorgesDick
6f5c83f3c9 Create qnap.inc.php
Collect QNAP Turbo NAS disk temperatures
2016-02-25 09:49:08 +01:00
GeorgesDick
02b0c8bf4f Create qnap.inc.php
Get QNAP Turbo NAS Fans speeds
2016-02-25 09:46:35 +01:00
Neil Lathwood
d9dcebb878 Merge pull request #3086 from pblasquez/pblasquez-poller_group
Polling group check should not require distributed polling
2016-02-24 21:04:35 +00:00
pblasquez
be9db5a19e Update discovery.php 2016-02-24 12:48:22 -08:00
Neil Lathwood
c07b5cee73 Merge pull request #3083 from vizay/widget-genericimage-addurltarget
Widget: Generic image, add target url for image
2016-02-24 13:59:50 +00:00
vizay
a3671fc38b Added target parameter so it opens in a new tab/window 2016-02-24 14:52:15 +01:00
Neil Lathwood
85c221803f Merge pull request #3071 from GeorgesDick/patch-5
Eaton UPS - Voltage Discovery
2016-02-24 13:16:57 +00:00
Neil Lathwood
b786e2042a Merge pull request #3079 from GeorgesDick/patch-8
Update definitions.inc.php
2016-02-24 13:16:12 +00:00
Neil Lathwood
8c060136ab Merge pull request #3073 from GeorgesDick/patch-6
Update AUTHORS.md
2016-02-24 13:15:00 +00:00
Neil Lathwood
c3eecb3879 Merge pull request #3070 from GeorgesDick/patch-4
Eaton UPS - Frequency Discovery
2016-02-24 13:14:12 +00:00
Neil Lathwood
92df310be1 Merge pull request #3066 from GeorgesDick/patch-3
Eaton UPS - Current Discovery
2016-02-24 13:13:50 +00:00
Neil Lathwood
12dfcd0fbd Merge pull request #3067 from GeorgesDick/patch-2
Eaton UPS - OS Discovery
2016-02-24 13:12:34 +00:00
Neil Lathwood
0b9c6656ce Merge pull request #3077 from GeorgesDick/patch-7
Update AUTHORS.md
2016-02-24 13:12:07 +00:00
root
910f43b31d Added possibility to specify url target for clicking the image added in the widget 2016-02-24 13:37:57 +01:00
Harm van Tilborg
09f03c0e52 Adapted device edit form to include larger purpose field 2016-02-24 13:36:42 +01:00
Harm van Tilborg
3397e09574 Modified schema to enlarge device's purpose field 2016-02-24 13:21:31 +01:00