Commit Graph
17185 Commits
Author SHA1 Message Date
Paul Gear 7d94985c3c Fix typo 2015-03-09 08:17:28 +10:00
Paul Gear f647c43d81 Minor reformats on documentation; remove no-longer-relevant sections 2015-03-09 08:09:53 +10:00
laf 32cc575bdb Removed cycle2 .map reference 2015-03-08 21:50:17 +00:00
laf fa3944cd8f Final version of jquery pause / resume for page refresh 2015-03-08 21:33:40 +00:00
Eric Mann ee7b5be322 Merge in fade changes 2015-03-06 14:15:21 -08:00
Eric Mann 7db7addfde Grunt changes 2015-03-06 14:15:07 -08:00
Eric Mann 41a183b22d Add an optional final parameter to add_widget. 2015-03-06 12:22:29 -08:00
floyd_hawkes fc75ce5d46 Release v0.6.3 2015-03-06 14:41:24 -05:00
floyd_hawkes 6bb47dc1ce fix(gridster): fixing resize limits when in fixed width mode
feature(gridster): added fix_to_content function to fit widget dimensions to a given width and height
feature(gridster): added resize_widget_dimensions function
refactor(gridster): moved code to set number of columns in grid to helper function
2015-03-06 14:36:05 -05:00
Daniel Preussker 30bc941653 Merge pull request #553 from laf/issue-laf-142
Moved search box back to the right and aligned dropdown
2015-03-06 17:14:37 +00:00
laf 7fd470925b Moved search box back to the right and aligned dropdown 2015-03-06 15:52:54 +00:00
laf 01a8b97900 Moved to jquery for refresh 2015-03-06 15:49:35 +00:00
f0o 1f5d5eeeca Future proof db-cleanup on device deletion. 2015-03-05 22:57:02 +00:00
Daniel Preussker e535b7ddda Merge pull request #551 from laf/issue-laf-141
Updated new_alert_rule modal to not die and instead only return the page for admins
2015-03-05 13:55:59 +01:00
Daniel Preussker de5eda322d Merge pull request #550 from laf/issue-laf-140
Added @ to split rule for alerts
2015-03-05 13:55:22 +01:00
laf 1238498696 Updated new_alert_rule modal to not die and instead only return the page for admins 2015-03-05 11:40:02 +00:00
laf 12da6984cc Added @ to split rule for alerts 2015-03-05 11:35:54 +00:00
Neil Lathwood 71bdf65dfa Merge pull request #543 from mchasteen/issue-542
Added temperature support for APC portable AC units.
2015-03-04 22:50:34 +00:00
mchasteen 0df4a86a0a Cleaned up for scrutinizer. 2015-03-04 14:24:31 -07:00
Daniel Preussker 17db6d78ff Merge pull request #546 from laf/issue-laf-139
Fixed array_unique key issue for alerts
2015-03-04 16:35:52 +01:00
laf 851a998954 Fixed array_unique key issue for alerts 2015-03-04 15:33:18 +00:00
floyd_hawkes 14e08d9fe0 refactor(gridster): adding callback to add_widget function 2015-03-04 10:18:48 -05:00
Neil Lathwood 1bbb70c901 Merge pull request #545 from mchasteen/issue-544
Fixed some formatting for generic sensors.
2015-03-04 07:51:31 +00:00
mchasteen 4013ca3a5a Fixed some formatting for generic sensors. 2015-03-03 17:06:49 -07:00
mchasteen 0bb26b9800 Added temperature support for APC portable AC units. 2015-03-03 16:55:30 -07:00
Neil Lathwood fe9f1abd39 Merge pull request #541 from Rosiak/master
Print alert state and a matching glyphic
2015-03-03 20:15:27 +00:00
Søren Rosiak dbf0107827 Update print-alerts.inc.php
- Changed using lafwoods suggested changes.
2015-03-03 19:25:20 +01:00
Rosiak d0997d09d4 Print alert state and a matching glyphic
- Print alert state on default front page and on alert-log page.
Prints the state and a matching glyphicon.
2015-03-03 18:48:40 +01:00
Neil Lathwood 7c1b6f4fbc Merge pull request #540 from laf/issue-laf-138
Bug fix to make devices search box work again!
2015-03-03 15:19:42 +00:00
laf 1ed27b1acb Bug fix to make devices search box work again! 2015-03-03 15:07:56 +00:00
Neil Lathwood 549513662a Merge pull request #539 from laf/issue-laf-137
Updated .gitignore to remove .ircbot.alert
2015-03-03 15:07:55 +00:00
Neil Lathwood 7b31e98bfe Updated .gitignore to remove .ircbot.alert 2015-03-03 14:17:55 +00:00
Glen Pike c0a2bde09c Fix for bug #493 including unit tests to prove.
Run npm install and visit test/jquery.gridster-amd.html in browser.
2015-03-03 00:46:11 +00:00
Walter Dal Mut 6d9bd14be4 Merge tag '0.3.0' into develop
Added HTTP Adapter thanks to @lekz
2015-03-02 20:58:56 +01:00
Walter Dal Mut f8f33bd16a Merge branch 'release/0.3.0' 2015-03-02 20:58:12 +01:00
Walter Dal Mut 162b61fe10 Bumped version 0.3.0 2015-03-02 20:58:00 +01:00
Walter Dal Mut c33df3964c Merge pull request #11 from lekz/master
Added new HttpAdapter
2015-03-02 20:54:37 +01:00
lekzandWalter Dal Mut a8fe33a381 Added new HttpAdapter
Conflicts:
	src/InfluxDB/Adapter/GuzzleAdapter.php
2015-03-02 20:52:50 +01:00
lekz 64aa8b45d3 Added new HttpAdapter 2015-03-02 21:37:37 +02:00
Neil Lathwood 800bd80fc4 Merge pull request #538 from Rosiak/master
Add ifAlias to graph view.
2015-03-02 17:51:53 +00:00
Rosiak e1a5dd0110 Add ifAlias to graph view.
- Small visual improvement
2015-03-02 18:32:36 +01:00
Daniel Preussker 5c5203a0c1 Merge pull request #537 from laf/issue-laf-136
Removing closing ?> in config.php.default
2015-03-02 18:31:58 +01:00
laf 9441295f41 Removing closing ?> in config.php.default 2015-03-02 17:30:43 +00:00
Neil Lathwood 93ba1c61f9 Merge pull request #536 from SaaldjorMike/ciscosb-4
Changed to use mib instead of hardcoded oid
2015-03-02 11:38:10 +00:00
Mike Rostermund abfb335967 Changed to use mib instead of hardcoded oid 2015-03-02 03:08:56 -08:00
Daniel Preussker 608f340186 Merge pull request #535 from laf/issue-laf-134-2
Actually excluding from scrutinizer this time!
2015-03-01 19:55:30 +01:00
laf 909fcaa2a8 Actually excluding from scrutinizer this time! 2015-03-01 18:52:07 +00:00
Daniel Preussker 842feb7052 Merge pull request #534 from laf/issue-laf-135
Fixes bug that stops search box for ports and devices to be shown
2015-03-01 19:47:13 +01:00
laf 2c00d26a96 Fixed if statement to bring back port search bar 2015-03-01 18:42:52 +00:00
laf 8a932df6e8 Fixed if statement to bring back device search bar 2015-03-01 18:40:01 +00:00