10876 Commits

Author SHA1 Message Date
1fc59a9049 Merge pull request #3433 from pblasquez/ajax_headers_2
Ajax headers for dashboard/config forms
2016-04-30 00:39:10 +01:00
8b1841fa81 Merge pull request #3432 from pblasquez/ajax_headers_1
Ajax headers for alert forms
2016-04-30 00:37:54 +01:00
a89b9bca5f Merge pull request #3404 from laf/billing-fix
Fixed issue with new bills not grabbing data
2016-04-30 00:26:02 +01:00
9dea0c8bd8 Merge pull request #3359 from Tristan-Labbe/Tristan-Labbe-VRF-ARP
VRF-LITE support ARP
2016-04-30 00:15:07 +01:00
65aa549064 Merge pull request #3440 from murrant/validate
Three new validate.php checks
2016-04-29 23:42:48 +01:00
bf1e7c2822 Three new validate.php checks
* Check that $config['install_dir'] is set correctly by checking that config.php exists there.
* Check if the local branch is not master, warn that it will prevent updates
* Check for modified files and list them (this will not include staged files)
2016-04-29 12:53:02 -05:00
ba48567f19 Added bad ifName and ifAlias regex matching
Allow user to ignore interfaces based on regex matching of ifName and
ifAlias values
2016-04-28 15:36:13 -07:00
0e33d20724 Merge remote-tracking branch 'refs/remotes/librenms/master' 2016-04-28 15:27:33 -07:00
4cc9203baa Allow for separate headers upon conditional 2016-04-28 14:42:06 -07:00
21e2b45cec Merge remote-tracking branch 'refs/remotes/librenms/master' into ajax_headers_4 2016-04-28 14:38:25 -07:00
f3c4dacf7d Allow for separate headers upon conditional 2016-04-28 14:38:20 -07:00
de03046936 Merge remote-tracking branch 'refs/remotes/librenms/master' into ajax_headers_3 2016-04-28 14:36:46 -07:00
186426933d Allow for separate headers upon conditional 2016-04-28 14:36:25 -07:00
ee8268bf07 Merge remote-tracking branch 'refs/remotes/librenms/master' into ajax_headers_2 2016-04-28 14:33:48 -07:00
71a57b6214 Allow for separate headers upon conditional 2016-04-28 14:30:03 -07:00
c295283807 Merge remote-tracking branch 'refs/remotes/librenms/master' into ajax_headers_1 2016-04-28 14:29:15 -07:00
bda6e7750d Removed incorrectly named definitions.php and replaced with correctly modified definitions.inc.php 2016-04-28 16:06:58 -05:00
2ec0b2c714 Merge branch 'issue-3437' of github.com:/cschoonover91/librenms into issue-3437 2016-04-28 16:04:18 -05:00
cdfe2f0c9e Fixed definitions filename broken on previous commit 2016-04-28 15:54:56 -05:00
ddebe2d3e4 Added Barracuda NG firewall OS detection 2016-04-28 15:08:48 -05:00
940e98e41e Merge pull request #3428 from laf/issue-2856
Added check for php.ini timezone being set
2016-04-28 12:29:58 +01:00
53269367fb Merge pull request #3410 from pblasquez/min_graph_height
Make minimum graph height configurable
2016-04-28 12:29:32 +01:00
6d37d36354 Merge pull request #3255 from HenocKA/issue280b
VRF Lite Support - update
2016-04-28 12:22:01 +01:00
2c57979011 forgot to add back max() 2016-04-26 16:07:20 -07:00
826cd17c33 Ajax headers for various 2016-04-26 15:13:01 -07:00
b5b3929d70 Ajax headers for devices and components 2016-04-26 15:06:29 -07:00
d2be07b49c Ajax headers for dashboard/config forms 2016-04-26 14:47:03 -07:00
d4d2736954 Ajax Headers for Alert Forms 2016-04-26 14:39:10 -07:00
8e8315dbcd Move config to WebUI 2016-04-26 12:56:58 -07:00
add7aeba6b Merge remote-tracking branch 'refs/remotes/librenms/master' 2016-04-26 12:56:32 -07:00
aeafdf58e9 Merge remote-tracking branch 'refs/remotes/librenms/master' into min_graph_height 2016-04-26 12:56:19 -07:00
8d4c65b8e8 Revert "Make minimum height configurable"
This reverts commit 292fe5901b79d3dee84085074a8478cd62291dbf.
2016-04-26 12:43:49 -07:00
ca9caca264 Update poller.php 2016-04-26 15:30:07 +02:00
laf
ad45ade8a0 Added check for php.ini timezone being set 2016-04-26 13:08:21 +00:00
7066c27b0a Merge pull request #3427 from adaniels21487/issue-3405-1
Nagios Services - Status update
2016-04-26 13:34:37 +01:00
048b553926 Nagios Services - Status update
- Fixed summary widgets
2016-04-26 22:05:34 +10:00
7edf31ffd7 Merge pull request #3423 from murrant/schema-113
Don't drop an index on a table that was just created
2016-04-25 23:11:47 +01:00
36682e16f8 Merge pull request #3426 from adaniels21487/issue-3418
Bugfix: Services widget on device overview page
2016-04-25 23:11:32 +01:00
9349bc4e68 Merge pull request #3425 from adaniels21487/issue-3405
Nagios Services - Update Service Message in the database when it has changed.
2016-04-25 23:11:13 +01:00
4545aea28d - Services widget on device overview page was still displaying legacy status
while the database has been storing nagios style status.
  Modified to: 0=Ok, 1=Unknown, 2=Critical.
2016-04-26 07:04:22 +10:00
a5617d4985 - Update Service Message in the database when it has changed. 2016-04-26 06:46:22 +10:00
40b598d9af Don't drop an index on a table that was just created 2016-04-25 14:55:51 -05:00
59428bbe44 Merge pull request #3256 from HenocKA/issue280-route
VRF Lite Support - adding route
2016-04-25 11:29:59 +01:00
c8b99e509a Merge pull request #3365 from rschueler/master
Support for Viprinet VPN Router
2016-04-25 11:28:43 +01:00
2afb0fed9e I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md. 2016-04-25 11:51:20 +02:00
f02bba3c11 Rename 115.sql to 113.sql 2016-04-25 10:17:05 +02:00
144acdfc49 renamed remaining viprinet.inc.php to viprinux.inc.php 2016-04-25 10:10:25 +02:00
93e059f2c1 Merge branch 'master' of https://github.com/librenms/librenms
Conflicts:
	includes/services/check_dhcp.inc.php
2016-04-25 08:48:04 +02:00
1c4cf026d4 Renamed Viprinet to Viprinux. Icon size now 32x32 2016-04-25 08:26:46 +02:00
1c3869c5f0 Merge pull request #3416 from murrant/netonix-poe
Add PoE state to Netonix devices
2016-04-24 20:00:46 +01:00