Merge remote-tracking branch 'upstream/master' into origin/master
Globally correct a few typos
Remove latin-1 encoding of RSS feed
Many thanks to Gertjan in forum https://forum.pfsense.org/index.php?topic=87504.msg484017#msg484017Specifically setting the output encoding to latin-1 was causing the "black diamonds" for special characters in the http://blog.pfsense.org RSS feed (e.g. the registered trademark sign after pfSense did not come out)....
moved some js from separate files to contextual .php
pfSense.js - to prevent a blob of scripts; move index-widget handling to actual index, introduce events instead*.js - moved to widget.php plus added dataFilter to prevent eval()ing scripts twice
log.widget - replaced js processor with simple xhr that fetches html
firewall_rules - typo, duplicate $pgtitlelog.js - simple xhr html updater, no need for duplicate logiclog.widget - migrated
updated firewall WIP, fixed widget ordering
implemented widget-config
fbegin/fend.inc - temporary added for non-migrated pagesfirewall_rules - use buttons for actionsindex - implement widget-config & close buttonpfSense.css - +/- icons now handled in jspfSense.js - better handling of widget actions...
Merge branch 'master' into bootstrap
Conflicts: usr/local/www/carp_status.php usr/local/www/diag_arp.php usr/local/www/diag_authentication.php
Ticket #3997, teach code to track carp through uniqids(). Missing carp GUI changes and upgrade code
Fix IPsec widget for multiple P2, it fixes #4164
View revisions
Also available in: Atom