c8fcce1ed3
Merge pull request #1381 from sthen/more-ups
...
Support additional UPS
2015-07-05 19:50:04 +01:00
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
1380230ad3
Merge pull request #1376 from travishegner/datepicker
...
Fix datepicker timezone issue(s) #1374 , #1239 , #1241
2015-07-05 19:42:18 +01:00
33e8723840
fix nginx config file location
...
fix nginx config file location
2015-07-05 17:14:50 +03:00
abe773c1c3
Update docs to reflect ntp service being added.
2015-07-05 15:24:58 +02:00
96f70b1b9b
Add ntp service monitoring.
2015-07-05 15:24:37 +02:00
01714ed03b
When check_mysql is run with -n option it returns MySQL OK. Also accept that as an status=1 indication.
2015-07-05 00:47:51 +02:00
bf8df0fbe2
Pass service parameters to check_ssh allowing one to specify alternative port for ssh for example using -p flag.
2015-07-05 00:35:33 +02:00
049fd54beb
Add support fo PBN CPE device"
...
Fixes #1382
2015-07-04 23:22:26 +02:00
75704eba87
Use correct divisor for frequencies on Huawei UPS
2015-07-04 20:47:46 +01:00
ffbe06f64b
Check netmanplus UPS by OID as well as descr, tested with Netman 204
2015-07-04 20:22:34 +01:00
69e9929ddb
Support Huawei UPS, tested with UPS5000
2015-07-04 20:22:29 +01:00
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
67257f868b
Merge remote-tracking branch 'upstream/master' into datepicker
2015-07-02 15:30:00 -04:00
f11a8f1be7
Keeping branch up to date with master until it's merged in
...
Merge remote-tracking branch 'upstream/master' into lazyload
2015-07-02 15:28:21 -04:00
6314aaddd4
removing commented code
2015-07-02 15:12:42 -04:00
6878e380b3
using moment.js since we have it anyway
2015-07-02 15:10:49 -04:00
d3aea6757b
trying a more universal (perhaps not standard) format
2015-07-02 15:05:05 -04:00
01e4a6650e
putting the T back with Z this time
2015-07-02 14:59:11 -04:00
0ab00ba0fb
debug output
2015-07-02 14:55:42 -04:00
0fbcc0d1b6
ff failing to parse
2015-07-02 14:54:36 -04:00
29244a49dc
js syntax error
2015-07-02 14:39:28 -04:00
a9fa366415
js syntax error
2015-07-02 14:34:40 -04:00
054022346e
prevent form submission from converting to UTC
2015-07-02 14:33:19 -04:00
f11262eb9d
formatting date with javascript, so it auto converts to localtime
2015-07-02 14:30:43 -04:00
9a99af06c8
debug output
2015-07-02 14:24:37 -04:00
4655143167
debug output
2015-07-02 14:23:03 -04:00
48a380ff7e
debug output
2015-07-02 14:21:10 -04:00
2a7eb47437
debug output
2015-07-02 14:12:33 -04:00
5ac243f731
debug output
2015-07-02 14:10:16 -04:00
abeb015e33
debug output
2015-07-02 14:09:23 -04:00
a2e248cf4b
trying to set the date from js
2015-07-02 14:06:02 -04:00
dbb256d431
change the order to see if it shows date immediatly
2015-07-02 13:56:28 -04:00
f2fe24c602
use js to convert
2015-07-02 13:54:27 -04:00
8d49395b10
test static TZ parse
2015-07-02 13:41:54 -04:00
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
e9d7d74b72
Fixed issue with name not being set + some validation around this
2015-07-01 21:35:37 +01:00
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
8f4878da5c
adding credits for lazyloading library
2015-06-30 10:47:42 -04:00
1bdfb6cbc8
fix indenting, adding comments
2015-06-30 10:41:09 -04:00
1671ba3eec
Merge branch 'master' into lazyload
2015-06-30 10:39:06 -04:00
3b52239945
I agree to the conditions of the Contributor Agreement
...
contained in doc/General/Contributing.md.
2015-06-30 10:12:07 -04:00
9a635e202b
Merge branch 'master' into lazyload
2015-06-30 10:09:28 -04:00
d8329f3a9c
no full-size-mode
2015-06-30 09:53:47 -04:00
b2e89a58ef
trying full-size-mode in the right place
2015-06-30 09:43:04 -04:00
885355f6c3
full not fill
2015-06-30 09:36:34 -04:00
df8c76ca4f
testing full-size-mode
2015-06-30 09:32:44 -04:00
63d50bf456
putting WxH back again
2015-06-30 09:11:32 -04:00
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
b92e9f2d8f
Update to the freqency DS used in collectd > 5.0
...
Similar to #1347 and #1349
2015-06-30 07:46:09 -04:00
