Commit Graph
1864 Commits
Author SHA1 Message Date
Guillaume Coeugnet c6a022694b Update alerting.inc.php
Code indentation
2016-04-01 10:21:11 +02:00
Guillaume COEUGNET ac89c7b00c Add canopsis port parameter 2016-04-01 10:04:58 +02:00
gcoeugnet 758453938e Update alerting.inc.php 2016-03-29 15:43:31 +02:00
Neil Lathwood a9b50a47dd Merge pull request #3279 from pheinrichs/issue-3277
Added Cambium Support
2016-03-29 11:46:29 +01:00
Thom Seddon d2dd3e256f Fix URL path to ajax_form.php for testing alerts 2016-03-23 09:43:34 +00:00
Paul Heinrichs a13d148fb1 Added Signal Sensor 2016-03-22 10:37:07 -04:00
Neil Lathwood 6b896d0cb7 Merge pull request #3239 from richardlawley/billing-search
Convert bills list to Bootgrid
2016-03-17 21:09:10 +00:00
Daniel Preussker 57339c4221 Merge pull request #3221 from ekoyle/add_web_html_email_option
Add web config option for HTML emails
2016-03-16 14:44:51 +00:00
Eldon Koyle 6a53bcf688 Add web config option for HTML emails 2016-03-15 16:55:27 -06:00
Richard Lawley b2c015b58c Add Interface at bill create screen 2016-03-14 19:18:53 +00:00
Richard Lawley cbb8699fb8 Convert table to bootgrid 2016-03-14 16:30:55 +00:00
Richard Lawley c35afb1e1c Implement Billing Search 2016-03-10 18:11:39 +00:00
Neil Lathwood d996a7af3c Merge pull request #3195 from richardlawley/issue-3151
Historical Billing Graphs use correct values for 95th line
2016-03-10 12:50:09 +00:00
Neil Lathwood 3983705ba3 Merge pull request #3194 from richardlawley/update-billing-ui
Update Billing UI
2016-03-09 20:35:29 +00:00
Richard Lawley 972429838b Redirect to edit page afer add bill 2016-03-09 08:26:32 +00:00
Richard Lawley 069c06716e Make billing graphs take times from bill_hist_id and use that for 95th 2016-03-08 21:43:10 +00:00
Neil Lathwood 56caedbaff Merge pull request #3188 from geordish/issue-1674
Corrected inserting ' into overide syslocation string
2016-03-08 20:54:35 +00:00
Richard Lawley fca483439e Remove Edit link if not admin 2016-03-08 19:12:15 +00:00
Richard Lawley bd640ebc08 Update History Page to match 2016-03-08 18:45:55 +00:00
Richard Lawley 9f136c06de Update Billing UI to match rest of app 2016-03-08 18:21:29 +00:00
David Bell a33d16dafa Corrected inserting ' into overide syslocation string 2016-03-08 11:18:33 +00:00
David Bell d2db4a4af2 Corrected aggregate graph on smokeping page 2016-03-07 11:40:47 +00:00
Richard Lawley b8f6b3555c Previous Billing Period view links directly to historical usage 2016-03-03 15:03:06 +00:00
Richard 6f61ec37d5 Updated Apps layout to use panels 2016-02-29 13:23:42 +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
Rosiak f298ccb30f Scrut fix 2016-02-27 19:12:13 +01: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 928fd70ced Proper State Monitoring 2016-02-26 23:40:34 +01: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
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
Harm van Tilborg 09f03c0e52 Adapted device edit form to include larger purpose field 2016-02-24 13:36:42 +01:00
Neil Lathwood fa8027b525 Merge pull request #3065 from adaniels21487/issue-3038
CBQoS not displaying policies
2016-02-23 10:58:50 +00:00
Aaron Daniels f18fa9e455 - Pre-Init the $options array.
In some scenarios $options was already set with a previous filter.
- Remove RRD file checking, test for existance of components instead.
2016-02-23 17:16:51 +10:00
f0o dcbe31fe6b Added last-check on services 2016-02-22 08:38:51 +00:00
Neil Lathwood 46a17eabf0 Merge pull request #2957 from Rosiak/issue-2557
Make Global Search Limit Configurable
2016-02-20 10:30:48 +00:00
Daniel Preussker 731e43bc66 Revert "[WIP] Sanity!" 2016-02-17 13:59:58 +00:00
Neil Lathwood 633ac101eb Merge pull request #2979 from f0o/sanity
[WIP] Sanity!
2016-02-16 21:44:10 +00:00
Rosiak 1c630b0b8d Move function to WebUI
Based on Neil’s suggestion.
2016-02-13 21:09:45 +01:00
Tony Murray f824fd123e Always define $config_total. Default is 1. 2016-02-12 14:44:32 -06:00
Tony Murray 564146dc8c Fix inverted diff. 2016-02-12 14:40:04 -06:00
Tony Murray 31897758e5 Restore $config['oxidized']['features']['versioning']. 2016-02-12 14:27:55 -06:00
Tony Murray cc344bf3c3 Use Oxidized's built in diffing capability. Drops the need for xdiff and one http call. 2016-02-12 14:21:55 -06:00
Tony Murray 28216f67b0 Merge branch 'master' into config_diff 2016-02-12 10:36:18 -06:00
Tony Murray aa9d4798dc Remove $config['oxidized']['features']['versioning']. I did not update the schema to remove the entry from the config table.
Update the documentation a bit.

Issue #2812
2016-02-12 10:23:49 -06:00
Daniel Preussker e064d7ddff Merge pull request #2988 from laf/issue-2947
Added show/hide line numbers button to show config page
2016-02-12 08:12:41 +00:00
laf 6b7030c082 Added show/hide line numbers button to show config page 2016-02-11 23:19:56 +00:00
laf 4aaf4d8a7b Added missing from email settings field 2016-02-11 22:11:07 +00:00
Neil Lathwood a9e81c2bfb Merge pull request #2955 from arjitc/patch-24
Merge launch, SSH, telnet and settings into 1 dropdown
2016-02-11 21:43:26 +00:00