10201 Commits

Author SHA1 Message Date
9773b3bade Tabs to spaces 2016-03-04 11:30:11 +01:00
e2d2c6aa38 Merge pull request #3154 from laf/syslog-test
Updated syslogTest to work with php 5.3
2016-03-03 15:55:46 -06:00
laf
f395cbdefe Updated to work with php 5.3 2016-03-03 21:21:28 +00:00
da2ca8ed25 Merge pull request #3152 from laf/travis-fix
Fixed .travis.yml
2016-03-03 20:22:06 +00:00
24003e5681 Merge pull request #3150 from laf/test-fix
Couple of small fixes
2016-03-03 20:08:22 +00:00
695baede4e Merge pull request #3121 from Rosiak/juniper-state
Juniper State Support
2016-03-03 20:07:34 +00:00
laf
8cd767f22f Fixed .travis.yml 2016-03-03 20:04:09 +00:00
laf
89f0952bc3 Couple of small fixes 2016-03-03 19:56:18 +00:00
fa23fc4b6d Merge pull request #3099 from murrant/syslog-cisco
Simplify and fix Cisco ios,iosxe,catos syslog processing
2016-03-03 19:55:13 +00:00
833b169431 Merge pull request #3149 from khobbits/patch-notes
Stop double escaping the notes post variable.
2016-03-03 19:46:42 +00:00
c321d4e4b2 Stop double escaping the notes post variable 2016-03-03 18:38:24 +00:00
985ea9bea6 Enable phpunit testing in Travis CI. 2016-03-03 11:56:29 -06:00
4bc2f5feee Scrut fix 2016-03-03 18:12:15 +01:00
72214b0faf Merge pull request #3141 from richardlawley/billing-history-view
Previous Billing Period view links directly to historical usage
2016-03-03 15:13:38 +00:00
b8f6b3555c Previous Billing Period view links directly to historical usage 2016-03-03 15:03:06 +00:00
2af1b517e5 Notifcation and tab->spaces fix. 2016-03-03 06:46:39 -06:00
824860f698 Merge pull request #3136 from geordish/fix-css-for-globe-frontpage
The rotating box between Top 10 devices, and Top 10 ports is not wide…
2016-03-03 12:38:40 +00:00
77f2e923ff Merge pull request #3137 from marcodc/patch-4
Update Authors.md
2016-03-03 00:36:38 -06:00
734d1bcd9d PHPunit tests for Cisco syslog parsing. 2016-03-03 00:06:53 -06:00
f52954f8a4 The old load included the leading %. Stick with that behavior. 2016-03-03 00:03:17 -06:00
ea491c4a06 move the negation outside of the regular expression for more accurate results 2016-03-02 23:48:07 -06:00
a57d212b55 Merge pull request #3074 from xbeaudouin/adx_stuff
ServerIron / ServerIron ADX support
2016-03-02 19:30:08 -06:00
ab14528dea Update Authors.md
added my Signature and info as per request
2016-03-03 00:26:39 +08:00
91288aff52 The rotating box between Top 10 devices, and Top 10 ports is not wide enough when it is on the Top 10 ports. This causes the box to extend down over the Summary box below. 2016-03-02 16:10:37 +00:00
a2548c03a5 Merge pull request #3134 from bitcoredotorg/patch-2
Set selinux to allow httpd to sendmail
2016-03-02 14:49:27 +00:00
8c848d28ec Set selinux to allow httpd to sendmail 2016-03-02 09:47:20 -05:00
1c65acc317 Tab => spaces 2016-03-02 13:47:48 +01:00
b2d2346962 Merge pull request #3126 from laf/issue-3092
Reverted to pre-vrf lite codebase
2016-03-02 11:44:39 +00:00
73f20355ab Merge pull request #3129 from richardlawley/billing-perf
Improve performance of billing poller
2016-03-02 11:00:17 +00:00
9b3b563fb2 Merge pull request #3130 from murrant/install-docs-update 2016-03-01 22:03:26 +01:00
777a335699 Add validate.php to the install docs 2016-03-01 14:41:39 -06:00
42535a6bae Merge pull request #3124 from geordish/fix-geomap-tooltip
Fixed tooltip on geomap.
2016-03-01 18:10:10 +00:00
laf
5139805616 Reverted to pre-vrf lite codebase 2016-03-01 18:05:08 +00:00
669841af50 Added some MIB polling specific stuff for ServerIron 2016-03-01 17:36:39 +01:00
566addbfcf Added a space in popup to make it look a bit prettier 2016-03-01 16:15:49 +00:00
429ac63498 Fixed tooltip on geomap. 2016-03-01 15:30:25 +00:00
65ebb75dda Merge pull request #3123 from richardlawley/billing-notraffic
Billing Module reports constant traffic if Interface Counters don't change
2016-03-01 13:48:35 +00:00
37e8b2da63 Add Power Supply and Fan status 2016-03-01 14:15:01 +01:00
648db1e455 Fix previous delta being reported when no traffic passed 2016-03-01 12:41:41 +00:00
d759c4ac9d Improve performance of billing poller 2016-03-01 10:20:25 +00:00
386ad101c6 Removed specified MIB file for ServerIron temperatures since the OID used is RAW 2016-03-01 10:46:00 +01:00
282ac48dfd Merge pull request #3117 from richardlawley/app-page-layout
Updated Apps layout to use panels
2016-02-29 22:04:23 +00:00
ae37f5c2dd Juniper State Support 2016-02-29 20:51:45 +01:00
7c3af01638 Merge pull request #3120 from murrant/fix-3118
Fix os images with subdirectories in url
2016-02-29 11:36:10 -06:00
ade3c81570 Need global $config to be able to access it. 2016-02-29 11:26:03 -06:00
8400962130 Fix os images with subdirectories in url
Fix #3118
Obviously, the answer to the question in the code is yes
2016-02-29 11:20:03 -06:00
6f61ec37d5 Updated Apps layout to use panels 2016-02-29 13:23:42 +00:00
5e9bbea801 Merge pull request #3109 from Rosiak/fix-state-dev-overview-bug
Fix Device Overview Display
2016-02-28 19:11:41 +00:00
eff7e18d4e Align tables
Something that bugged me for a while..
2016-02-28 02:29:51 +01:00
74db415404 Fixup 2016-02-28 01:27:23 +01:00