summaryrefslogtreecommitdiffstats
path: root/usr
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'jim-p2011-06-289-21/+23
|\
| * Fix typojim-p2011-06-281-1/+1
| * Make text cosmetics consistent and close off missing <span/> tag.Warren Baker2011-06-281-2/+2
| * Use correct table header class.Warren Baker2011-06-281-1/+1
| * More text consistency.Warren Baker2011-06-281-3/+3
| * Note consistency and gettext() added.Warren Baker2011-06-281-1/+1
| * Consistency of NOTE vs Note as through the rest of the webGUI.Warren Baker2011-06-281-1/+1
| * Clean up leftover code not needed for anything.Ermal2011-06-271-9/+3
| * When editing a vlan and chaning its tag id and the vlan is assigned correct e...Ermal2011-06-271-3/+7
| * Don't do a csrf check when downloading packet capture, see http://forum.pfsen...jim-p2011-06-271-0/+4
* | Merge remote branch 'upstream/master'jim-p2011-06-272-6/+15
|\ \ | |/
| * Add a button to reset the RRD data (rm's rrd files and reinitializes).jim-p2011-06-271-2/+11
| * Be consistent with upper and lowercase.Warren Baker2011-06-271-4/+4
* | Merge remote-tracking branch 'upstream/master'jim-p2011-06-263-10/+89
|\ \ | |/
| * Bug #1615. Half-fix.Evgeny Yurchenko2011-06-261-1/+1
| * Internal cert and CSR creation error handling added.Evgeny Yurchenko2011-06-231-4/+19
| * Internal CA creation error handling added.Evgeny Yurchenko2011-06-231-3/+8
| * Intermediate CAs and openssl_xxx() error checking in CA management.Evgeny Yurchenko2011-06-231-4/+63
* | Merge remote branch 'upstream/master'jim-p2011-06-231-6/+10
|\ \ | |/
| * After an interface mismatch and apply actually show when we are rebooting ins...Scott Ullrich2011-06-231-6/+10
* | Merge remote branch 'upstream/master'jim-p2011-06-222-1/+6
|\ \ | |/
| * Revert "Correct displaying any availble default value."Warren Baker2011-06-221-1/+1
| * Do not store CA and CERT in config unless needed. Will allow deleting unused ...Evgeny Yurchenko2011-06-211-0/+5
* | Merge remote branch 'upstream/master'jim-p2011-06-21101-0/+0
|\ \ | |/
| * More icons missing from certain themes...jim-p2011-06-21101-0/+0
* | Merge remote branch 'upstream/master'jim-p2011-06-2116-5/+5
|\ \ | |/
| * Disable state killing in VPN down scripts.jim-p2011-06-203-3/+3
| * Fix ovpn-linkup so it writes out the proper gateway IP in all cases.jim-p2011-06-201-2/+2
| * Add missing theme images.jim-p2011-06-2012-0/+0
* | Also ignore lines starting with server-duid, and fix the # ignore so it is an...jim-p2011-06-191-1/+3
* | Merge remote-tracking branch 'upstream/master'jim-p2011-06-195-51/+139
|\ \ | |/
| * Bug #1602. diag_arp.php hangs when DNS server unreachable.Evgeny Yurchenko2011-06-171-5/+19
| * Cleanup and drop verbosityScott Ullrich2011-06-171-37/+39
| * Add new config option cpdupPathsPrefixScott Ullrich2011-06-171-5/+11
| * Turn down verbosityScott Ullrich2011-06-171-1/+1
| * Add a GUI field to adjust the max number of processes for lighttpd.jim-p2011-06-171-0/+19
| * Bug #1437. Dropdown list for country codes for CSRs (Cert Manager)Evgeny Yurchenko2011-06-171-7/+18
| * Bug #1437. Check for invalid characters in the fields for ca, cert and csr.Evgeny Yurchenko2011-06-172-2/+26
| * Bug #1437. Dropdown list for country codes (CA manager)Evgeny Yurchenko2011-06-161-6/+18
* | Merge remote branch 'upstream/master'jim-p2011-06-153-237/+6
|\ \ | |/
| * Remove obsolete file lurking on installs.Ermal2011-06-152-235/+0
| * Ticket #1598. Correctly handle ipalias vips when re-enabling carp from the ca...Ermal2011-06-151-2/+6
* | Merge remote branch 'upstream/master'jim-p2011-06-147-18/+54
|\ \ | |/
| * Show the OpenVPN instance description when listing interfaces to assign in th...jim-p2011-06-141-0/+12
| * Allow Accounting Updates to become configurable when Accounting is selected.Warren Baker2011-06-141-4/+4
| * Allow people to enter another user than admin for syncrhonizing in the carp s...Ermal2011-06-141-0/+8
| * Correct displaying any availble default value.Ermal2011-06-141-1/+1
| * Correct check for ipaliases over carp so we do not allow the deletion.Ermal2011-06-141-2/+2
| * NEw functiong does_vip_exist() which works for carp and ipalias type vips to ...Ermal2011-06-141-4/+14
| * Do not assume that every merge is about vips. Found-by: JimErmal2011-06-131-1/+1
OpenPOWER on IntegriCloud