Commit Graph

2271 Commits

Author SHA1 Message Date
Daniel Preussker
cb9d3d1cbb Merge pull request #521 from laf/issue-463-2
Fixing mysql_strict issues / errors
2015-03-01 13:40:31 +01:00
Neil Lathwood
c57ac2dfb7 Merge pull request #496 from paulgear/compact-controls
Vertically compact controls on main graph screen
2015-02-28 13:42:59 +00:00
Neil Lathwood
e2caf52429 Merge pull request #524 from laf/issue-laf-129
Fixed javascript event. issue - stopped Firefox working
2015-02-27 12:07:12 +00:00
laf
dae96388e8 Fixed javascript event. issue - stopped Firefox working 2015-02-27 11:57:43 +00:00
laf
78a9b33c4b Updated split regex to cover more advanced rules 2015-02-27 11:51:54 +00:00
laf
e1b460320a Tidying up 2015-02-26 23:04:14 +00:00
mchasteen
984e4a8cab Fixed the global alert_rull add SQL. Added a default value for disabled (set to 0). This could probably be fixed in the schema if the default value is set. 2015-02-26 23:04:05 +00:00
mchasteen
a1ef2e0f69 Fixed the mysql auth include and the db schema. I set the desc field to be a varchar(200) and set it to be NULL by default (this is a personal preference but since it was not set in the code...). I fixed adduser function in html/includes/authentication/mysql.inc.php. I added $description and $twofactor to the function argument with default values and added descr and twofactor elements in the array passed to the dbInsert function call. OpenSuSE 13.2 2015-02-26 23:03:05 +00:00
mchasteen
c1c26bf831 Added new sensor - Battery Charge. Added discover and polling for APC UPSes. 2015-02-26 19:30:49 +00:00
Neil Lathwood
9864df0ff6 Merge pull request #518 from laf/issue-laf-126
Fixed resetting tags back to blank
2015-02-26 16:25:57 +00:00
laf
f4f204e801 Fixed resetting tags back to blank 2015-02-26 16:16:54 +00:00
laf
05a0bea5c5 Fixed SQL queries that broke in MySQL 5.5 2015-02-26 16:08:54 +00:00
laf
10293395b5 Added defining fault_detail variable 2015-02-26 12:45:31 +00:00
laf
213ef5fcf9 Final update from some comments from f0o 2015-02-26 12:32:54 +00:00
laf
814b289799 Small fix to get all triggered alerts and ui update 2015-02-26 12:24:37 +00:00
laf
d8cf061a30 Added alert details to alert page 2015-02-26 12:08:42 +00:00
Neil Lathwood
aa5d1e10a1 Clear out tags before adding current ones 2015-02-26 10:17:27 +00:00
Neil Lathwood
afdc291970 Added fix for <> being used in alert rules 2015-02-26 01:14:52 +00:00
Neil Lathwood
512334c7d2 Fixed event.Default which should be e.Default 2015-02-25 20:38:38 +00:00
Neil Lathwood
1f82280a60 Merge pull request #504 from laf/issue-laf-122
Shrunk the print_optionbar wells so they take up less space
2015-02-22 21:50:10 +00:00
laf
4c77b9a7c0 Shrunk the print_optionbar wells so they take up less space 2015-02-22 21:39:00 +00:00
laf
e34917977d Added logout icon 2015-02-22 21:15:09 +00:00
Neil Lathwood
cd43e11032 Fixed some scrut major issues 2015-02-22 19:28:09 +00:00
Neil Lathwood
2e7887f115 Merge pull request #501 from laf/scrut-performance
Fixed the performance issues in scrut
2015-02-22 18:16:10 +00:00
Neil Lathwood
6b985a2e59 Merge pull request #495 from Rosiak/master
Alert Log Creation
2015-02-22 17:52:21 +00:00
Neil Lathwood
2ef0cf8b80 Fixed the performance issues in scrut 2015-02-22 17:27:22 +00:00
Neil Lathwood
a4d3c8709d Fixed the scrut coding style issues 2015-02-22 16:45:40 +00:00
Paul Gear
414735c183 Vertically compact controls on main graph screen
I'm still not entirely happy with the layout, but this should be a
little more streamlined.  Feedback appreciated.
2015-02-22 21:55:56 +10:00
Søren Rosiak
97c244433a Alert Log Creation
- Creation of a alert log page
- Code from html/pages/eventlog.inc.php
2015-02-22 10:49:26 +01:00
Søren Rosiak
b68cfec27b Alerts subment change.
- Make alerts submenu entry available for non-admins too.
2015-02-22 10:15:32 +01:00
Neil Lathwood
8bb84755fb Merge pull request #489 from Rosiak/master
Menubar Change - Make Alert Submenu
2015-02-21 19:09:55 +00:00
Søren Rosiak
82b5805643 Update print-menubar.php
Add alerts sub-menu entry, based on feedback from lafwood.
2015-02-21 19:47:52 +01:00
Mike Rostermund
def585b784 Fixed typo in UI 2015-02-21 04:51:53 -08:00
Søren Rosiak
a3edd69d54 Menubar Change - Make Alert Submenu
- Change the "overview" of alerts info, into a submenu in "overview".
2015-02-20 14:25:36 +01:00
Rosiak
8c2f629e14 Change Default Page View
- Add print-alerts code
 - Change the view of the lower part of the front page from 12 columns
to 2 x 6 columns
 - Add alertlog entries to the new column
2015-02-20 00:33:49 +01:00
Rosiak
c5e95baa9b Small visual change to print-alerts.php
- Prints a link to the device instead of just text.
- Prints rule name instead of definition. Definition will appear if you
hover the mouse over the rule name.
2015-02-19 17:50:41 +01:00
Neil Lathwood
2159fd48fe Updated files pointing to invalid tables 2015-02-18 21:31:01 +00:00
Neil Lathwood
0596643b55 Fixed sql query for port stats call to include the device_id :/ 2015-02-18 16:22:52 +00:00
Neil Lathwood
776b06dec3 Merge pull request #473 from laf/issue-laf-118
Fixed bug meaning admin couldn't edit users
2015-02-17 13:15:53 +00:00
Neil Lathwood
5bccef0fac Fixed bug meaning admin couldn't edit users 2015-02-17 13:12:29 +00:00
Paul Gear
42881d3124 Merge pull request #472 from laf/issue-laf-119
Added support for api demo account
2015-02-17 10:46:44 +10:00
Neil Lathwood
ae43e39074 Added support for api demo account 2015-02-17 00:10:36 +00:00
Neil Lathwood
c1bbbaca1b Locked down edit user page as well 2015-02-16 23:55:36 +00:00
Neil Lathwood
2cb5d727b4 Updated to support a demo user 2015-02-16 23:45:28 +00:00
Neil Lathwood
f0b0ed4468 Merge pull request #469 from laf/issue-464
Removing badge for now, looks wrong
2015-02-16 20:19:44 +00:00
Neil Lathwood
da49912239 Removing badge for now, looks wrong 2015-02-16 20:19:04 +00:00
Neil Lathwood
7acc1447de Merge pull request #468 from laf/issue-464
Moved badge position in menu
2015-02-16 19:24:37 +00:00
Neil Lathwood
a5c12ff3b8 Moved badge position in menu 2015-02-16 19:24:08 +00:00
Rosiak
730caac74a Basic Ruckus Wireless Support
Basic device support for Ruckus Wireless devices.
2015-02-16 20:14:04 +01:00
Neil Lathwood
e85925df4f Updated All Devices menu to include the specific devices 2015-02-16 17:47:00 +00:00