Neil Lathwood
c8fcce1ed3
Merge pull request #1381 from sthen/more-ups
...
Support additional UPS
2015-07-05 19:50:04 +01:00
Neil Lathwood
50338c2b8d
Merge pull request #1377 from clinta/patch-2
...
Do not allow the master to join twice
2015-07-05 19:43:53 +01:00
Neil Lathwood
1380230ad3
Merge pull request #1376 from travishegner/datepicker
...
Fix datepicker timezone issue(s) #1374 , #1239 , #1241
2015-07-05 19:42:18 +01:00
sthen
75704eba87
Use correct divisor for frequencies on Huawei UPS
2015-07-04 20:47:46 +01:00
sthen
ffbe06f64b
Check netmanplus UPS by OID as well as descr, tested with Netman 204
2015-07-04 20:22:34 +01:00
sthen
69e9929ddb
Support Huawei UPS, tested with UPS5000
2015-07-04 20:22:29 +01:00
Clint Armstrong
fd0617acca
Do not allow the master to join twice
...
If the poller master doesn't complete in time and ends up with overlapping jobs, neither job will ever complete because both running jobs will think they are the master and wait for the remaining node to exit.
2015-07-02 15:30:57 -04:00
Travis Hegner
67257f868b
Merge remote-tracking branch 'upstream/master' into datepicker
2015-07-02 15:30:00 -04:00
Travis Hegner
6314aaddd4
removing commented code
2015-07-02 15:12:42 -04:00
Travis Hegner
6878e380b3
using moment.js since we have it anyway
2015-07-02 15:10:49 -04:00
Travis Hegner
d3aea6757b
trying a more universal (perhaps not standard) format
2015-07-02 15:05:05 -04:00
Travis Hegner
01e4a6650e
putting the T back with Z this time
2015-07-02 14:59:11 -04:00
Travis Hegner
0ab00ba0fb
debug output
2015-07-02 14:55:42 -04:00
Travis Hegner
0fbcc0d1b6
ff failing to parse
2015-07-02 14:54:36 -04:00
Travis Hegner
29244a49dc
js syntax error
2015-07-02 14:39:28 -04:00
Travis Hegner
a9fa366415
js syntax error
2015-07-02 14:34:40 -04:00
Travis Hegner
054022346e
prevent form submission from converting to UTC
2015-07-02 14:33:19 -04:00
Travis Hegner
f11262eb9d
formatting date with javascript, so it auto converts to localtime
2015-07-02 14:30:43 -04:00
Travis Hegner
9a99af06c8
debug output
2015-07-02 14:24:37 -04:00
Travis Hegner
4655143167
debug output
2015-07-02 14:23:03 -04:00
Travis Hegner
48a380ff7e
debug output
2015-07-02 14:21:10 -04:00
Travis Hegner
2a7eb47437
debug output
2015-07-02 14:12:33 -04:00
Travis Hegner
5ac243f731
debug output
2015-07-02 14:10:16 -04:00
Travis Hegner
abeb015e33
debug output
2015-07-02 14:09:23 -04:00
Travis Hegner
a2e248cf4b
trying to set the date from js
2015-07-02 14:06:02 -04:00
Travis Hegner
dbb256d431
change the order to see if it shows date immediatly
2015-07-02 13:56:28 -04:00
Travis Hegner
f2fe24c602
use js to convert
2015-07-02 13:54:27 -04:00
Travis Hegner
8d49395b10
test static TZ parse
2015-07-02 13:41:54 -04:00
Neil Lathwood
7d6dbe4d9b
Merge pull request #1372 from laf/api-rules-fix
...
Fixed issue with name not being set + some validation around this
2015-07-01 22:00:10 +01:00
laf
e9d7d74b72
Fixed issue with name not being set + some validation around this
2015-07-01 21:35:37 +01:00
Neil Lathwood
ca30885368
Merge pull request #1369 from travishegner/master
...
I agree to the conditions of the Contributor Agreement
2015-06-30 16:29:29 +01:00
Travis Hegner
3b52239945
I agree to the conditions of the Contributor Agreement
...
contained in doc/General/Contributing.md.
2015-06-30 10:12:07 -04:00
Daniel Preussker
3c53c67035
Merge pull request #1368 from clinta/patch-1
...
Update to the freqency DS used in collectd > 5.0
2015-06-30 11:54:26 +00:00
Clint Armstrong
b92e9f2d8f
Update to the freqency DS used in collectd > 5.0
...
Similar to #1347 and #1349
2015-06-30 07:46:09 -04:00
Daniel Preussker
d9b3e4b47a
Merge pull request #1367 from laf/api-graph-fix
...
Fixed API graphs not loading
2015-06-30 09:51:17 +00:00
laf
a7d83be1af
Fixed API graphs not loading
2015-06-30 10:48:08 +01:00
Daniel Preussker
cb8b5e3ffd
Merge pull request #1359 from laf/issue-1355
...
Updated regex for device groups
2015-06-29 21:16:51 +02:00
Neil Lathwood
def582a18f
Merge pull request #1363 from travishegner/master
...
Fix issue #1362 , added a line to reset , because the calling page is …
2015-06-29 15:43:04 +01:00
Travis Hegner
8e785ebaaa
Fix issue #1362 , added a line to reset , because the calling page is expecting new graphs, not appended ones
2015-06-29 10:34:03 -04:00
Neil Lathwood
14bc6ebff5
Merge pull request #1360 from arnoldthebat/issue-1358
...
Added HOST-RESOURCES-MIB:: to allow detection of Synology devices
2015-06-28 20:17:21 +01:00
Tony Ditchfield
4e34aecce5
AUTHORS addition
2015-06-28 19:05:43 +01:00
Tony Ditchfield
90563c5b1d
Added HOST-RESOURCES-MIB:: to allow detection of Synology devices
2015-06-28 18:54:55 +01:00
laf
5c6e4995ab
Updated regex for device groups
2015-06-28 16:25:20 +01:00
Daniel Preussker
e95d17d1c3
Merge pull request #1356 from laf/issue-1352
...
Added some additional info from pfsense units
2015-06-28 14:02:57 +02:00
Daniel Preussker
72a518055d
Merge pull request #1354 from laf/issue-1335
...
Added Services extension doc to help people set this up
2015-06-28 13:13:40 +02:00
laf
505429db4d
Added some additional info from pfsense units
2015-06-27 22:11:54 +01:00
laf
6ed37c67a5
Added Services extension doc to help people set this up
2015-06-27 21:22:59 +01:00
Neil Lathwood
aed0fedf02
Merge pull request #1349 from clinta/entropy-collectd
...
entropy DS name is value.
2015-06-26 16:29:15 +01:00
Neil Lathwood
322d6ecf1f
Merge pull request #1350 from clinta/urlencode-graphs
...
url encode graph names
2015-06-26 16:19:39 +01:00
Clint Armstrong
dbae0e371f
url encode graph names
2015-06-26 10:26:52 -04:00
Neil Lathwood