2802 Commits

Author SHA1 Message Date
Job Snijders
76636702d7 Remove empty file 2015-07-11 16:12:35 +02:00
Job Snijders
ebd0f6fc35 Apply "Squiz" code style on old (pre-2014) files 2015-07-11 16:12:35 +02:00
Paul Gear
51ff0df11b Really allow dividing as well as multiplying 2015-07-11 18:15:15 +10:00
Paul Gear
249707e2c6 Show agent execution time in seconds
Because a graph that shows a value of 1.25k milliseconds doesn't make a lot of sense.
2015-07-11 18:15:15 +10:00
Paul Gear
c3adf36d88 Allow dividing as well as multiplying 2015-07-11 18:15:15 +10:00
Paul Gear
5ea6762f20 phpcbf run 2015-07-11 18:15:15 +10:00
Paul Gear
ef9049464a Merge pull request #1402 from willjones/issue-1396
Add Meraki support
2015-07-10 22:02:03 +10:00
Daniel Preussker
7560d5dc57 Merge pull request #1411 from laf/issue-1289
Fixes a number of user permission issues
2015-07-10 09:51:31 +00:00
Paul Gear
1e508e9bf6 Merge pull request #1412 from laf/issue-1403
Added running status for bgp peers
2015-07-10 13:33:56 +10:00
Daniel Preussker
25b19babbb Merge pull request #1413 from laf/issue-1398
Re-enabled the remove search link for devices!
2015-07-08 12:20:51 +00:00
Daniel Preussker
0dfd0dfb0f Merge pull request #1353 from laf/issue-1348
Now save the connection value selected and remove when not needed
2015-07-08 12:17:48 +00:00
laf
dd32e01113 Re-enabled the remove search link for devices! 2015-07-08 00:22:36 +01:00
laf
88c838ca23 Added running status for bgp peers 2015-07-08 00:07:39 +01:00
laf
a044782420 Final updates to fix user perms for ipv4/ipv6 and mac search 2015-07-07 23:59:13 +01:00
laf
9a43454700 Fixed mac user perm queries 2015-07-07 23:34:56 +01:00
laf
fba1e6933a removed debug 2015-07-07 23:28:00 +01:00
laf
3ed8d261a7 Fixed arp search page user perm queries 2015-07-07 23:26:03 +01:00
laf
b1a052f357 Some permission updates for non-admin users 2015-07-07 23:18:57 +01:00
willjones
7ab690f45e Meraki Logo. Source = Meraki Partner Portal 2015-07-06 21:49:13 +01:00
Will Jones
93c0e8ae9c Delete meraki.png 2015-07-06 21:37:18 +01:00
willjones
016b759858 Added Meraki OS discovery and polling 2015-07-06 21:17:50 +01:00
Tony Ditchfield
23fdc03ded Added load and state icons from silkicons set 2015-07-05 20:58:56 +01: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
laf
e9d7d74b72 Fixed issue with name not being set + some validation around this 2015-07-01 21:35:37 +01: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
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
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
laf
5c6e4995ab Updated regex for device groups 2015-06-28 16:25:20 +01:00
laf
4bef35c90a Now save the connection value selected and remove when not needed 2015-06-27 17:41:31 +01:00