aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'bmeeks82014-01-102-12/+87
|\
| * Merge pull request #570 from danhunsaker/bugfix/mailreport/more-freqs-iface-bugsJim P2014-01-081-5/+5
| |\
| | * Resolved interface bugs preventing new frequencies from displaying properlyDaniel Hunsaker2014-01-081-5/+5
| * | Merge pull request #569 from danhunsaker/enhance/mailreport/more-freqsJim P2014-01-082-11/+86
| |\|
| | * Added quarterly and yearly mailreport frequenciesDaniel Hunsaker2014-01-082-11/+86
* | | Spell out 'Interface' in column header instead of 'I/f'bmeeks82014-01-101-1/+1
* | | Fix auto log limit cleanup so it actually works.bmeeks82014-01-102-12/+25
* | | Merge remote-tracking branch 'upstream/master'bmeeks82014-01-0736-959/+2141
|\| |
| * | Merge pull request #532 from topper727/patch-1Ermal Luçi2014-01-052-9/+35
| |\ \ | | |/ | |/|
| | * Fixes for lcdproc-0.5.6 pkg v. 0.9.7topper7272013-12-281-0/+20
| | * CrystalFontz packet driver 4 status LED fixtopper7272013-10-311-9/+15
| * | Merge pull request #568 from kantlivelong/masterErmal Luçi2014-01-032-0/+23
| |\ \
| | * | -Added RSA key generation.Shawn Bruce2014-01-022-0/+23
| |/ /
| * | Remove mailreports redirect if RRD is disabled (except for page adding an rrd...jim-p2014-01-027-43/+32
| * | Merge pull request #567 from bmeeks8/masterErmal Luçi2014-01-024-7/+7
| |\ \
| * \ \ Merge pull request #566 from PiBa-NL/haproxy-devel_1.5dev21Jim P2013-12-301-0/+5
| |\ \ \
| | * | | haproxy-devel, fix install, include new file haproxy_htmllist.incPiBa-NL2013-12-301-0/+5
| * | | | Merge pull request #564 from PiBa-NL/haproxy-devel_1.5dev21Jim P2013-12-3013-831/+900
| |\| | |
| | * | | haproxy-devel, - use a separate directory for testing the new configurationPiBa-NL2013-12-291-24/+28
| | * | | haproxy-devel,PiBa-NL2013-12-2911-822/+887
| | * | | haproxy-devel, use new 1.5dev21 binaries.PiBa-NL2013-12-292-2/+2
| * | | | Fix typo s/pfsese/pfsenseRenato Botelho2013-12-301-3/+3
| * | | | Merge pull request #565 from phildd/masterErmal Luçi2013-12-304-11/+31
| |\ \ \ \
| | * | | | bandwidthd version bumpphildd2013-12-291-1/+1
| | * | | | bandwidthd version bumpphildd2013-12-291-1/+1
| | * | | | bandwidthd version bumpphildd2013-12-291-1/+1
| | * | | | bandwidthd belts and braces checks when generating confphildd2013-12-291-8/+28
| |/ / / /
| * | | | Merge pull request #563 from dbaio/masterRenato Botelho2013-12-275-24/+24
| |\ \ \ \
| | * | | | zabbix2 - fix pbi pathDanilo G. Baio (dbaio)2013-12-271-4/+4
| | * | | | zabbix2 - update packages to 2.2.1 - second stepDanilo G. Baio (dbaio)2013-12-275-20/+20
| |/ / / /
| * | | | Convert zabbix build options to optionsng, Clean up zabbix options so they on...jim-p2013-12-272-4/+4
| * | | | Merge pull request #562 from dbaio/masterJim P2013-12-272-12/+12
| |\ \ \ \
| | * | | | zabbix2 - update packages to 2.2.1 - first stepDanilo G. Baio (dbaio)2013-12-272-12/+12
| |/ / / /
| * | | | Merge pull request #560 from dbaio/masterErmal Luçi2013-12-266-0/+1044
| |\ \ \ \
| | * | | | New package Apcupsd. A daemon for controlling APC UPSes.Danilo G. Baio (dbaio)2013-12-266-0/+1044
| |/ / / /
| * | | | mailscanner - fix/disable pyzor check and change mailscanner bin from perl ve...Marcello Coutinho2013-12-183-22/+28
| * | | | Merge pull request #559 from bmeeks8/masterJim P2013-12-182-2/+2
| |\ \ \ \
| * \ \ \ \ Merge pull request #558 from bmeeks8/masterErmal Luçi2013-12-1823-206/+215
| |\ \ \ \ \
* | | | | | | Fix typo in get_interface_gateway_v6() function namebmeeks82014-01-071-2/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Bump Snort Alerts Widget to version 0.3.7bmeeks82014-01-012-2/+2
* | | | | | Put year first in timestamp field for proper sortingbmeeks82014-01-011-4/+4
* | | | | | Add new param to tail command to fix date sortingbmeeks82014-01-011-1/+1
| |_|/ / / |/| | | |
* | | | | Fix typo in snort package name.bmeeks82013-12-182-2/+2
| |/ / / |/| | |
* | | | Update Snort package to 3.0.1bmeeks82013-12-171-35/+35
* | | | Update Snort package version to 3.0.1bmeeks82013-12-173-44/+45
* | | | Close session immediately after use to prevent blocking.bmeeks82013-12-171-18/+15
* | | | Add new query string param when viewing Flowbits.bmeeks82013-12-172-2/+2
* | | | Update copyright info and update for 3.0.1 release.bmeeks82013-12-173-6/+19
* | | | Update copyright notice per Ermal's suggestion.bmeeks82013-12-173-10/+8
* | | | Remove need for session vars per Ermal's request.bmeeks82013-12-178-92/+37