Fixing gettext calls on index.php
Fixing gettext calls on diag_confbak.php
Removed duplicated tabs block on status_rrd_graph_settings.php
Fixing gettext calls on firewall_aliases_edit.php
Fixing gettext calls on license.php
Fixing gettext calls on pkg_mgr.php
Fixing gettext calls on system_advanced_admin.php
Fixing gettext calls on diag_logs_settings.php
Fixing gettext calls on diag_logs_ntpd.php
Fixing gettext calls on diag_logs_openvpn.php
Fixing gettext calls on diag_logs_relayd.php
Fixing gettext calls on diag_logs_vpn.php
Fixing gettext calls on diag_logs_ipsec.php
Fixing gettext calls on diag_logs_ppp.php
Fixing gettext calls on status_graph.php
Merge remote branch 'mainline/master'
Conflicts: usr/local/www/status_captiveportal.php usr/local/www/status_rrd_graph.php usr/local/www/status_wireless.php
add TCP 1119 for battle.net
add tooltip. cvstrac 1640
add explanation of flags and capabilities from m0n0wall. cvstrac 1564
Add hidden "if" field to status_wireless.php.
Move the get_real_interface call above this condition and fix the ID of the rescan button.
add info message
background the scan
add a Rescan button. ticket #793
fix text. Ticket #799
Fix link to the associated filter rule for port forwards on an interface other than the first with a filter rule.
Enforce the interface selection on associated filter rules. Ticket #780
correctly select Local Database when it's configured as such
fix text
don't static port 5060 by default, it breaks things much more often than it helps.
Add missing quote for the image title of the delete button, which was masked by the code that used to be after it.
Fix on-click confirmation for the delete button on port forward rows.
Fix improper gettext changes that broke various confirmation prompts, causing them to never show.
Change the save message code on port forwards to be consistent with the other NAT pages. Fixes the message that was supposed to be shown after applying.
Mark the correct subsystems dirty when deleting port forwards with the X on their row so that the apply button shows up.
Update the interface group name in floating rules with multiple interfaces selected, too. Ticket #792
Don't wipe out stored username on pass-through MAC entries when manually saving them.
Fix SNMP trap string validation.
Ticket #792. Correctly unset the group name and update the new one if a interface group is renamed. For filter and nat rules too.
On system_advanced_firewall.php, fix display of selected TFTP interfaces after saving. Fixes #794
Add missing explode parameter.
New tab colors from Rob
Change bogon color row to E0E0E0
Turn active tabs color to #DDDDDD
Set background color to grey and avoid white space between tabs and tabcont class
Restore this change, it breaks Nifty. We will need to come up with an alternate plan to get rid of the 2px of white space between the tabs and tabcont
No need to set sortable class for this page, it ends up with a javascript error
Set tabcont to a slightly darker grey so that it stands out even on brighter monitors.
Remove the 2px gap between the tab bar and tabcont
Use more prototype conventions, fix some, and correct logic for moving rows.
Do not use /, use relative directory form css
Make the new tabs themable
add func disc
new tab menu
Add gui code for antenna settings. Ticket #13
Fix printf that should be sprintf.
Add 12 hour period starting from 8 in the morning. Thinking that would correspond better to human workdays.
Fix text, and default to 1400
Hide the distance setting for wireless interfaces that do not support it.
Unbreak adding new record
Use prototype selectors here, and ensure we use only the log rows. Should fix the rare occasion where a rapid dynamic log update would overwrite the header row.
Resolves #599. Split mtu and mss fields in interfaces page so it is possible to set them differently.
Refine the setting/checking of these variables a little.
Fix gettext implementation on status_rrd_graph.php
Remember custom rows per page when going to previous and next pages
Adjust rows per page a bit
Round up correctly for page count
Do not hide Displaying page now that we have the rows per page
Allow setting of how many records per page to show
Show starting record ++
Do not show page X of X when filtering
Make displaying page X of X bold
Move previous and next page
Unbreak auto submit
Ignore sorting field types
Make sure this dir exists because the new function uses it.
Use the new pfSense module call to find the usable ports from the ones created on /dev.
Use GET instead of post for filtering
no need for a regex here
Reformat file. No functional changes
Use ob_start() to speed up page rendering for large record sized pages
Adding field sorting and filtering support
Ticket #780. Disable the interface selection on associated nat rules.
Resolves #787. Present an option to enable a scrub rule for <vpns> target to limit the mss to specified value.
Conflicts: usr/local/www/services_captiveportal_ip_edit.php usr/local/www/services_captiveportal_mac_edit.php usr/local/www/services_snmp.php
Sync interfaces_* with mainline/master
Conflicts: usr/local/www/interfaces.php usr/local/www/interfaces_assign.php usr/local/www/interfaces_bridge_edit.php usr/local/www/interfaces_gif_edit.php usr/local/www/interfaces_gre.php...
Merge remote branch 'mainline/master' into 4_load_balancer_and_services
Conflicts: usr/local/www/interfaces.php usr/local/www/interfaces_assign.php usr/local/www/interfaces_bridge_edit.php usr/local/www/interfaces_gif_edit.php...
Reset firewall_shaper_queues.php and status.php on this branch
Merge remote branch 'mainline/master' into 3_interfaces
Conflicts: usr/local/www/firewall_aliases.php usr/local/www/firewall_aliases_edit.php usr/local/www/firewall_aliases_import.php usr/local/www/firewall_nat.php usr/local/www/firewall_nat_1to1.php...
Reset diag_* files on this branch
Conflicts: usr/local/www/services_captiveportal_ip_edit.php usr/local/www/services_captiveportal_mac_edit.php usr/local/www/services_dhcp_edit.php usr/local/www/services_rfc2136.php...
Conflicts: usr/local/www/diag_nanobsd.php usr/local/www/diag_packet_capture.php usr/local/www/interfaces.php
Merge remote branch 'mainline/master' into 2_firewall
Conflicts: usr/local/www/diag_nanobsd.php usr/local/www/diag_packet_capture.php usr/local/www/firewall_shaper.php
Conflicts: usr/local/www/services_dhcp_edit.php
Prevent enabling static ARP if there are static map entries that lack IP addresses.
Fix this variable name and error message (It's Static ARP not Static map)